From 49e4f61d34a389ddbf79a3fc4097769a897c2c9a Mon Sep 17 00:00:00 2001
From: qinoy <qinoy8521@163.com>
Date: Tue, 20 Jun 2023 10:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=88=B0=E7=AB=AF=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20=E8=8A=82=E7=82=B9=E4=B8=80=E9=94=AE=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E4=B8=8E=E9=97=AD=E5=90=88=E5=8A=9F=E8=83=BD=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...oft.apps.coe.method.process.subprocess.jar | Bin 85484 -> 86116 bytes
 .../subprocess/SubProcessController.java      |  13 ++++++
 .../process/subprocess/web/SubProcessWeb.java |  42 ++++++++++++++++++
 .../action.xml                                |   4 ++
 .../extend/js/designer.extend.core.js         |  10 +----
 .../diagraming/designer.method.subprocess.js  |  36 ++++++++++-----
 6 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar b/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar
index 13284d530c2a2461d459204656306ad4d1a6714b..bcfd6f8b1897456439210755efc0d488828b4c26 100644
GIT binary patch
delta 11527
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

delta 10851
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

diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/SubProcessController.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/SubProcessController.java
index 0daadb2d..f15a771b 100644
--- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/SubProcessController.java
+++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/SubProcessController.java
@@ -169,4 +169,17 @@ public class SubProcessController {
         return processWeb.shapeOneClick(action, repositoryId, define);
     }
 
+    /**
+     * 判断一键展开与闭合的快捷操作按钮是否显示
+     * @param uc
+     * @param repositoryId
+     * @param elements
+     * @return
+     */
+    @Mapping("com.actionsoft.apps.coe.method.process.subprocess.shape_expand_and_close_icon_show")
+    public String shapeExpandAndCloseIconShow(UserContext uc, String repositoryId, String elements){
+        SubProcessWeb processWeb = new SubProcessWeb(uc);
+        return processWeb.shapeExpandAndCloseIconShow(repositoryId, elements);
+    }
+
 }
diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/web/SubProcessWeb.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/web/SubProcessWeb.java
index 29d4816c..c318ede8 100644
--- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/web/SubProcessWeb.java
+++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/web/SubProcessWeb.java
@@ -347,6 +347,13 @@ public class SubProcessWeb extends ActionWeb {
         }
     }
 
+    /**
+     * 节点一键展开或者关闭
+     * @param action
+     * @param repositoryId
+     * @param define
+     * @return
+     */
     public String shapeOneClick(String action, String repositoryId, String define){
 
         // 1、收集子流程节点
@@ -380,4 +387,39 @@ public class SubProcessWeb extends ActionWeb {
         return ro.toString();
     }
 
+    // 判断一键展开与闭合的快捷操作按钮是否显示
+    public String shapeExpandAndCloseIconShow(String repositoryId, String elements){
+
+        boolean showExpandFlag = false;
+        boolean showCloseFlag = false;
+        if (UtilString.isNotEmpty(elements)){
+            JSONObject elementsObj = JSONObject.parseObject(elements);
+            // 将连线以及内部没有元素的子流程节点过滤掉
+            Set<String> filterKeySet = elementsObj.keySet().stream()
+                    .filter(key -> {
+                        JSONObject ele = elementsObj.getJSONObject(key);
+                        if ("linker".equals(ele.getString("name"))) return false;
+                        try {
+                            SubProcessNodeDefineUtil.readSubProcessNodeDefine(repositoryId, key);
+                        } catch (AWSException e) {
+                            return false;
+                        }
+                        return true;
+                    }).collect(Collectors.toSet());
+
+            for (String key : filterKeySet) {
+                JSONObject shape = elementsObj.getJSONObject(key);
+                if ("subProcess".equals(shape.getString("name"))){
+                    showExpandFlag = true;
+                }else if ("scopeLimitation".equals(shape.getString("name"))){
+                    showCloseFlag = true;
+                }
+            }
+        }
+        ResponseObject ro = ResponseObject.newOkResponse();
+        ro.put("showExpandFlag", showExpandFlag);
+        ro.put("showCloseFlag", showCloseFlag);
+        return ro.toString();
+    }
+
 }
diff --git a/com.actionsoft.apps.coe.method.process.subprocess/web/com.actionsoft.apps.coe.method.process.subprocess/action.xml b/com.actionsoft.apps.coe.method.process.subprocess/web/com.actionsoft.apps.coe.method.process.subprocess/action.xml
index 954fcdeb..f7526d7f 100644
--- a/com.actionsoft.apps.coe.method.process.subprocess/web/com.actionsoft.apps.coe.method.process.subprocess/action.xml
+++ b/com.actionsoft.apps.coe.method.process.subprocess/web/com.actionsoft.apps.coe.method.process.subprocess/action.xml
@@ -42,4 +42,8 @@
         <param name="repositoryId"/>
         <param name="define"/>
     </cmd-bean>
+    <cmd-bean name="com.actionsoft.apps.coe.method.process.subprocess.shape_expand_and_close_icon_show">
+        <param name="repositoryId"/>
+        <param name="elements"/>
+    </cmd-bean>
 </aws-actions>
\ No newline at end of file
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.core.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.core.js
index 89797cfb..52a90e14 100755
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.core.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.core.js
@@ -15,13 +15,7 @@ Designer.contextMenu.show = function(x, y) {
 	menu.children("li[ac=processAttribute]").show();
 	var clipLen = Designer.clipboard.elements.length;
 	if (methodId == 'process.subprocess') { // 当前建模为端到端
-		let iconShow = window.subProcess.oneClickExpandAndCloseIconShow();
-		if (iconShow.showExpandIcon){
-			menu.children("li[ac=oneClickExpand]").show();
-		}
-		if (iconShow.showCloseIcon){
-			menu.children("li[ac=oneClickClose]").show();
-		}
+		window.subProcess.oneClickExpandAndCloseIconShow();
 	}
 	if (currentFocus == null) {
 		// 画布
@@ -189,10 +183,8 @@ Designer.contextMenu.execAction = function(item) {
 	} else if (action == 'addRearProcess') {// 关联至后置流程
 		showLeadAndRearProcessDlg('rear');
 	}else if (action == 'oneClickExpand'){ // 子流程节点一键展开
-		$.simpleAlert('一键展开了');
 		window.subProcess.oneClickOperate('expand');
 	}else if (action == 'oneClickClose'){ // 子流程节点一键闭合
-		$.simpleAlert('一键闭合了');
 		window.subProcess.oneClickOperate('close');
 	}
 };
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.method.subprocess.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.method.subprocess.js
index d4b4128e..d0be9366 100644
--- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.method.subprocess.js
+++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.method.subprocess.js
@@ -179,7 +179,7 @@ class SubProcess {
 
     // 节点关闭事件
     shapeClose(event){
-        console.log('sss');
+        // console.log('sss');
         let param = event.data;
         awsui.ajax.request({
             url: './jd',
@@ -210,7 +210,7 @@ class SubProcess {
 
     // 一键展开或闭合
     oneClickOperate(action){
-        console.log('oneClickExpand',this);
+        // console.log('oneClickExpand',this);
         awsui.ajax.request({
             url: './jd',
             method: 'POST',
@@ -243,17 +243,29 @@ class SubProcess {
         let showExpandFlag = false;
         let showCloseFlag = false;
         let elements = this.Model.define.elements;
-        for (let key in elements) {
-            let shape = elements[key];
-            if (shape.name == 'linker') continue;
-            if (shape.name == 'subProcess'){
-                showExpandFlag = true;
-            }else if (shape.name == 'scopeLimitation'){
-                showCloseFlag = true;
+        awsui.ajax.request({
+            url: './jd',
+            method: 'POST',
+            async: false,
+            data: {
+                cmd: 'com.actionsoft.apps.coe.method.process.subprocess.shape_expand_and_close_icon_show',
+                sid: this.sid,
+                repositoryId: this.repositoryId,
+                elements: JSON.stringify(elements)
+            },
+            ok: function (r) {
+                let menu = $("#designer_contextmenu");
+                if (r.data.showExpandFlag){
+                    menu.children("li[ac=oneClickExpand]").show();
+                }
+                if (r.data.showCloseFlag){
+                    menu.children("li[ac=oneClickClose]").show();
+                }
+            },
+            err: function (r) {
+                $.simpleAlert(r.msg);
             }
-            if (showExpandFlag && showCloseFlag) break;
-        }
-        return {showExpandIcon: showExpandFlag, showCloseIcon: showCloseFlag};
+        });
     }
 
     // 文件修改提示