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 34bf9184..13284d53 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/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java index 4929b070..06636587 100644 --- a/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java +++ b/com.actionsoft.apps.coe.method.process.subprocess/src/com/actionsoft/apps/coe/method/process/subprocess/graph/GraphNodeExpandHandle.java @@ -9,6 +9,7 @@ import com.actionsoft.apps.coe.method.process.subprocess.graph.util.SubProcessNo import com.actionsoft.apps.coe.method.process.subprocess.mode.Node; import com.actionsoft.apps.coe.method.process.subprocess.mode.ScopeShapeMonitor; import com.actionsoft.apps.coe.method.process.subprocess.observers.node.NodeSubject; +import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel; import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache; @@ -99,6 +100,8 @@ public class GraphNodeExpandHandle { scopeLimitationShape.put("dataAttributes", currentExpandShape.getJSONArray("dataAttributes")); + scopeLimitationShape.put("relationFileName", PALRepositoryCache.getCache().get(relationFileId).getName()); + this.scopeLimitationShape = scopeLimitationShape; // 通知其它节点位置更新 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 47200d3e..8744dab6 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 @@ -2091,6 +2091,9 @@ var Designer = { function() { Designer.op.hideLinkPoint(); Designer.op.resetState(); + if (methodId == 'process.subprocess') { // 如果建模为端到端 连线样式调整 防止因层级原因 子流程展开或者关闭按钮 点击不到 + window.subProcess.linkerBoxPointerEvent(); + } f.unbind("mousedown.link"); f.unbind("mousemove.link"); $(document).unbind("mouseup.link") 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 dd7113db..7d1ba52f 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 @@ -2111,6 +2111,9 @@ var Designer = { function () { Designer.op.hideLinkPoint(); Designer.op.resetState(); + if (methodId == 'process.subprocess') { // 如果建模为端到端 连线样式调整 防止因层级原因 子流程展开或者关闭按钮 点击不到 + window.subProcess.linkerBoxPointerEvent(); + } f.unbind("mousedown.link"); f.unbind("mousemove.link"); $(document).unbind("mouseup.link") 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 951f2c2e..d4b4128e 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 @@ -156,7 +156,7 @@ class SubProcess { // 针对范围标识框渲染 节点关闭按钮 window.subProcess.shapeIconRender(); window.subProcess.linkerBoxPointerEvent(); - window.subProcess.scopeShapeRenderTitle(param.shapeId, shapeText); + window.subProcess.scopeShapeRenderTitle(r.data.elements); // 提示用户文件已修改 window.subProcess.fileModifiedTip(); }, @@ -166,9 +166,15 @@ class SubProcess { // 3、刷新当前画布 } - scopeShapeRenderTitle(shapeId, title){ - let titleHtml = ""+title+""; - $('#'+shapeId).prepend(titleHtml); + scopeShapeRenderTitle(elements){ + for (let key in elements) { + let element = elements[key]; + if (element.name == 'linker') continue; + if (element.name == 'scopeLimitation'){ // 范围标识框 + let titleHtml = ""+element.relationFileName+""; + $('#'+key).prepend(titleHtml); + } + } } // 节点关闭事件 @@ -223,6 +229,9 @@ class SubProcess { // 针对范围标识框渲染 节点关闭按钮 window.subProcess.shapeIconRender(); window.subProcess.linkerBoxPointerEvent(); + if (action == 'expand') { + window.subProcess.scopeShapeRenderTitle(r.data.elements); + } // 提示用户文件已修改 window.subProcess.fileModifiedTip(); }