From fc8e0747ca18e10b903e2f179fae90d349c6cfba Mon Sep 17 00:00:00 2001 From: qinoy Date: Thu, 8 Jun 2023 13:52:50 +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=E4=B8=8E=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E7=9B=B8=E5=85=B3=E4=BB=A3=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 64353 -> 64508 bytes .../graph/GraphNodeExpandHandle.java | 24 +++++++--- .../scripts/diagraming/designer.core.debug.js | 42 +++++++++--------- .../scripts/diagraming/designer.core.js | 31 ++++++++++++- 4 files changed, 71 insertions(+), 26 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 7eb41992ed4d9c31d18ec438b9999726c7e02b31..67cce7ac42a84cd172f3959abcf080d518bd8dad 100644 GIT binary patch delta 13388 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 scopeShapeX) { // 当前元素在待展开节点的右侧 - props.put("x", props.getDoubleValue("x") + scopeShapeW - SubProcessConst.SUB_PROCESS_SHAPE_W); - } - if (props.getDoubleValue("y") > scopeShapeY) { // 当前元素在待展开节点的下侧 - props.put("y", props.getDoubleValue("y") + scopeShapeH - SubProcessConst.SUB_PROCESS_SHAPE_H); + if (ele.getString("id").equals(scopeLimitationShape.getString("id"))) continue; + if ("vertically".equals(direction)){ + if (props.getDoubleValue("x") > scopeShapeX) { // 当前元素在待展开节点的右侧 + props.put("x", props.getDoubleValue("x") + scopeShapeW - SubProcessConst.SUB_PROCESS_SHAPE_W); + } + if (props.getDoubleValue("y") > scopeShapeY || props.getDoubleValue("y") == scopeShapeY) { // 当前元素在待展开节点的下侧 + props.put("y", props.getDoubleValue("y") + scopeShapeH - SubProcessConst.SUB_PROCESS_SHAPE_H); + } + }else { + if (props.getDoubleValue("x") > scopeShapeX) { // 当前元素在待展开节点的右侧 + props.put("x", props.getDoubleValue("x") + scopeShapeW - SubProcessConst.SUB_PROCESS_SHAPE_W); + }else if (props.getDoubleValue("x") == scopeShapeX && props.getDoubleValue("y") > scopeShapeY) { // 当前元素与待展开节点在一列上 且在下侧 + props.put("x", props.getDoubleValue("x") + scopeShapeW - SubProcessConst.SUB_PROCESS_SHAPE_W); + } + if (props.getDoubleValue("y") > scopeShapeY) { // 当前元素在待展开节点的下侧 + props.put("y", props.getDoubleValue("y") + scopeShapeH - SubProcessConst.SUB_PROCESS_SHAPE_H); + } } addEndToEndGraphElements(ele); 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 451d96cb..47200d3e 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 @@ -1163,27 +1163,29 @@ var Designer = { if (g.x == 0 && g.y == 0) { return } - // 端到端功能 如果移动的元素是子流程节点展开后 范围框中的元素 则进行移动范围限制校验 - let rang = window.subProcess.scopeRang; - let movingEle = window.subProcess.movingEle; - if (movingEle != null && rang != null){ - let flag = false; - for (let k = 0; k < u.length; k++) { - if (u[k].name == "linker") continue; - if (u[k].id == movingEle.id) flag = true; - } - if (flag){ - let movingEleBound = { - x: movingEle.props.x, - y: movingEle.props.y, - w: movingEle.props.w, - h: movingEle.props.h + if (methodId == 'process.subprocess') { // 如果当前打开的模型不是端到端总图 那么整个js也没有执行的必要 + // 端到端功能 如果移动的元素是子流程节点展开后 范围框中的元素 则进行移动范围限制校验 + let rang = window.subProcess.scopeRang; + let movingEle = window.subProcess.movingEle; + if (movingEle != null && rang != null){ + let flag = false; + for (let k = 0; k < u.length; k++) { + if (u[k].name == "linker") continue; + if (u[k].id == movingEle.id) flag = true; } - if (movingEleBound.x + g.x <= rang.x1 || movingEleBound.x + movingEleBound.w + g.x >= rang.x2 || movingEleBound.y + g.y <= rang.y1 || movingEleBound.y + movingEleBound.h + g.y >= rang.y2){ - $.simpleAlert("子流程内部节点只能在范围标识框内部移动", "warning"); - d.unbind("mousemove.drag"); - c.unbind("mousedown.drag"); - return; + if (flag){ + let movingEleBound = { + x: movingEle.props.x, + y: movingEle.props.y, + w: movingEle.props.w, + h: movingEle.props.h + } + if (movingEleBound.x + g.x <= rang.x1 || movingEleBound.x + movingEleBound.w + g.x >= rang.x2 || movingEleBound.y + g.y <= rang.y1 || movingEleBound.y + movingEleBound.h + g.y >= rang.y2){ + $.simpleAlert("子流程内部节点只能在范围标识框内部移动", "warning"); + d.unbind("mousemove.drag"); + c.unbind("mousedown.drag"); + return; + } } } } 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 5c3c3bbb..dd7113db 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 @@ -458,6 +458,10 @@ var Designer = { Model.update(M) } } + // 如果当前拖拽到画布的图形是子流程 则渲染节点展开图标 + if (g.name == 'subProcess') { + window.subProcess.shapeOpenIconRender(g); + } Utils.unselect(); Utils.selectShape(g.id); MessageSource.commit(); @@ -928,7 +932,6 @@ var Designer = { } }, init: function () { - debugger; this.initialize.initLayout(); this.initialize.initModel(); this.initialize.initCanvas(); @@ -1177,6 +1180,32 @@ var Designer = { if (g.x == 0 && g.y == 0) { return } + if (methodId == 'process.subprocess') { // 如果当前打开的模型不是端到端总图 那么整个js也没有执行的必要 + // 端到端功能 如果移动的元素是子流程节点展开后 范围框中的元素 则进行移动范围限制校验 + let rang = window.subProcess.scopeRang; + let movingEle = window.subProcess.movingEle; + if (movingEle != null && rang != null){ + let flag = false; + for (let k = 0; k < u.length; k++) { + if (u[k].name == "linker") continue; + if (u[k].id == movingEle.id) flag = true; + } + if (flag){ + let movingEleBound = { + x: movingEle.props.x, + y: movingEle.props.y, + w: movingEle.props.w, + h: movingEle.props.h + } + if (movingEleBound.x + g.x <= rang.x1 || movingEleBound.x + movingEleBound.w + g.x >= rang.x2 || movingEleBound.y + g.y <= rang.y1 || movingEleBound.y + movingEleBound.h + g.y >= rang.y2){ + $.simpleAlert("子流程内部节点只能在范围标识框内部移动", "warning"); + d.unbind("mousemove.drag"); + c.unbind("mousedown.drag"); + return; + } + } + } + } Designer.op.moveShape(u, g); x = f; $(document).unbind("mouseup.drop").bind("mouseup.drop",