From 391ec0256d8648050dc8b044c88918ccf58e55bb Mon Sep 17 00:00:00 2001 From: qinoy Date: Fri, 30 Jun 2023 17:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=88=B0=E7=AB=AF=20=E6=96=B0?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=88=B0=E7=94=BB=E5=B8=83=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=85=83=E7=B4=A0=20=E5=A2=9E=E5=8A=A0=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B1=9E=E6=80=A7=20elementType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oft.apps.coe.method.process.subprocess.jar | Bin 99907 -> 99976 bytes .../graph/GraphNodeCloseHandle.java | 30 ++++++++++-------- .../graph/GraphNodeExpandHandle.java | 30 ++++++++++-------- .../scripts/diagraming/designer.core.js | 13 +++++--- .../diagraming/designer.method.subprocess.js | 20 ++++++++++++ 5 files changed, 61 insertions(+), 32 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 74f9ac779bfcb89303ab75790ae57973d2fcb046..f17098cc41e15277afbf6afef9aad26afbfbc65f 100644 GIT binary patch delta 15100 zcmY*=Wmp|evn?BUcXxMpg1fuByKC6EyKUUv9fG?%1W9nW-~Kiibv2k%xeU2Lpoz1G9-wMx+G)DA^hQmd31q%Vf^K<+#8{nF
  • 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 delta 15114 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 OR4fn>JO{v^(*FZhCv7AE diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeCloseHandle.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeCloseHandle.java index ef3e9559..57a2de46 100644 --- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeCloseHandle.java +++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeCloseHandle.java @@ -262,21 +262,23 @@ class NodeCloseAdjMatrix extends AbstractAdjMatrix { public void buildAdjMatrix(){ for (JSONObject node : nodeList) { String currentNodeId = node.getString("id"); - JSONObject extendAttr = node.getJSONObject(SubProcessConst.EXTEND_ATTR); - // 当前节点的前置节点 - JSONArray leadNodeArr = extendAttr.getJSONArray("leadNodeArr"); - if (leadNodeArr.size() > 0){ - for (Object o : leadNodeArr) { - String leadNodeId = (String) o; - addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId)); + if (node.containsKey(SubProcessConst.EXTEND_ATTR)){ // 新拖拽到画布的节点 如果还未连线或者子流程节点还未指定关联文件信息 就不存在扩展属性 extendAttr + JSONObject extendAttr = node.getJSONObject(SubProcessConst.EXTEND_ATTR); + // 当前节点的前置节点 + JSONArray leadNodeArr = extendAttr.getJSONArray("leadNodeArr"); + if (leadNodeArr.size() > 0){ + for (Object o : leadNodeArr) { + String leadNodeId = (String) o; + addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId)); + } } - } - // 当前节点的后置节点 - JSONArray rearNodeArr = extendAttr.getJSONArray("rearNodeArr"); - if (rearNodeArr.size() > 0){ - for (Object o : rearNodeArr) { - String rearNodeId = (String) o; - addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId)); + // 当前节点的后置节点 + JSONArray rearNodeArr = extendAttr.getJSONArray("rearNodeArr"); + if (rearNodeArr.size() > 0){ + for (Object o : rearNodeArr) { + String rearNodeId = (String) o; + addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId)); + } } } } 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 10ec4f51..07ffae1d 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 @@ -388,21 +388,23 @@ class NodeExpandAdjMatrix extends AbstractAdjMatrix { public void buildAdjMatrix(){ for (JSONObject node : nodeList) { String currentNodeId = node.getString("id"); - JSONObject extendAttr = node.getJSONObject(SubProcessConst.EXTEND_ATTR); - // 当前节点的前置节点 - JSONArray leadNodeArr = extendAttr.getJSONArray("leadNodeArr"); - if (leadNodeArr.size() > 0){ - for (Object o : leadNodeArr) { - String leadNodeId = (String) o; - addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId)); + if (node.containsKey(SubProcessConst.EXTEND_ATTR)){ // 新拖拽到画布的节点 如果还未连线或者子流程节点还未指定关联文件信息 就不存在扩展属性 extendAttr + JSONObject extendAttr = node.getJSONObject(SubProcessConst.EXTEND_ATTR); + // 当前节点的前置节点 + JSONArray leadNodeArr = extendAttr.getJSONArray("leadNodeArr"); + if (leadNodeArr.size() > 0){ + for (Object o : leadNodeArr) { + String leadNodeId = (String) o; + addEdge(nodeIds.indexOf(leadNodeId), nodeIds.indexOf(currentNodeId)); + } } - } - // 当前节点的后置节点 - JSONArray rearNodeArr = extendAttr.getJSONArray("rearNodeArr"); - if (rearNodeArr.size() > 0){ - for (Object o : rearNodeArr) { - String rearNodeId = (String) o; - addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId)); + // 当前节点的后置节点 + JSONArray rearNodeArr = extendAttr.getJSONArray("rearNodeArr"); + if (rearNodeArr.size() > 0){ + for (Object o : rearNodeArr) { + String rearNodeId = (String) o; + addEdge(nodeIds.indexOf(currentNodeId), nodeIds.indexOf(rearNodeId)); + } } } } 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 7a09958e..35af23e4 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 @@ -371,6 +371,15 @@ var Designer = { } } b.attr("class", "shape_box"); + if (methodId == "process.subprocess") { + // 如果当前拖拽到画布的图形是子流程 则渲染节点展开图标 + if (g.name == 'subProcess'){ + window.subProcess.shapeOpenIconRender(g); + } + // 判断当前图形的元素类型 ElementType.INNER_NODE ElementType.OUTER_NODE + let elementType = window.subProcess.calculateShapeElementType(g); + g.elementType = elementType; + } Designer.events.push("created", g); Model.add(g); var S = Utils.getShapeContext(g.id); @@ -458,10 +467,6 @@ var Designer = { Model.update(M) } } - // 如果当前拖拽到画布的图形是子流程 则渲染节点展开图标 - if (g.name == 'subProcess') { - window.subProcess.shapeOpenIconRender(g); - } Utils.unselect(); Utils.selectShape(g.id); MessageSource.commit(); 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 d1fa97b9..92efad70 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 @@ -340,5 +340,25 @@ class SubProcess { } return false } + + // 根据当前元素的坐标设置元素类型 + calculateShapeElementType(shape){ + let elementType = "OUTER_NODE"; // 默认指定外部节点 + let props = shape.props; + let elements = Model.define.elements; + for (let key in elements) { + let ele = elements[key]; + if (ele.elementType == "SCOPE_NODE"){ // 查找范围框元素 + let scopeX = ele.props.x; + let scopeY = ele.props.y; + let scopeW = ele.props.w; + let scopeH = ele.props.h; + if (scopeX < props.x && props.x < scopeX + scopeW && scopeY < props.y && props.y < scopeY + scopeH){ + elementType = "INNER_NODE"; + } + } + } + return elementType; + } }