From 8c894e7c5189ef056cc1d956d66c04896c09ccb7 Mon Sep 17 00:00:00 2001 From: qinoy Date: Fri, 7 Jul 2023 17:49:46 +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=E5=B1=95=E5=BC=80=E5=90=8E=E5=86=85?= =?UTF-8?q?=E5=A4=96=E8=8A=82=E7=82=B9=E8=BF=9E=E7=BA=BF=E5=A4=84=E7=90=86?= =?UTF-8?q?=20=E9=98=B6=E6=AE=B5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oft.apps.coe.method.process.subprocess.jar | Bin 100405 -> 100425 bytes .../repository/web/CoeProcessLevelWeb.java | 70 ++++++++++++++++++ .../js/coe.team.pal.designer.js | 1 + .../scripts/diagraming/designer.core.js | 2 +- .../diagraming/designer.method.subprocess.js | 5 +- 5 files changed, 76 insertions(+), 2 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 8c6c9989e90652e6b3b2ebca44c43d4e9d8153e1..ab83e6c4afa75c31fc53b06cccdbde0631bf40d5 100644 GIT binary patch delta 10155 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 Hr_lccG~!0< delta 10096 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 linkers = elements.keySet() + .stream() + .filter(key -> "OUTER_LINKER".equals(elements.getJSONObject(key).getString("elementType")) || "CROSS_LINKER".equals(elements.getJSONObject(key).getString("elementType"))) + .map(key -> elements.getJSONObject(key)) + .collect(Collectors.toList()); + List nodeList = elements.keySet() + .stream().filter(key -> "OUTER_NODE".equals(elements.getJSONObject(key).getString("elementType")) || "SCOPE_NODE".equals(elements.getJSONObject(key).getString("elementType"))) + .map(key -> elements.getJSONObject(key)) + .collect(Collectors.toList()); + + JSONObject nodeLinkerRecord = new JSONObject(); + if (definition.containsKey("nodeLinkerRecord")){ + nodeLinkerRecord = definition.getJSONObject("nodeLinkerRecord"); + } + for (JSONObject shape : nodeList) { + String shapeId = shape.getString("id"); + JSONObject recordContent = new JSONObject(); + JSONArray leadLinkerInfo = new JSONArray(); // 前置连线信息 + JSONArray rearLinkerInfo = new JSONArray(); // 后置连线信息 + + for (JSONObject linker : linkers) { + JSONObject from = linker.getJSONObject("from"); + JSONObject to = linker.getJSONObject("to"); + JSONObject fromNode = elements.getJSONObject(from.getString("id")); + JSONObject toNode = elements.getJSONObject(to.getString("id")); + + JSONObject linkerInfo = new JSONObject(); + linkerInfo.put("linker", JSONObject.parse(linker.toString())); + linkerInfo.put("fromNodeType", fromNode.getString("elementType").equals("OUTER_NODE") ? "close" : "expand"); + linkerInfo.put("toNodeType", toNode.getString("elementType").equals("OUTER_NODE") ? "close" : "expand"); + if ("OUTER_NODE".equals(shape.getString("elementType"))){ // 当前节点闭合 + if (shapeId.equals(to.getString("id"))){ // 当前节点的前置连线信息 + linkerInfo.put("leadNodeId", "OUTER_NODE".equals(fromNode.getString("elementType")) ? from.getString("id") : fromNode.getString("scopeShapeId")); + leadLinkerInfo.add(linkerInfo); + }else if (shapeId.equals(from.getString("id"))){ // 当前节点的后置连线信息 + linkerInfo.put("rearNodeId", "OUTER_NODE".equals(toNode.getString("elementType")) ? to.getString("id") : toNode.getString("scopeShapeId")); + rearLinkerInfo.add(linkerInfo); + } + }else { + if (shapeId.equals(toNode.getString("scopeShapeId"))){ + linkerInfo.put("leadNodeId", "OUTER_NODE".equals(fromNode.getString("elementType")) ? from.getString("id") : fromNode.getString("scopeShapeId")); + leadLinkerInfo.add(linkerInfo); + }else if (shapeId.equals(fromNode.getString("scopeShapeId"))){ + linkerInfo.put("rearNodeId", "OUTER_NODE".equals(toNode.getString("elementType")) ? to.getString("id") : toNode.getString("scopeShapeId")); + rearLinkerInfo.add(linkerInfo); + } + } + } + recordContent.put("leadLinkerInfo", leadLinkerInfo); + recordContent.put("rearLinkerInfo", rearLinkerInfo); + + + JSONObject status = new JSONObject(); + if (nodeLinkerRecord.containsKey(shapeId)){ + status = nodeLinkerRecord.getJSONObject(shapeId); + } + if ("OUTER_NODE".equals(shape.getString("elementType"))){ // 当前状态为闭合 + status.put("close", recordContent); + }else { // 当前状态为展开 + status.put("expand", recordContent); + } + + nodeLinkerRecord.put(shapeId, status); + } + definition.put("nodeLinkerRecord", nodeLinkerRecord); + + }else if (repositoryModel.getMethodId().equals("process.epc") || repositoryModel.getMethodId().equals("process.flowchart")){ // 判断当前模型是否被某一个总图引用 DesignerShapeRelationDao shapeRelationDao = new DesignerShapeRelationDao(); @@ -6259,6 +6328,7 @@ public class CoeProcessLevelWeb extends ActionWeb { if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) { CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_REPOSITORY, CoEOpLogConst.OP_UPDATE, CoEOpLogConst.INFO_REPOSITORY_DESIGNER_UPDATE); } + ro.put("define", definition); return ro.toString(); } diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js index ef69d7f2..096b1c3d 100644 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js @@ -143,6 +143,7 @@ $(function() { } }); } + Model.define.nodeLinkerRecord = msg.data.define.nodeLinkerRecord; $.simpleAlert("保存成功", "ok"); //保存结束时间戳 //var saveEndTime = new Date().getTime(); 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 079c1b8e..91ae6168 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 @@ -2180,7 +2180,7 @@ var Designer = { if (from.id != null && to.id != null){ let fromObj = Model.getShapeById(from.id); let toObj = Model.getShapeById(to.id); - if (fromObj.elementType == "OUTER_NODE" && toObj.elementType == "OUTER_NODE"){ + if ((fromObj.elementType == "OUTER_NODE" && toObj.elementType == "OUTER_NODE") || (fromObj.elementType == "SCOPE_NODE" && toObj.elementType == "SCOPE_NODE")){ d.elementType = "OUTER_LINKER"; window.subProcess.outerNodeExtendAttrHandle(d); }else if (fromObj.elementType == "INNER_NODE" && toObj.elementType == "INNER_NODE"){ 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 0fd0b94b..7a1bc1f6 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 @@ -91,7 +91,7 @@ class SubProcess { Utils.unselect(); Utils.selectShape(e); }); - }else { + }else if (j.shape.elementType == 'INNER_NODE') { // console.log('范围标注框的图形是否存了下来', window.subProcess.scopeEle); let scopeEle = window.subProcess.scopeEle; for (const scopeShapeId in scopeEle) { @@ -116,6 +116,9 @@ class SubProcess { window.subProcess.movingEle = Model.getShapeById(j.shape.id); } } + }else { + window.subProcess.movingEle = null; + window.subProcess.scopeRang = null; } }else { window.subProcess.movingEle = null;