From d839adedff05c9c251fd72587d1cae285d7ff64d Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 21 Jan 2022 01:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E7=AE=97=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E7=89=88=E6=9C=AC=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E9=AB=98=E4=BA=AE=EF=BC=8C=E5=9F=BA=E4=BA=8E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/designer/ProcessViewer.vue | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/yudao-admin-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/yudao-admin-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue index 20de0f418..9d2154659 100644 --- a/yudao-admin-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue +++ b/yudao-admin-ui/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue @@ -104,11 +104,6 @@ export default { /* 高亮流程图 */ // TODO 芋艿:如果多个 endActivity 的话,目前的逻辑可能有一定的问题。https://www.jdon.com/workflow/multi-events.html async highlightDiagram() { - // let activityList = this.activityList.filter(task => { - // if (task.type !== 'sequenceFlow') { // 去除连线元素 - // return true; - // } - // }); const activityList = this.activityList; if (activityList.length === 0) { return; @@ -141,15 +136,13 @@ export default { outgoing?.forEach(nn => { // debugger let targetActivity = activityList.find(m => m.key === nn.targetRef.id) + // 如果目标活动存在,则根据该活动是否结束,进行【bpmn:SequenceFlow】连线的高亮设置 if (targetActivity) { - // debugger canvas.addMarker(nn.id, targetActivity.endTime ? 'highlight' : 'highlight-todo'); - } else if (nn.targetRef.$type === 'bpmn:ExclusiveGateway') { - // debugger + } else if (nn.targetRef.$type === 'bpmn:ExclusiveGateway') { // TODO 芋艿:这个流程,暂时没走到过 canvas.addMarker(nn.id, activity.endTime ? 'highlight' : 'highlight-todo'); canvas.addMarker(nn.targetRef.id, activity.endTime ? 'highlight' : 'highlight-todo'); - } else if (nn.targetRef.$type === 'bpmn:EndEvent') { - // debugger + } else if (nn.targetRef.$type === 'bpmn:EndEvent') { // TODO 芋艿:这个流程,暂时没走到过 if (!todoActivity && endActivity.key === n.id) { canvas.addMarker(nn.id, 'highlight'); canvas.addMarker(nn.targetRef.id, 'highlight');