From acd3a86f5d5584c74d5d4382816e53b93c9c1fd6 Mon Sep 17 00:00:00 2001 From: qinoy Date: Tue, 6 Jun 2023 09:38:57 +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=20=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BA=A4=E4=BA=92=E7=9A=84=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=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 51434 -> 52416 bytes .../subprocess/graph/VertexPreHandle.java | 32 +++++----- .../subprocess/mode/vo/IndependentNodeVo.java | 2 - .../mode/vo/LeadAndRearNotInRangeNodeVo.java | 58 ++++++++++++++++++ .../scripts/diagraming/designer.core.debug.js | 1 - .../diagraming/designer.method.subprocess.js | 39 ++++++++---- 6 files changed, 103 insertions(+), 29 deletions(-) create mode 100644 com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/LeadAndRearNotInRangeNodeVo.java 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 e834f98c2516d0c8a9b747e612d164c9cb64191e..7cfcaca6ef9d8671680e2abd9fc1350b75e1a983 100644 GIT binary patch delta 6041 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 V(j_GNQ;hwu_ka=r80h=s{TI-O9&7*r delta 5209 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 diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java index eb6377af..a9fb508e 100644 --- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java +++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/VertexPreHandle.java @@ -3,6 +3,7 @@ package com.actionsoft.apps.coe.method.process.subprocess.graph; import com.actionsoft.apps.coe.method.process.subprocess.constant.SubProcessConst; import com.actionsoft.apps.coe.method.process.subprocess.mode.Node; import com.actionsoft.apps.coe.method.process.subprocess.mode.vo.IndependentNodeVo; +import com.actionsoft.apps.coe.method.process.subprocess.mode.vo.LeadAndRearNotInRangeNodeVo; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache; @@ -10,6 +11,8 @@ import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.dao.Designer import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; import com.actionsoft.exception.AWSException; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import java.util.*; import java.util.stream.Collectors; @@ -35,7 +38,7 @@ public class VertexPreHandle { * @return * @throws AWSException */ - public Map> collectIndependentNode(List processIdList) throws AWSException{ + public Map collectIndependentNode(List processIdList) throws AWSException{ List nodeVoList = new ArrayList<>(); List attrIdList = new ArrayList<>(); @@ -71,13 +74,12 @@ public class VertexPreHandle { independentNodeVo.setBeReference(true); }; - // 3. 收集独立节点信息返回给前台 nodeVoList.add(independentNodeVo); } - Map> map = new HashMap<>(); + Map map = new HashMap<>(); List independentNodeVos = new ArrayList<>(); - List leadAndRearNotInRange = new ArrayList<>(); + List leadAndRearNotInRange = new ArrayList<>(); for (IndependentNodeVo nodeVo : nodeVoList) { if (nodeVo.isBeReference()) continue; // 被引用了 不管有没有前置或后置 都保留 if (nodeVo.getLeadNodeVo() == null && nodeVo.getRearNodeVo() == null && !nodeVo.isBeReference()){ // 完全独立 @@ -87,19 +89,21 @@ public class VertexPreHandle { List leadNodeVos = nodeVo.getLeadNodeVo(); if (leadNodeVos != null && leadNodeVos.size() > 0){ - List nodeIds = leadNodeVos.stream().map(leadNodeVo -> leadNodeVo.getId()).collect(Collectors.toList()); - if (!processIdList.containsAll(nodeIds)){ - leadAndRearNotInRange.add(nodeVo); - continue; - } + leadNodeVos.stream().forEach(leadNodeVo -> { + if (!processIdList.contains(leadNodeVo.getId())){ + LeadAndRearNotInRangeNodeVo notInRangeNodeVo = new LeadAndRearNotInRangeNodeVo(leadNodeVo.getId(), leadNodeVo.getName(), nodeVo.getName(), SubProcessConst.LEAD_PROCESS_ATTR_ID, "上游流程"); + leadAndRearNotInRange.add(notInRangeNodeVo); + } + }); } List rearNodeVos = nodeVo.getRearNodeVo(); if (rearNodeVos != null && rearNodeVos.size() > 0){ - List nodeIds = rearNodeVos.stream().map(rearNodeVo -> rearNodeVo.getId()).collect(Collectors.toList()); - if (!processIdList.containsAll(nodeIds)){ - leadAndRearNotInRange.add(nodeVo); - continue; - } + rearNodeVos.stream().forEach(rearNodeVo -> { + if (!processIdList.contains(rearNodeVo.getId())){ + LeadAndRearNotInRangeNodeVo notInRangeNodeVo = new LeadAndRearNotInRangeNodeVo(rearNodeVo.getId(), rearNodeVo.getName(), nodeVo.getName(), SubProcessConst.REAR_PROCESS_ATTR_ID, "下游流程"); + leadAndRearNotInRange.add(notInRangeNodeVo); + } + }); } } map.put("independentNodeVos", independentNodeVos); diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/IndependentNodeVo.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/IndependentNodeVo.java index 3fae9606..99e6eb85 100644 --- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/IndependentNodeVo.java +++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/IndependentNodeVo.java @@ -13,8 +13,6 @@ public class IndependentNodeVo { private List leadNodeVo; private List rearNodeVo; private boolean isBeReference; - private String leadNodeNames; - private String rearNodeNames; public IndependentNodeVo(String id, String name) { this.id = id; diff --git a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/LeadAndRearNotInRangeNodeVo.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/LeadAndRearNotInRangeNodeVo.java new file mode 100644 index 00000000..14a4d239 --- /dev/null +++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/mode/vo/LeadAndRearNotInRangeNodeVo.java @@ -0,0 +1,58 @@ +package com.actionsoft.apps.coe.method.process.subprocess.mode.vo; + +public class LeadAndRearNotInRangeNodeVo { + + private String id; + private String name; + private String relationName; + private String type; + private String typeName; + + public LeadAndRearNotInRangeNodeVo(String id, String name, String relationName, String type, String typeName) { + this.id = id; + this.name = name; + this.relationName = relationName; + this.type = type; + this.typeName = typeName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRelationName() { + return relationName; + } + + public void setRelationName(String relationName) { + this.relationName = relationName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } +} diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js index 44182c7c..2e12adbd 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js @@ -4900,7 +4900,6 @@ var Designer = { b.fillText(y, 0, a / 2); } if (x != "") { - debugger; if (x.indexOf("&#x") >= 0) { var icon = x.split("|")[0]; var iconColor = x.split("|")[1]; 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 63c0bfdf..ef2244b6 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 @@ -25,6 +25,7 @@ class SubProcess { this.Model = Model; this.repositoryId = ruuid; this.sid = sid; + this.scopeEle = {}; } init(){ @@ -69,20 +70,34 @@ class SubProcess { c.off("mousemove").on("mousemove",function (a) { let b = Utils.getRelativePos(a.pageX, a.pageY, c); // 实时获取鼠标移动的坐标 let j = Utils.getShapeByPosition(b.x, b.y); // 根据鼠标当前移动的位置获取当前图形 如果有的话 - if (j != null && j.shape.name == 'scopeLimitation') { // 当前鼠标所在位置为范围选择框范围内 - console.log('当前图形 ', j.shape.name); - let range = { - x: j.shape.props.x, - y: j.shape.props.y, - w: j.shape.props.w, - h: j.shape.props.h - }; - let e = Utils.getShapesByRange(range); - c.off("mousedown").on("mousedown", function (f) { + // console.log("当前图形", j); + if (j != null && j.shape.name != 'subProcess') { // 当前鼠标所在位置为范围选择框范围内 + if (j.shape.name == 'scopeLimitation'){ + let range = { + x: j.shape.props.x, + y: j.shape.props.y, + w: j.shape.props.w, + h: j.shape.props.h + }; + let e = Utils.getShapesByRange(range); + window.subProcess.scopeEle[j.shape.id] = e; + $('#'+j.shape.id).off("mousedown").on("mousedown", function (f) { + Utils.unselect(); + Utils.selectShape(e); + }); + }else { // 范围选择框内的元素 Utils.unselect(); - Utils.selectShape(e); - }); + // console.log('范围标注框的图形是否存了下来', window.subProcess.scopeEle); + let scopeEle = window.subProcess.scopeEle; + for (const scopeShapeId in scopeEle) { + let eles = scopeEle[scopeShapeId]; + if (eles.indexOf(j.shape.id) != -1){ + console.log("范围选择框内的元素发生移动") + // 移动的范围 + } + } + } } }); }