From 5eeab9c4486fa863a60d0db25fe8f910737d1330 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sun, 19 Nov 2023 22:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/846=E3=80=91=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=88=97=E8=A1=A8=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jeecg/components/JImageUpload.vue     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/JImageUpload.vue b/src/components/Form/src/jeecg/components/JImageUpload.vue
index c3aed75..08b6f58 100644
--- a/src/components/Form/src/jeecg/components/JImageUpload.vue
+++ b/src/components/Form/src/jeecg/components/JImageUpload.vue
@@ -31,7 +31,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, PropType, ref, reactive, watchEffect, computed, unref, watch, onMounted } from 'vue';
+  import { defineComponent, PropType, ref, reactive, watchEffect, computed, unref, watch, onMounted, nextTick } from 'vue';
   import { LoadingOutlined, UploadOutlined } from '@ant-design/icons-vue';
   import { useRuleFormItem } from '/@/hooks/component/useFormItem';
   import { propTypes } from '/@/utils/propTypes';
@@ -175,28 +175,36 @@
        */
       function handleChange({ file, fileList, event }) {
         initTag.value = false;
-        uploadFileList.value = fileList;
+        // update-begin--author:liaozhiyang---date:20231116---for：【issues/846】上传多个列表只显示一个
+        // uploadFileList.value = fileList;
         if (file.status === 'error') {
           createMessage.error(`${file.name} 上传失败.`);
         }
         let fileUrls = [];
-        //上传完成
+        let noUploadingFileCount = 0;
         if (file.status != 'uploading') {
           fileList.forEach((file) => {
             if (file.status === 'done') {
-              //update-begin---author:wangshuai ---date:20221121  for：[issues/248]原生表单内使用图片组件,关闭弹窗图片组件值不会被清空------------
-              initTag.value = true;
-              //update-end---author:wangshuai ---date:20221121  for：[issues/248]原生表单内使用图片组件,关闭弹窗图片组件值不会被清空------------
               fileUrls.push(file.response.message);
             }
+            if (file.status != 'uploading') {
+              noUploadingFileCount++;
+            }
           });
           if (file.status === 'removed') {
             handleDelete(file);
           }
+          if (noUploadingFileCount == fileList.length) {
+            state.value = fileUrls.join(',');
+            emit('update:value', fileUrls.join(','));
+            // update-begin---author:wangshuai ---date:20221121  for：[issues/248]原生表单内使用图片组件,关闭弹窗图片组件值不会被清空------------
+            nextTick(() => {
+              initTag.value = true;
+            });
+            // update-end---author:wangshuai ---date:20221121  for：[issues/248]原生表单内使用图片组件,关闭弹窗图片组件值不会被清空------------
+          }
         }
-        // emitData.value = fileUrls.join(',');
-        state.value = fileUrls.join(',');
-        emit('update:value', fileUrls.join(','));
+        // update-end--author:liaozhiyang---date:20231116---for：【issues/846】上传多个列表只显示一个
       }
 
       /**