From c068e9195f9da1fe7a3b7f3d46055aa3b8c604fa Mon Sep 17 00:00:00 2001 From: qinoy Date: Wed, 24 May 2023 17:59:33 +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=9B=BE=E5=BD=A2=E4=B8=8E=E8=BF=9E=E7=BA=BF=E7=9A=84?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=A4=A7=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oft.apps.coe.method.process.subprocess.jar | Bin 42463 -> 42555 bytes .../process.subprocess/diagram.schema.tpl | 2 +- .../process/subprocess/graph/GraphRender.java | 4 ++++ .../process/subprocess/web/SubProcessWeb.java | 7 ++++--- 4 files changed, 9 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 039cc2746efbf9f6cbb9d8e3d8a20ff964fae220..75f32ca81b0b7de5066cc54da629bdb0479514da 100644 GIT binary patch delta 7702 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 delta 7645 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 idMap; + private long zIndex; public GraphRender(PALRepositoryModel repositoryModel, List nodeList, double width, double height) { @@ -73,6 +74,7 @@ public class GraphRender { JSONObject subProcessNodeProps = subProcessNode.getJSONObject("props"); subProcessNodeProps.put("x", position[i][0]); subProcessNodeProps.put("y", position[i][1]); + subProcessNodeProps.put("zindex", zIndex++); subProcessNode.put("text", repositoryModel.getName()); // 处理子流程模型节点形状属性 @@ -132,6 +134,8 @@ public class GraphRender { if (linkers != null && linkers.size() > 0){ for (Object obj : linkers) { JSONObject linker = (JSONObject) obj; + JSONObject props = linker.getJSONObject("props"); + props.put("zindex", zIndex++); JSONObject fromObj = linker.getJSONObject("from"); String fromId = idMap.get(fromObj.getString("id")); fromObj.put("id", fromId); 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 ef04e294..d8bb5c4a 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 @@ -284,12 +284,13 @@ public class SubProcessWeb extends ActionWeb { CoeProcessLevelDaoFacotory.createCoeProcessLevel().insert(model); - // 节点渲染 GraphRender graphRender = new GraphRender(model, nodeList, graphLayout.getCanvasWidth(), graphLayout.getCanvasHeight()); - graphRender.handleShapeNodeRender(position); - // 连线渲染 graphRender.handShapeLinkerRender(linkers); + // 节点渲染 + graphRender.handleShapeNodeRender(position); + + }