🎉 1.3.3.RELEASE

src/router/axios.js

@@ -17,7 +17,7 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
 //默认超时时间
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 60000;
 //返回其他状态码
 axios.defaults.validateStatus = function (status) {
   return status >= 200 && status <= 500;

src/views/plugin/workflow/components/wf-user-select/index.vue

@@ -215,7 +215,7 @@ export default {
 
       const name = []
       if (this.checkType == 'checkbox') {
-        this.selectionClear()
+        // this.selectionClear()
         const checks = defaultChecked.split(",")
         if (checks.length > 0) {
           setTimeout(() => {

src/views/plugin/workflow/design/form.vue

@@ -56,7 +56,7 @@
     </el-container>
     <el-dialog :visible.sync="formVisible"
                append-to-body
-               title="表单设计"
+               :title="title"
                fullscreen>
       <avue-form-design v-if="formVisible"
                         style="height: 88vh"
@@ -272,7 +272,8 @@ export default {
           label: 'name',
           value: 'id'
         }
-      }
+      },
+      title: '表单设计'
     };
   },
   computed: {
@@ -384,6 +385,7 @@ export default {
       this.row = row
       this.isCopy = false
       this.formVisible = true
+      this.title = `表单设计 - ${row.name}`
     },
     handleCopy(row) {
       this.options = this.deepClone(row.content || '{column: []}')
@@ -500,7 +502,7 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.onLoad(this.page, params);
-      if (done) done()
+      if (done && typeof done == 'function') done()
     },
     selectionChange(list) {
       this.selectionList = list;

src/views/plugin/workflow/design/index.vue

@@ -221,7 +221,8 @@ export default {
                 }
               },
               rules: [{ required: true, message: '请选择表单' }],
-              display: true
+              display: true,
+              filterable: true,
             }, {
               labelWidth: 0,
               prop: 'tip',

src/views/plugin/workflow/design/model.vue

@@ -58,6 +58,11 @@
                        size="mini"
                        icon="el-icon-time"
                        @click="handleScope(row)">权限</el-button>
+            <el-button v-if="permission.wf_design_model_copy"
+                       type="text"
+                       size="mini"
+                       icon="el-icon-document-copy"
+                       @click="handleCopy(row)">拷贝</el-button>
           </template>
         </avue-crud>
       </el-main>
@@ -78,7 +83,7 @@
 </template>
 
 <script>
-import { getList, remove, deploy, changeCategory } from "@/api/plugin/workflow/model";
+import { getList, remove, deploy, changeCategory, getDetail } from "@/api/plugin/workflow/model";
 import { getList as scopeList, submit as scopeSubmit } from '@/api/plugin/workflow/model-scope'
 import { tree } from '@/api/plugin/workflow/category';
 
@@ -113,7 +118,7 @@ export default {
         dialogType: 'drawer',
         align: 'center',
         searchMenuSpan: 6,
-        menuWidth: 320,
+        menuWidth: 350,
         column: [
           {
             label: "模型key",
@@ -196,6 +201,18 @@ export default {
     this.getCategoryList()
   },
   methods: {
+    handleCopy(row) {
+      getDetail(row.id).then(res => {
+        const { xml } = res.data.data
+        this.$Clipboard({
+          text: xml
+        }).then(() => {
+          this.$message.success('拷贝xml成功')
+        }).catch(() => {
+
+        })
+      })
+    },
     handleChangeCategory() {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
@@ -327,7 +344,7 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.onLoad(this.page, params);
-      done()
+      if (done && typeof done == 'function') done()
     },
     selectionChange(list) {
       this.selectionList = list;

src/views/plugin/workflow/mixins/ex-form.js

@@ -329,10 +329,19 @@ export default {
     },
     handleResolveFlows(flow) {
       const flows = []
+
+      // 更改待办节点颜色
+      flow.reverse()
+      const lastUserEvent = flow.find(f => f.historyActivityType == 'userTask')
+      const endEvent = flow.find(f => f.historyActivityType == 'endEvent')
+      if (lastUserEvent && !endEvent) lastUserEvent.class = 'nodePrimary'
+      flow.reverse()
+
       flow.forEach(f => {
         const { assigneeName, createTime, comments } = f
         const ff = {
           id: f.historyActivityId,
+          class: f.class
         }
         let tooltip = ''
         if (assigneeName) {

src/views/plugin/workflow/process/components/examForm.vue

@@ -19,22 +19,13 @@ export default {
     process: {
       handler(val) {
         if (!val) return
-        if (val.hideComment) {
+        const { hideComment, hideAttachment, hideCopy, hideExamine, copyUser, copyUserName } = val
-          this.findObject(this.examineOption.column, 'comment').display = false
+        if (hideComment) this.findObject(this.examineOption.column, 'comment').display = false // 隐藏评论
-          this.findObject(this.examineOption.column, 'attachment').display = false
+        if (hideComment || hideAttachment) this.findObject(this.examineOption.column, 'attachment').display = false // 隐藏评论附件
-        }
+        if (hideCopy) this.findObject(this.examineOption.column, '$copyUser').display = false // 隐藏抄送人
-        if (val.hideCopy) {
+        if (hideExamine) this.findObject(this.examineOption.column, '$assignee').display = false // 隐藏指定下一步审核人
-          this.findObject(this.examineOption.column, '$copyUser').display = false
+        if (copyUser) this.$set(this.examineForm, 'copyUser', val.copyUser) // 默认抄送人
-        }
+        if (copyUserName) this.$set(this.examineForm, '$copyUser', val.copyUserName) // 默认抄送人
-        if (val.hideExamine) {
-          this.findObject(this.examineOption.column, '$assignee').display = false
-        }
-        if (val.copyUser) {
-          this.$set(this.examineForm, 'copyUser', val.copyUser)
-        }
-        if (val.copyUserName) {
-          this.$set(this.examineForm, '$copyUser', val.copyUserName)
-        }
       },
       deep: true,
       immediate: true
@@ -88,7 +79,7 @@ export default {
         }, {
           label: '指定审批人',
           prop: '$assignee',
-          placeholder: '请选择 下一级审批人，如不选择则使用默认处理人，驳回时无效。多选时若下一节点为多实例则按选择顺序赋值，若不是择只有第一个生效。',
+          placeholder: '指定下一级审批人，如不选择则使用默认处理人，驳回时无效。多选时若下一节点为多实例并行则会进行动态加减签，若不是则只有第一个生效。',
           readonly: true,
           append: '+',
           span: 24,

src/views/plugin/workflow/process/done.vue

@@ -124,6 +124,22 @@ export default {
             format: 'yyyy-MM-dd HH:mm',
             width: 165,
           },
+          {
+            label: '流程状态',
+            prop: 'processIsFinished',
+            dicData: [{
+              label: '已完成',
+              value: 'finished'
+            }, {
+              label: '已终结',
+              value: 'terminate'
+            }, {
+              label: '已撤销',
+              value: 'withdraw'
+            }],
+            type: 'select',
+            search: true
+          },
         ]
       },
       data: [],

src/views/plugin/workflow/process/send.vue

@@ -120,10 +120,10 @@ export default {
             width: 165,
           },
           {
-            label: '状态',
+            label: '流程状态',
             prop: 'processIsFinished',
             dicData: [{
-              label: '未完成',
+              label: '进行中',
               value: 'unfinished'
             }, {
               label: '已完成',
@@ -134,6 +134,12 @@ export default {
             }, {
               label: '已撤销',
               value: 'withdraw'
+            }, {
+              label: '已撤回',
+              value: 'recall'
+            }, {
+              label: '被驳回',
+              value: 'reject'
             }],
             type: 'select',
             search: true

src/views/plugin/workflow/process/start.vue

@@ -177,7 +177,7 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.onLoad(this.page, params);
-      done()
+      if (done && typeof done == 'function') done()
     },
     selectionChange(list) {
       this.selectionList = list;