From 2b773d6e6b95fdbfc5ed713decfc44048e57546f Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Thu, 29 Aug 2024 20:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=EF=BC=8C=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=9B=BE=E7=89=87=20#7076?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Tinymce/src/Editor.vue     |  3 +-
 .../src/components/Tinymce/src/ImgUpload.vue  | 46 +++++++++++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/jeecgboot-vue3/src/components/Tinymce/src/Editor.vue b/jeecgboot-vue3/src/components/Tinymce/src/Editor.vue
index 7167a08b5..b958ace34 100644
--- a/jeecgboot-vue3/src/components/Tinymce/src/Editor.vue
+++ b/jeecgboot-vue3/src/components/Tinymce/src/Editor.vue
@@ -314,11 +314,12 @@
         setValue(editor, content);
       }
 
-      function handleDone(name: string, url: string) {
+      async function handleDone(name: string, url: string) {
         const editor = unref(editorRef);
         if (!editor) {
           return;
         }
+        await handleImageUploading(name);
         const content = editor?.getContent() ?? '';
         const val = content?.replace(getUploadingImgName(name), `<img src="${url}"/>`) ?? '';
         setValue(editor, val);
diff --git a/jeecgboot-vue3/src/components/Tinymce/src/ImgUpload.vue b/jeecgboot-vue3/src/components/Tinymce/src/ImgUpload.vue
index 961e30f12..b6de1e9a9 100644
--- a/jeecgboot-vue3/src/components/Tinymce/src/ImgUpload.vue
+++ b/jeecgboot-vue3/src/components/Tinymce/src/ImgUpload.vue
@@ -17,13 +17,12 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, ref } from 'vue';
 
   import { Upload } from 'ant-design-vue';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useGlobSetting } from '/@/hooks/setting';
   import { useI18n } from '/@/hooks/web/useI18n';
-  import { getToken } from '/@/utils/auth';
   import { getFileAccessHttpUrl, getHeaders } from '/@/utils/common/compUtils';
 
   export default defineComponent({
@@ -55,6 +54,8 @@
       }
       const { domainUrl } = useGlobSetting();
       const uploadUrl = domainUrl + '/sys/common/upload';
+      //文件列表
+      let uploadFileList = ref<any[]>([]);
       //update-end-author:taoyan date:2022-5-13 for: 富文本上传图片不支持
       const { t } = useI18n();
       const { prefixCls } = useDesign('tinymce-img-upload');
@@ -66,27 +67,31 @@
         };
       });
 
-      function handleChange(info: Recordable) {
-        const file = info.file;
-        const status = file?.status;
-        //const url = file?.response?.url;
-        const name = file?.name;
-
-        if (status === 'uploading') {
-          if (!uploading) {
-            emit('uploading', name);
-            uploading = true;
-          }
-        } else if (status === 'done') {
-          //update-begin-author:taoyan date:2022-5-13 for: 富文本上传图片不支持
-          let realUrl = getFileAccessHttpUrl(file.response.message);
-          emit('done', name, realUrl);
-          //update-end-author:taoyan date:2022-5-13 for: 富文本上传图片不支持
-          uploading = false;
-        } else if (status === 'error') {
+      function handleChange({ file, fileList }) {
+        if (file.status === 'error') {
           emit('error');
           uploading = false;
         }
+        let files = [] as any;
+        let noUploadingFileCount = 0;
+        if (file.status != 'uploading') {
+          fileList.forEach((file) => {
+            if (file.status === 'done' && file.response.success) {
+              files.push(file);
+            }
+            if (file.status != 'uploading') {
+              noUploadingFileCount++;
+            }
+          });
+        }
+
+        if (noUploadingFileCount == fileList.length) {
+          fileList.forEach((file) => {
+            const name = file?.name;
+            let realUrl = getFileAccessHttpUrl(file.response.message);
+            emit('done', name, realUrl);
+          });
+        }
       }
 
       return {
@@ -97,6 +102,7 @@
         getBizData,
         t,
         getButtonProps,
+        uploadFileList
       };
     },
   });