端到端功能 子流程节点展开后的范围框加上关联文件的名称

com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java

@@ -9,6 +9,7 @@ import com.actionsoft.apps.coe.method.process.subprocess.graph.util.SubProcessNo
 import com.actionsoft.apps.coe.method.process.subprocess.mode.Node;
 import com.actionsoft.apps.coe.method.process.subprocess.mode.ScopeShapeMonitor;
 import com.actionsoft.apps.coe.method.process.subprocess.observers.node.NodeSubject;
+import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
@@ -99,6 +100,8 @@ public class GraphNodeExpandHandle {
 
         scopeLimitationShape.put("dataAttributes", currentExpandShape.getJSONArray("dataAttributes"));
 
+        scopeLimitationShape.put("relationFileName", PALRepositoryCache.getCache().get(relationFileId).getName());
+
         this.scopeLimitationShape = scopeLimitationShape;
 
         // 通知其它节点位置更新

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js

@@ -2091,6 +2091,9 @@ var Designer = {
                         function() {
                             Designer.op.hideLinkPoint();
                             Designer.op.resetState();
+                            if (methodId == 'process.subprocess') { // 如果建模为端到端 连线样式调整 防止因层级原因 子流程展开或者关闭按钮 点击不到
+                                window.subProcess.linkerBoxPointerEvent();
+                            }
                             f.unbind("mousedown.link");
                             f.unbind("mousemove.link");
                             $(document).unbind("mouseup.link")

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js

@@ -2111,6 +2111,9 @@ var Designer = {
                         function () {
                             Designer.op.hideLinkPoint();
                             Designer.op.resetState();
+                            if (methodId == 'process.subprocess') { // 如果建模为端到端 连线样式调整 防止因层级原因 子流程展开或者关闭按钮 点击不到
+                                window.subProcess.linkerBoxPointerEvent();
+                            }
                             f.unbind("mousedown.link");
                             f.unbind("mousemove.link");
                             $(document).unbind("mouseup.link")

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.method.subprocess.js

@@ -156,7 +156,7 @@ class SubProcess {
                 // 针对范围标识框渲染 节点关闭按钮
                 window.subProcess.shapeIconRender();
                 window.subProcess.linkerBoxPointerEvent();
-                window.subProcess.scopeShapeRenderTitle(param.shapeId, shapeText);
+                window.subProcess.scopeShapeRenderTitle(r.data.elements);
                 // 提示用户文件已修改
                 window.subProcess.fileModifiedTip();
             },
@@ -166,9 +166,15 @@ class SubProcess {
         // 3、刷新当前画布
     }
 
-    scopeShapeRenderTitle(shapeId, title){
+    scopeShapeRenderTitle(elements){
-        let titleHtml = "<span style='position: absolute; left: 35px; top: 25px;'>"+title+"</span>";
+        for (let key in elements) {
-        $('#'+shapeId).prepend(titleHtml);
+            let element = elements[key];
+            if (element.name == 'linker') continue;
+            if (element.name == 'scopeLimitation'){ // 范围标识框
+                let titleHtml = "<span style='position: absolute; left: 35px; top: 25px;'>"+element.relationFileName+"</span>";
+                $('#'+key).prepend(titleHtml);
+            }
+        }
     }
 
     // 节点关闭事件
@@ -223,6 +229,9 @@ class SubProcess {
                 // 针对范围标识框渲染 节点关闭按钮
                 window.subProcess.shapeIconRender();
                 window.subProcess.linkerBoxPointerEvent();
+                if (action == 'expand') {
+                    window.subProcess.scopeShapeRenderTitle(r.data.elements);
+                }
                 // 提示用户文件已修改
                 window.subProcess.fileModifiedTip();
             }