From 8dc00f5b8c95daf26a65dba0facd7ea1b7fc92d6 Mon Sep 17 00:00:00 2001
From: WangHui <742019811@qq.com>
Date: Mon, 28 Feb 2022 21:48:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E9=97=AE=E9=A2=98=EF=BC=9A=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=BF=87=E5=A4=9A=E6=97=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=EF=BC=8C=E6=97=A0=E6=B3=95=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E5=92=8C=E6=8B=96=E6=8B=BD=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=92=8C=E9=80=82=E4=B8=AD=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/package.json                         |   3 +-
 ruoyi-ui/src/components/customBpmn/index.js   |  12 +
 .../src/views/flowable/task/record/flow.vue   |  10 +-
 .../views/flowable/task/record/flowview.vue   | 244 ++++++++++++++++++
 4 files changed, 265 insertions(+), 4 deletions(-)
 create mode 100644 ruoyi-ui/src/components/customBpmn/index.js
 create mode 100644 ruoyi-ui/src/views/flowable/task/record/flowview.vue

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index acbbfb9..63fdc1f 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -60,7 +60,8 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "workflow-bpmn-modeler": "^0.2.8"
+    "workflow-bpmn-modeler": "^0.2.8",
+    "diagram-js": "^5.0.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
diff --git a/ruoyi-ui/src/components/customBpmn/index.js b/ruoyi-ui/src/components/customBpmn/index.js
new file mode 100644
index 0000000..ec9540b
--- /dev/null
+++ b/ruoyi-ui/src/components/customBpmn/index.js
@@ -0,0 +1,12 @@
+import inherits from "inherits";
+import Viewer from "bpmn-js/lib/Viewer";
+import ZoomScrollModule from "diagram-js/lib/navigation/zoomscroll";
+import MoveCanvasModule from "diagram-js/lib/navigation/movecanvas";
+function CustomViewer(options) {
+  Viewer.call(this, options);
+}
+inherits(CustomViewer, Viewer);
+CustomViewer.prototype._modules = [].concat(Viewer.prototype._modules, [ZoomScrollModule, MoveCanvasModule]);
+export {
+  CustomViewer
+};
diff --git a/ruoyi-ui/src/views/flowable/task/record/flow.vue b/ruoyi-ui/src/views/flowable/task/record/flow.vue
index 22982d0..7cd8334 100644
--- a/ruoyi-ui/src/views/flowable/task/record/flow.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/flow.vue
@@ -1,19 +1,23 @@
 <template>
   <div>
-    <bpmn-modeler
+    <!--<bpmn-modeler
       ref="refNode"
       :xml="xmlData"
       :is-view="true"
       :taskList="taskData"
-    />
+    />-->
+    <flow-view :xmlData="xmlData" :taskList="taskData"/>
   </div>
 </template>
 <script>
 import bpmnModeler from '@/components/Process/index'
+import FlowView from './flowview'
+
 export default {
   name: "Flow",
   components: {
-    bpmnModeler
+    bpmnModeler,
+    FlowView
   },
   props: {
     xmlData: {
diff --git a/ruoyi-ui/src/views/flowable/task/record/flowview.vue b/ruoyi-ui/src/views/flowable/task/record/flowview.vue
new file mode 100644
index 0000000..0542f63
--- /dev/null
+++ b/ruoyi-ui/src/views/flowable/task/record/flowview.vue
@@ -0,0 +1,244 @@
+<template>
+  <div class="containers main-box">
+    <el-button type="success"
+               size="small"
+               icon="el-icon-zoom-in"
+               @click="zoomViewport(true)">放大</el-button>
+    <el-button type="warning"
+               size="small"
+               icon="el-icon-zoom-out"
+               @click="zoomViewport(false)">缩小</el-button>
+    <el-button type="info"
+               size="small"
+               icon="el-icon-rank"
+               @click="fitViewport">适中</el-button>
+    <div class="canvas" ref="flowCanvas"></div>
+  </div>
+</template>
+<script>
+import { CustomViewer as BpmnViewer } from "@/components/customBpmn";
+
+export default {
+  name: "FlowView",
+  props: {
+    xmlData: {
+      type: String,
+      default: ''
+    },
+    taskList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      bpmnViewer: null
+    };
+  },
+  watch: {
+    xmlData: function(val) {
+      if (val) {
+        this.getImg(val)
+      }
+    }
+  },
+  mounted() {
+    // 生成实例
+    this.bpmnViewer && this.bpmnViewer.destroy();
+    this.bpmnViewer = new BpmnViewer({
+      container: this.$refs.flowCanvas,
+      height: 'calc(100vh - 200px)',
+    });
+    this.getImg(this.xmlData)
+  },
+  methods: {
+    // 获取流程图片
+    async getImg(xmlUrl) {
+      const self = this
+      try {
+        await this.bpmnViewer.importXML(xmlUrl);
+        this.fitViewport()
+        if (this.taskList !==undefined && this.taskList.length > 0 ) {
+          this.fillColor()
+        }
+      } catch (err) {
+        console.error(err.message, err.warnings)
+      }
+    },
+    // 设置高亮颜色的class
+    setNodeColor(nodeCodes, colorClass, canvas) {
+      for (let i = 0; i < nodeCodes.length; i++) {
+        canvas.addMarker(nodeCodes[i], colorClass);
+      }
+    },
+    // 让图能自适应屏幕
+    fitViewport() {
+      this.zoom = this.bpmnViewer.get('canvas').zoom("fit-viewport", "auto")
+    },
+    // 放大缩小
+    zoomViewport(zoomIn = true) {
+      this.zoom = this.bpmnViewer.get('canvas').zoom()
+      this.zoom += (zoomIn ? 0.1 : -0.1)
+      if(this.zoom >= 0.2) this.bpmnViewer.get('canvas').zoom(this.zoom)
+    },
+
+    // 设置高亮颜色的
+    fillColor() {
+      const canvas = this.bpmnViewer.get('canvas')
+      this.bpmnViewer.getDefinitions().rootElements[0].flowElements.forEach(n => {
+        const completeTask = this.taskList.find(m => m.key === n.id)
+        const todoTask = this.taskList.find(m => !m.completed)
+        const endTask = this.taskList[this.taskList.length - 1]
+        if (n.$type === 'bpmn:UserTask') {
+          if (completeTask) {
+            canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
+            n.outgoing?.forEach(nn => {
+              const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
+              if (targetTask) {
+                if (todoTask && completeTask.key === todoTask.key && !todoTask.completed){
+                  canvas.addMarker(nn.id, todoTask.completed ? 'highlight' : 'highlight-todo')
+                  canvas.addMarker(nn.targetRef.id, todoTask.completed ? 'highlight' : 'highlight-todo')
+                }else {
+                  canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+                  canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+                }
+              }
+            })
+          }
+        }
+        // 排他网关
+        else if (n.$type === 'bpmn:ExclusiveGateway') {
+          if (completeTask) {
+            canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
+            n.outgoing?.forEach(nn => {
+              const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
+              if (targetTask) {
+
+                canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+                canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+              }
+
+            })
+          }
+
+        }
+        // 并行网关
+        else if (n.$type === 'bpmn:ParallelGateway') {
+          if (completeTask) {
+            canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
+            n.outgoing?.forEach(nn => {
+              debugger
+              const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
+              if (targetTask) {
+                canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+                canvas.addMarker(nn.targetRef.id, targetTask.completed ? 'highlight' : 'highlight-todo')
+              }
+            })
+          }
+        }
+        else if (n.$type === 'bpmn:StartEvent') {
+          n.outgoing.forEach(nn => {
+            const completeTask = this.taskList.find(m => m.key === nn.targetRef.id)
+            if (completeTask) {
+              canvas.addMarker(nn.id, 'highlight')
+              canvas.addMarker(n.id, 'highlight')
+              return
+            }
+          })
+        }
+        else if (n.$type === 'bpmn:EndEvent') {
+          if (endTask.key === n.id && endTask.completed) {
+            canvas.addMarker(n.id, 'highlight')
+            return
+          }
+        }
+      })
+    },
+  }
+};
+</script>
+<style lang="scss">
+  @import "../../../../../node_modules/bpmn-js/dist/assets/diagram-js.css";
+  @import "../../../../../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn.css";
+  @import "../../../../../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css";
+  @import "../../../../../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css";
+  .bjs-powered-by {
+    display: none;
+  }
+  .view-mode {
+    .el-header, .el-aside, .djs-palette, .bjs-powered-by {
+      display: none;
+    }
+    .el-loading-mask {
+      background-color: initial;
+    }
+    .el-loading-spinner {
+      display: none;
+    }
+  }
+  .containers {
+    // background-color: #ffffff;
+    width: 100%;
+    height: 100%;
+    .canvas {
+      width: 100%;
+      height: 100%;
+    }
+    .panel {
+      position: absolute;
+      right: 0;
+      top: 50px;
+      width: 300px;
+    }
+    .load {
+      margin-right: 10px;
+    }
+    .el-form-item__label{
+      font-size: 13px;
+    }
+
+    .djs-palette{
+      left: 0px!important;
+      top: 0px;
+      border-top: none;
+    }
+
+    .djs-container svg {
+      min-height: 650px;
+    }
+
+    .highlight.djs-shape .djs-visual > :nth-child(1) {
+      fill: green !important;
+      stroke: green !important;
+      fill-opacity: 0.2 !important;
+    }
+    .highlight.djs-shape .djs-visual > :nth-child(2) {
+      fill: green !important;
+    }
+    .highlight.djs-shape .djs-visual > path {
+      fill: green !important;
+      fill-opacity: 0.2 !important;
+      stroke: green !important;
+    }
+    .highlight.djs-connection > .djs-visual > path {
+      stroke: green !important;
+    }
+    .highlight-todo.djs-connection > .djs-visual > path {
+      stroke: orange !important;
+      stroke-dasharray: 4px !important;
+      fill-opacity: 0.2 !important;
+    }
+    .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
+      fill: orange !important;
+      stroke: orange !important;
+      stroke-dasharray: 4px !important;
+      fill-opacity: 0.2 !important;
+    }
+    .overlays-div {
+      font-size: 10px;
+      color: red;
+      width: 100px;
+      top: -20px !important;
+    }
+  }
+</style>

From 3e34a6cc9ed89cef1d30d9285ecad9c248384b3a Mon Sep 17 00:00:00 2001
From: WangHui <742019811@qq.com>
Date: Mon, 28 Feb 2022 21:53:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E5=88=A0=E9=99=A4=E5=B7=B2=E9=80=89?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=97=B6=E5=BE=85=E9=80=89=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E6=B2=A1=E6=9C=89=E5=8F=96=E6=B6=88=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=81=94=E5=8A=A8=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/flowable/task/record/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index 6f9fe55..38a5550 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -72,7 +72,7 @@
     <!--审批正常流程-->
     <el-dialog :title="completeTitle" :visible.sync="completeOpen" :width="checkSendUser? '60%':'40%'" append-to-body>
       <el-form ref="taskForm" :model="taskForm" label-width="80px" >
-        <el-form-item  v-if="checkSendUser" label="处理人" prop="targetKey">
+        <el-form-item  v-if="checkSendUser" prop="targetKey">
           <el-row :gutter="20">
             <!--部门数据-->
             <el-col :span="4" :xs="24">
@@ -116,7 +116,7 @@
               <h6>已选人员</h6>
               <el-tag
                 v-for="tag in userData"
-                :key="tag.nickName"
+                :key="tag"
                 closable
                 @close="handleClose(tag)">
                 {{tag.nickName}} {{tag.dept.deptName}}
@@ -350,6 +350,7 @@ export default {
     // 关闭标签
     handleClose(tag) {
       this.userData.splice(this.userData.indexOf(tag), 1);
+      this.$refs.singleTable.toggleRowSelection(tag, false)
     },
     /** 流程变量赋值 */
     handleCheckChange(val) {

From 38ed4750c7e530935d6b14c1d4bea83391c01dac Mon Sep 17 00:00:00 2001
From: WangHui <742019811@qq.com>
Date: Mon, 28 Feb 2022 21:54:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E5=BC=82=E6=AD=A5=E9=97=AE=E9=A2=98=EF=BC=9A=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=8A=82=E7=82=B9=E8=AE=BE=E7=BD=AE=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Process/components/nodePanel/task.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
index 61a00d1..dae7e30 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/task.vue
@@ -326,7 +326,7 @@ export default {
     },
     'formData.async': function(val) {
       if (val === '') val = null
-      this.updateProperties({ 'flowable:async': true })
+      this.updateProperties({ 'flowable:async': val })
     },
     'formData.dueDate': function(val) {
       if (val === '') val = null