@lambo-design/workflow-approve 1.0.0-beta.31 → 1.0.0-beta.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.31",
+  "version": "1.0.0-beta.33",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.146",
-    "@lambo-design/shared": "^1.0.0-beta.223"
+    "@lambo-design/core": "^4.7.1-beta.147",
+    "@lambo-design/shared": "^1.0.0-beta.224"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/portrait.vue

@@ -208,7 +208,7 @@
     <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
       <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
                         :procId="process.procId" :table-columns="diagramTableColumns"
-                        :tableData="process.tableData" :hisAudit="hisAudit"
+                        :tableData="process.tableData" :hisAudit="hisAudit" :approve-detail-show-way="approveDetailShowWay"
                         :smart-flow-server-context="smartFlowServerContext">
       </Workflow_Diagram>
     </Modal>
@@ -383,6 +383,18 @@ export default {
       required: false,
       default: true,
     },
+    //流程跟踪图附件列
+    showAttachmentFile: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    //流程跟踪图审批详情触发方式
+    approveDetailShowWay: {
+      type: String,
+      required: false,
+      default: 'click',
+    },
     //业务表单保存方法
     businessFormSave: {
       type: Function,
@@ -706,37 +718,39 @@ export default {
           }, label)
         }
       })
-      column.push({
-        title: `附件`, key: 'fileList', minWidth: 200,
-        render: (h, { row }) => {
-          if (!row.fileList || row.fileList.length === 0) {
-            return h('span', '无');  // 如果没有附件，显示“无”
-          }
+      if (this.showAttachmentFile){
+        column.push({
+          title: `附件`, key: 'fileList', minWidth: 200,
+          render: (h, { row }) => {
+            if (!row.fileList || row.fileList.length === 0) {
+              return h('span', '无');  // 如果没有附件，显示“无”
+            }
 
-          //显示所有附件
-          return h('div', row.fileList.map(file => {
-            return h('a', {
-              style: {
-                display: 'block',
-                marginTop: '5px',
-                marginRight:'5px',
-                whiteSpace: 'nowrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-                maxWidth: '100px',
-              },
-              attrs: {
-                title: file.attachName  // 鼠标悬停时显示完整名称
-              },
-              on: {
-                click: () => {
-                  this.getAttach(file);
-                }
-              },
-            }, file.attachName);
-          }));
-        }
-      })
+            //显示所有附件
+            return h('div', row.fileList.map(file => {
+              return h('a', {
+                style: {
+                  display: 'block',
+                  marginTop: '5px',
+                  marginRight:'5px',
+                  whiteSpace: 'nowrap',
+                  overflow: 'hidden',
+                  textOverflow: 'ellipsis',
+                  maxWidth: '100px',
+                },
+                attrs: {
+                  title: file.attachName  // 鼠标悬停时显示完整名称
+                },
+                on: {
+                  click: () => {
+                    this.getAttach(file);
+                  }
+                },
+              }, file.attachName);
+            }));
+          }
+        })
+      }
 
       return column
     },
@@ -1129,12 +1143,14 @@ export default {
                 self.loading = false
                 self.disable = false
                 self.$Message.success(result.message);
-                if (result.data) {
-                  let taskIds = result.data.map(item => item.id).join(',');
-                  self.executionCompleted(true, result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
-                } else {
-                  self.executionCompleted(true, null, null, auditResult, self.curTaskId)
-                }
+                setTimeout(() => {
+                  if (result.data) {
+                    let taskIds = result.data.map(item => item.id).join(',');
+                    self.executionCompleted(true, result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+                  } else {
+                    self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+                  }
+                }, 1000)
               } else {
                 self.loading = false
                 self.disable = false

package/src/workflow-diagram.vue

@@ -128,6 +128,11 @@ export default {
       type: String,
       default: "审批"
     },
+    approveDetailShowWay: {
+      type: String,
+      required: false,
+      default: "click"
+    },
     tableColumns: {
       type: Array,
       default: () => {
@@ -304,7 +309,8 @@ export default {
       var eventBus = this.bpmnViewer.get("eventBus");
       var dones = this.tableData;
       // eventBus.on('element.click', function (evt) {
-      eventBus.on('element.hover', function (evt) {
+      // eventBus.on('element.hover', function (evt) {
+      eventBus.on(`element.${this.approveDetailShowWay}`, function (evt) {
         self.detailDones = [];
         for (var item of dones) {
           if (item.taskNode == evt.element.id) {