diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 3655dd59..b8263dc4 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java index cd7162d1..1734ecd2 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java @@ -946,6 +946,14 @@ public class DesignerRelationShapeWeb extends ActionWeb { } } macroLibraries.put("treeData", jsonArr_new.toString()); + } else if ("child_process".equals(attrId)){ + // 端到端功能 只保留文件夹 架构 process.epc process.flowchart + objects = objects.stream() + .filter(o -> !((JSONObject)o).containsKey("plMethodId") || "default".equals(((JSONObject)o).getString("plMethodId")) + || "process.framework".equals(((JSONObject)o).getString("plMethodId")) + || "process.epc".equals(((JSONObject)o).getString("plMethodId")) + || "process.flowchart".equals(((JSONObject)o).getString("plMethodId"))).collect(Collectors.toCollection(JSONArray::new)); + macroLibraries.put("treeData", objects.toString()); } else { macroLibraries.put("treeData", treeJson); } @@ -1393,6 +1401,20 @@ public class DesignerRelationShapeWeb extends ActionWeb { } } + + // 端到端功能 只保留文件夹 架构 process.epc process.flowchart + if ("child_process".equals(attrId)){ + String plMethodId = node.getString("plMethodId"); + if ("default".equals(plMethodId) || "process.framework".equals(plMethodId) || "process.epc".equals(plMethodId) || "process.flowchart".equals(plMethodId)){ + if (isParent.equals("true")) { + node.put("nocheck", true); + result.add(node); + } else { + node.put("nocheck", false); + result.add(node); + } + } + } } }