From ffe870872fb317dff7b480c01cfce8bed64bc6d8 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Mon, 19 Dec 2022 19:56:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/package.json                                 |  7 ++++---
 ruoyi-ui/src/components/Process/PropertyPanel.vue     |  1 -
 .../src/components/Process/common/parseElement.js     | 11 +----------
 .../nodePanel/property/executionListener.vue          |  4 ++--
 .../components/nodePanel/property/listenerParam.vue   |  2 +-
 .../components/nodePanel/property/taskListener.vue    |  4 ++--
 .../src/components/Process/flowable/showConfig.js     |  1 -
 7 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 79ff7fed..2b80e4a0 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -38,10 +38,10 @@
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
-    "bpmn-js": "^11.1.0",
+    "bpmn-js": "7.5.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "diagram-js": "^5.0.0",
+    "diagram-js": "5.1.1",
     "echarts": "5.4.0",
     "element-ui": "2.15.10",
     "file-saver": "2.0.5",
@@ -62,7 +62,8 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "xcrud": "^0.4.19"
+    "xcrud": "0.4.1",
+    "bpmn-moddle": "7.0.4"
   },
   "devDependencies": {
     "@babel/parser": "^7.20.5",
diff --git a/ruoyi-ui/src/components/Process/PropertyPanel.vue b/ruoyi-ui/src/components/Process/PropertyPanel.vue
index 443f81d7..4974af90 100644
--- a/ruoyi-ui/src/components/Process/PropertyPanel.vue
+++ b/ruoyi-ui/src/components/Process/PropertyPanel.vue
@@ -124,7 +124,6 @@ export default {
       })
       this.modeler.on('element.click', e => {
         const { element } = e
-        // console.log(element)
         if (element.type === 'bpmn:Process') {
           this.element = element
         }
diff --git a/ruoyi-ui/src/components/Process/common/parseElement.js b/ruoyi-ui/src/components/Process/common/parseElement.js
index fdc6064b..63cf336e 100644
--- a/ruoyi-ui/src/components/Process/common/parseElement.js
+++ b/ruoyi-ui/src/components/Process/common/parseElement.js
@@ -41,19 +41,10 @@ export function userTaskParse(obj) {
   for (const key in obj) {
     if (key === 'candidateUsers') {
       obj.userType = 'candidateUsers'
-      // if (obj[key].toString().indexOf(",") !== -1) {
-      //
-      // }else {
-      //   obj[key] = obj[key].toString()?.split(',') || []
-      // }
+      obj[key] = obj[key]?.split(',') || []
     } else if (key === 'candidateGroups') {
       obj.userType = 'candidateGroups'
       obj[key] = obj[key]?.split(',') || []
-      // if (obj[key].toString().indexOf(",") !== -1) {
-      //
-      // }else {
-      //   obj[key] = obj[key].toString()?.split(',') || []
-      // }
     } else if (key === 'assignee') {
       obj.userType = 'assignee'
     }
diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/property/executionListener.vue b/ruoyi-ui/src/components/Process/components/nodePanel/property/executionListener.vue
index 1a15b8a1..32df63c1 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/property/executionListener.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/property/executionListener.vue
@@ -42,7 +42,7 @@ export default {
   },
   computed: {
     formConfig() {
-    //   const _this = this
+      //   const _this = this
       return {
         inline: false,
         item: [
@@ -189,6 +189,6 @@ export default {
 
 <style>
 .flow-containers  .el-badge__content.is-fixed {
-    top: 18px;
+  top: 18px;
 }
 </style>
diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/property/listenerParam.vue b/ruoyi-ui/src/components/Process/components/nodePanel/property/listenerParam.vue
index dd8ace18..b5b9fc5e 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/property/listenerParam.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/property/listenerParam.vue
@@ -91,6 +91,6 @@ export default {
 
 <style>
 .flow-containers  .el-badge__content.is-fixed {
-    top: 18px;
+  top: 18px;
 }
 </style>
diff --git a/ruoyi-ui/src/components/Process/components/nodePanel/property/taskListener.vue b/ruoyi-ui/src/components/Process/components/nodePanel/property/taskListener.vue
index 0f72a89a..ed12232f 100644
--- a/ruoyi-ui/src/components/Process/components/nodePanel/property/taskListener.vue
+++ b/ruoyi-ui/src/components/Process/components/nodePanel/property/taskListener.vue
@@ -42,7 +42,7 @@ export default {
   },
   computed: {
     formConfig() {
-    //   const _this = this
+      //   const _this = this
       return {
         inline: false,
         item: [
@@ -191,6 +191,6 @@ export default {
 
 <style>
 .flow-containers  .el-badge__content.is-fixed {
-    top: 18px;
+  top: 18px;
 }
 </style>
diff --git a/ruoyi-ui/src/components/Process/flowable/showConfig.js b/ruoyi-ui/src/components/Process/flowable/showConfig.js
index b372ec47..45a752b7 100644
--- a/ruoyi-ui/src/components/Process/flowable/showConfig.js
+++ b/ruoyi-ui/src/components/Process/flowable/showConfig.js
@@ -6,7 +6,6 @@ export default {
   },
   'bpmn:UserTask': {
     userType: true,
-    dataType: true,
     assignee: true,
     candidateUsers: true,
     candidateGroups: true,