From 0389d98b4b8fcb0a0d2b080172efd0356b03e7ab Mon Sep 17 00:00:00 2001
From: yujh <yujh_java@163.com>
Date: Thu, 12 Dec 2024 10:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=8A=82=E7=82=B9=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=85=A8=E9=83=A8=E5=88=A0=E9=99=A4=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actionsoft/apps/coe/pal/CoEPALController.java  | 10 ++++++++--
 .../js/coe.pal.pl.upfile.js                        | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
index becb7374..60271f5a 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java
@@ -1194,13 +1194,19 @@ public class CoEPALController {
 	// 附件-删除全部附件
 	@Mapping("com.actionsoft.apps.coe.pal_processlevel_upfile_del_all")
 	public String coePALProcessLevelUPFILEDELAll(UserContext me, RequestParams params) {
+		JSONArray array = new JSONArray();
 		String uuids = params.get("uuids");
 		UpfileWeb web = new UpfileWeb(me);
 		String[] split = uuids.split(",");
 		for (String s : split) {
-			web.delete(s);
+			String resultData = web.delete(s);
+			String uuid = JSONObject.parseObject(ResponseObject.parse(resultData).getData().toString()).getString("uuid");
+			if(UtilString.isNotEmpty(uuid)){
+				array.add(uuid);
+			}
+
 		}
-		return ResponseObject.newOkResponse().msg("").toString();
+		return ResponseObject.newOkResponse().msg("").put("uuids",array).toString();
 	}
 
 	// 附件-在线预览
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
index 597ef0e3..a7212272 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
@@ -434,7 +434,7 @@ function delFileAll(callback) { //删除全部文件
                     var dataJson = msg.data;
                     if (msg.result == "ok") {
                         if(type == "shape"){
-                            delUpFileOfShape(dataJson.uuid);
+                            delUpFileOfShapeAll(dataJson.uuids);
                             callback();
                         }
                         $.simpleAlert("删除成功", "ok");
@@ -578,6 +578,18 @@ function delUpFileOfShape(uuid){//
     updateShape();
 }
 
+function delUpFileOfShapeAll(uuids){//
+    var upfilesArray = getUpFileArrayOfShareShape();
+    for(var i =0,size = upfilesArray.length;i<size;i++){
+        for(var j =0,allSize = uuids.length;j<allSize;j++){
+            if(uuids[j] === upfilesArray[i]){
+                upfilesArray.remove(i);
+            }
+        }
+    }
+    updateShape();
+}
+
 function updateShape(){
     var shape = parent.Utils.getSelected()[0];
     parent.Model.update(shape);