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 039cc274..75f32ca8 100644 Binary files a/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar and b/com.actionsoft.apps.coe.method.process.subprocess/lib/com.actionsoft.apps.coe.method.process.subprocess.jar differ diff --git a/com.actionsoft.apps.coe.method.process.subprocess/method/process.subprocess/diagram.schema.tpl b/com.actionsoft.apps.coe.method.process.subprocess/method/process.subprocess/diagram.schema.tpl index 3c5a9967..67a1fa03 100644 --- a/com.actionsoft.apps.coe.method.process.subprocess/method/process.subprocess/diagram.schema.tpl +++ b/com.actionsoft.apps.coe.method.process.subprocess/method/process.subprocess/diagram.schema.tpl @@ -536,7 +536,7 @@ Schema.addShape({name:"method_service_node4", title:"人工任务", text:"人工 {lineStyle:{lineWidth:0}, fillStyle:{type:"none"}, actions:{ref:"round"}} ]}); -Schema.addShape({name:"callActivityCallingProcess", title:"子流程", text:"子流程", category:"process_subprocess", groupName:"", props:{w:100, h:70}, +Schema.addShape({name:"subProcess", title:"子流程", text:"子流程", category:"process_subprocess", groupName:"", props:{w:100, h:70}, fillStyle:{color:"153,255,255"}, path:[ {lineStyle:{lineWidth:"lineWidth", lineStyle:"solid"}, actions:{ref:"roundRectangle"}}, diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphRender.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphRender.java index 3ea9b687..3dd6593a 100644 --- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphRender.java +++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphRender.java @@ -30,6 +30,7 @@ public class GraphRender { private PALRepositoryModel repositoryModel; private BaseModel baseModel; private Map 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); + + }