sasp-flow-render 1.1.28-decoupling → 1.1.29-decoupling

package/index.js

@@ -125,7 +125,8 @@ let initAxios = (Vue, props) => {
 let loadFlowDialog = (Vue,opts) => {
     // 创建 Dialog 实例并挂载到 body
     const DialogConstructor = Vue.extend(flowDialog);
-    const instance = new DialogConstructor().$mount();
+    let router = opts.router;
+    const instance = new DialogConstructor({router}).$mount();
     document.body.appendChild(instance.$el);
 
     // 将实例挂载到 Vue 原型，方便全局调用

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.28-decoupling",
+  "version": "1.1.29-decoupling",
   "description": "业务应用支撑平台-智慧流程渲染组件",
   "scripts": {
     "build": "vue-cli-service build"

package/src/components/flowInst/js/workflow.js

@@ -56,7 +56,8 @@ class WorkflowEngine {
         this.getFormInfo = methods["getFormInfo"];
         this.flowNextOperation = methods["flowNextOperation"];
         this.forceUpdateComponent = methods["forceUpdateComponent"];
-        this.nextStepAfterSave = methods["nextStepAfterSave"];
+        this.nextStepAfterSave = methods["nextStepAfterSave"]; // 流程下一步保存表单数据后的回调
+        this.afterNextStepSuccess = methods["afterNextStepSuccess"]; // 流程下一步成功后，即关闭对话框后的回调
         this.setParams = methods["setParams"];
 
         if(!this.initFormInfo){
@@ -165,7 +166,7 @@ class WorkflowEngine {
                     type: "success",
                     icon: "el-icon-check",
                     disabled: false,
-                    show: true,
+                    show: false,
                     method: () => {
                     this.saveDraft();
                 }
@@ -176,7 +177,7 @@ class WorkflowEngine {
                     type: "primary",
                     icon: "el-icon-d-arrow-right",
                     disabled: false,
-                    show: true,
+                    show: false,
                     method: () => {
                     this.nextStep();
                     // this.isDisabled1 = true;
@@ -348,7 +349,7 @@ class WorkflowEngine {
                     type: "warning",
                     icon: "saspiconfont pl-icon-liuchengtu",
                     disabled: false,
-                    show: true,
+                    show: false,
                     isView: true,
                     method: () => {
                     this.openFlowRecord(this.currentInst);
@@ -359,7 +360,7 @@ class WorkflowEngine {
                     type: "",
                     icon: "el-icon-close",
                     disabled: false,
-                    show: true,
+                    show: false,
                     isView: true,
                     method: () => {
                     this.flowInstDataDialog = false;
@@ -1889,14 +1890,14 @@ class WorkflowEngine {
      */
     openFlowRecord(row) {
         let arr = ["2", "3", "4"]; // 旧版本的已办结已撤销以及已中止数据通过旧版接口查询流转记录
+        this.$flowDialog.fillFlowDialogParams({
+            flowRecordObj: this.flowRecordObj
+        });
         if (arr.indexOf(row.flowStatus) > -1 && row.isOldData === "1") {
             this.flowRecordObj = {instId: row.flowInstId || "", oldDialogVisible: true};
         } else {
             this.flowRecordObj = {instId: row.flowInstId || "", dialogVisible: true};
         }
-        this.$flowDialog.fillFlowDialogParams({
-            flowRecordObj: this.flowRecordObj
-        });
     }
 
     openFlowChart(row) {

package/src/components/flowInst/popup/flowDialog.vue

@@ -668,19 +668,11 @@ export default {
             let type = this.flowBatchPendingDialog ? "batch" : "";
             let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
             let submitSuccessRusult;
-            if (type == 'batch') {
-              // 批量处理
-              let ref = "batchTableForm"+this.batchUpdateFormInfo.activeName+"Ref";
-              submitSuccessRusult=this.workFlowUtil.exeFlowEvent("nextStep","submitSuccess", this.currentInst.currentNode || this.draftNodeId,ref);
-              if(currentNodeObj.openEvent == '1'){
-                submitSuccessRusult = this.workFlowUtil.exeNewFlowEvent("nextSubmit",currentNodeObj.nodeLinkId||'',ref)
-              }
-            } else {
-              submitSuccessRusult=this.workFlowUtil.exeFlowEvent("nextStep","submitSuccess", this.currentInst.currentNode || this.draftNodeId);
-              if(currentNodeObj.openEvent == '1'){
-                submitSuccessRusult =this.workFlowUtil.exeNewFlowEvent("nextSubmit",currentNodeObj.nodeLinkId||'')
-              }
+            submitSuccessRusult=this.workFlowUtil.exeFlowEvent("nextStep","submitSuccess", this.currentInst.currentNode || this.draftNodeId);
+            if(currentNodeObj.openEvent == '1'){
+              submitSuccessRusult =this.workFlowUtil.exeNewFlowEvent("nextSubmit",currentNodeObj.nodeLinkId||'')
             }
+            this.workFlowUtil.afterNextStepSuccess && this.workFlowUtil.afterNextStepSuccess(this.workFlowUtil.$this,this.workFlowUtil);
             if(submitSuccessRusult){
               //办结提醒
               if(this.nextNode.nodeType == "EndEvent"){

package/src/views/popup/event/compoment/system/flowEditContentConfig.vue

@@ -138,10 +138,11 @@
                         "label":"用户名称",
                     },
                 ], //用户信息
+                loginUser:{}
             }
         },
         created(){
-
+            this.loginUser = this.FLOW_CACHE_GLOBAL.getLoginUser() || {};
         },
         methods:{
             /**