From 72552df4e1da4c1bdc8893dd40bf46950f45450a Mon Sep 17 00:00:00 2001
From: yaoba <7156147@qq.com>
Date: Sun, 6 Aug 2023 17:35:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8in=E4=BC=9A=E9=81=8D?=
 =?UTF-8?q?=E5=8E=86remove=E3=80=81copy=E3=80=81intersect=E3=80=81union?=
 =?UTF-8?q?=E3=80=81unique=E3=80=81sortDates=EF=BC=8C=E6=94=B9=E4=B8=BAof?=
 =?UTF-8?q?=E5=8F=AA=E9=81=8D=E5=8E=86=E6=95=B0=E7=BB=84=E7=9A=84=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _src/core/Editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_src/core/Editor.js b/_src/core/Editor.js
index 5caadbd..0b73188 100644
--- a/_src/core/Editor.js
+++ b/_src/core/Editor.js
@@ -428,7 +428,7 @@
 
         container.style.zIndex = options.zIndex;
         var additionCssHtml = [];
-        for(var i in options.iframeCssUrlsAddition){
+        for(var i of options.iframeCssUrlsAddition){
             additionCssHtml.push("<link rel='stylesheet' type='text/css' href='" + utils.unhtml(options.iframeCssUrlsAddition[i]) + "'/>")
         }
         var html =
-- 
Gitee


From f27be02b71b1caf1c4e3b4e1555046a38f582d60 Mon Sep 17 00:00:00 2001
From: yaoba <7156147@qq.com>
Date: Mon, 7 Aug 2023 01:52:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?WORD=E5=9B=BE=E7=89=87=E8=BD=AC=E5=AD=98?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E5=BC=A0=E5=9B=BE=E7=89=87=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E8=BD=AC=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dialogs/wordimage/wordimage.html | 10 +++++-----
 dialogs/wordimage/wordimage.js   | 14 ++++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dialogs/wordimage/wordimage.html b/dialogs/wordimage/wordimage.html
index 0d743d8..4df2162 100755
--- a/dialogs/wordimage/wordimage.html
+++ b/dialogs/wordimage/wordimage.html
@@ -97,7 +97,7 @@
 <div class="wrapper">
   <div class="image-info">
     <div class="input">
-      <input type="text" id="fileUrl"/>
+      <input type="text" id="fileUrl" multiple=true/>
     </div>
     <div class="copy">
       <div id="copyButton">复制路径</div>
@@ -191,10 +191,7 @@
             url: res.url,
             title: '',
           });
-          if ($('#fileUrl').val().indexOf(file.name) >= 0) {
-            $('#fileUrl').val(res.url);
-            $('.image-tip').html('<span style="color:#139213;">转存成功，请提交确认</span>');
-          }
+          $('.image-tip').html('<span style="color:#139213;">图片'+imageUrls.length+'('+file.name+')'+'转存成功</span>');
         } else {
           $('.image-tip').html('上传失败:' + JSON.stringify(res))
         }
@@ -205,6 +202,9 @@
       $('.image-tip').html('上传失败:' + JSON.stringify(res))
     }
   });
+  uploader.on('uploadFinished', function () {
+    $('.image-tip').html('<span style="color:#139213;">转存成功，请提交确认</span>');
+  });
   utils.domReady(function () {
     var options = {};
     var callbacks = {};
diff --git a/dialogs/wordimage/wordimage.js b/dialogs/wordimage/wordimage.js
index b8f5cb1..08c8604 100755
--- a/dialogs/wordimage/wordimage.js
+++ b/dialogs/wordimage/wordimage.js
@@ -17,13 +17,8 @@ wordImage.init = function (opt, callbacks) {
 
 function addUploadButtonListener() {
   g('saveFile').addEventListener('change', function () {
-    if (this.files.length !== 1) {
-      alert('请选择1个文件')
-      return;
-    }
     $('.image-tip').html('正在转存，请稍后...');
-    var file = this.files[0];
-    uploader.addFile(file);
+    uploader.addFile(this.files);
     uploader.upload();
   });
 }
@@ -75,6 +70,13 @@ function showLocalPath(id) {
 
   path = path.substring(0, path.lastIndexOf(separater) + 1);
   g(id).value = path;
+  //增提醒用户选择哪些文件
+  var names = [];
+  for (let i = 0, len = images.length; i < len; i++) {
+    var img = images[i];
+    names.push(img.substring(img.lastIndexOf(separater) + 1, img.length));
+  }
+  $('.image-tip').html('请选择:' + names.join("、") + "共" + images.length + '个文件');
 }
 
 function createCopyButton(id, dataFrom) {
-- 
Gitee