@lambo-design/workflow-approve 1.0.0-beta.136 → 1.0.0-beta.139

package/README.md

@@ -0,0 +1,28 @@
+# 常见问题
+
+ - 启动报错找不到docx-preview
+修改vue.config.js，在对应属性下增加如下配置。
+```
+  chainWebpack: (config) => {
+    config.module
+      .rule('docx-preview')
+      .test(/node_modules[\\/]docx-preview[\\/].*\.js$/)
+      .use('babel')
+      .loader('babel-loader')
+      .options({
+        presets: [
+          ['@babel/preset-env', { modules: false }]
+        ]
+      })
+      .end()
+  },
+  configureWebpack: {
+    resolve: {
+      alias: {
+        // 确保 docx-preview 能被正确解析
+        'docx-preview': require.resolve('docx-preview')
+      }
+    },
+  }
+
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.136",
+  "version": "1.0.0-beta.139",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,10 +10,10 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "axios": "^0.24.0",
-    "axios-cache-plugin": "^0.1.0",
     "@lambo-design/core": "^4.7.1-beta.176",
-    "@lambo-design/shared": "^1.0.0-beta.351"
+    "@lambo-design/shared": "^1.0.0-beta.354",
+    "axios": "^0.24.0",
+    "axios-cache-plugin": "^0.1.0"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -159,6 +159,14 @@ export default {
           align: 'center',
           width: 55
         })
+      } else {
+        columns.push({
+          title: '#',
+          key: 'selectId',
+          type: 'single-selection',
+          align: 'center',
+          width: 55
+        })
       }
       if (!(self.useTransferRangeUsers && self.ucAdapterType == 'sc')){
         columns.push({

package/src/portrait.vue

@@ -469,6 +469,11 @@ export default {
       type: Boolean,
       default: false
     },
+    //驳回指定环节时强制不展示的环节编码
+    displayedPreNodes: {
+      type: Array,
+      default: () => ([])
+    },
   },
   components: {
     Title,
@@ -1908,6 +1913,7 @@ export default {
         self.auditResult = ''
         self.$Message.error(`请选择${self.auditResult === '90' ? self.rejectName : '跳转'}节点！`)
         self.loading = false
+        self.$Spin.hide();
       } else {
         self.loading = true
         self.disable = true
@@ -1921,6 +1927,7 @@ export default {
           if (result.code == '200') {
             self.loading = false
             self.disable = false
+            self.$Spin.hide();
             let message = result.message ? result.message : `${self.handleName}成功`
             if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90') {
               message = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}成功`
@@ -1946,6 +1953,7 @@ export default {
             // 数据同步
             self.loading = false
             self.disable = false
+            self.$Spin.hide();
             self.$Message.warning(result.message)
             setTimeout(() => {
               self.executionCompleted(true, null, null, auditResult, self.curTaskId)
@@ -1954,6 +1962,7 @@ export default {
             // 流程结束
             self.loading = false
             self.disable = false
+            self.$Spin.hide();
             self.$Message.success(result.message)
             if (self.isPassContinue) {
               // 通过并继续操作，获取下一条待办
@@ -1969,6 +1978,7 @@ export default {
           } else {
             self.loading = false
             self.disable = false
+            self.$Spin.hide();
             let failedMessage = result.message ? result.message : `${self.handleName}失败`
             if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90') {
               failedMessage = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}失败`
@@ -1981,7 +1991,6 @@ export default {
           bus.$emit('triggerTimer')
         })
       }
-      self.$Spin.hide();
     },
     execute(successMessage, auditResult) {
       const self = this
@@ -2232,7 +2241,7 @@ export default {
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getAllPreNodes', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
           if (resp.data.data.length > 0) {
-            self.allNode = resp.data.data
+            self.allNode = resp.data.data.filter(node => !self.displayedPreNodes.includes(node.taskNode))
             self.modal1 = true
           } else {
             self.$Message.warning('当前流程无前序节点')