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/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
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 @@
-
+ />-->
+
+
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 @@
-
+
@@ -116,7 +116,7 @@
已选人员
{{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) {