From 0430aa62051122a701f247cb7334af1a7ce18b92 Mon Sep 17 00:00:00 2001 From: qinoy Date: Sat, 17 Jun 2023 16:41:28 +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=E5=AD=90=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9=E5=B1=95?= =?UTF-8?q?=E5=BC=80=E5=90=8E=E7=9A=84=E8=8C=83=E5=9B=B4=E6=A1=86=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=85=B3=E8=81=94=E6=96=87=E4=BB=B6=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oft.apps.coe.method.process.subprocess.jar | Bin 85346 -> 85484 bytes .../graph/GraphNodeExpandHandle.java | 3 +++ .../scripts/diagraming/designer.core.debug.js | 3 +++ .../scripts/diagraming/designer.core.js | 3 +++ .../diagraming/designer.method.subprocess.js | 17 +++++++++++++---- 5 files changed, 22 insertions(+), 4 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 34bf91848984e1a59b514dabacb393a65497bf31..13284d530c2a2461d459204656306ad4d1a6714b 100644 GIT binary patch delta 12920 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 delta 12789 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

oP*AMECrTh`nAe3~XAK&yEDIuE54#ClV%= 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 diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java index 4929b070..06636587 100644 --- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java +++ b/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; // 通知其它节点位置更新 diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js index 47200d3e..8744dab6 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js +++ b/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") diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js index dd7113db..7d1ba52f 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js +++ b/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") 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 951f2c2e..d4b4128e 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 @@ -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){ - let titleHtml = ""+title+""; - $('#'+shapeId).prepend(titleHtml); + scopeShapeRenderTitle(elements){ + for (let key in elements) { + let element = elements[key]; + if (element.name == 'linker') continue; + if (element.name == 'scopeLimitation'){ // 范围标识框 + let titleHtml = ""+element.relationFileName+""; + $('#'+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(); }