sasp-flow-render 1.1.35-decoupling → 1.1.36-decoupling

package/package.json

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

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

@@ -702,6 +702,14 @@ class WorkflowEngine {
                 if (obj.dealerType === "variable" && obj.variable) {
                     this.isRefreshGetNextUsers.push(obj.variable);
                 }
+                if(obj.dealType === "multi"){
+                    let gatewaySet = JSON.parse(obj.gatewaySet || "[]");
+                    gatewaySet.forEach(item => {
+                        item.forEach(data => {
+                            this.isRefreshGetNextUsers.push(data.field);
+                        })
+                    })
+                }
                 if (obj.dealerType === "interface" && obj.dealerUrlParam) {
                     let dealerUrlParam = JSON.parse(obj.dealerUrlParam || "[]");
                     dealerUrlParam.forEach(param => {
@@ -990,8 +998,8 @@ class WorkflowEngine {
                     }else{
                         let userInfo = this.nextSteptUserArr[0] || {};
                         if(this.nextNode.dealType=="single"){
-                            this.chooseNextUserId = userInfo.id;
-                            this.chooseNextUserName = userInfo.userName;
+                            this.chooseNextUserId = userInfo.id || "";
+                            this.chooseNextUserName = userInfo.userName || "";
                             this.$flowDialog.fillFlowDialogParams({
                                 chooseNextUserId: this.chooseNextUserId,
                                 chooseNextUserName: this.chooseNextUserName
@@ -1952,11 +1960,11 @@ class WorkflowEngine {
         }
     }
 
-    judeDiyButton(tabActive,button) {
-        if(tabActive === 'pending') {
+    judeDiyButton(tabActive,button) { // 传过来的tabActive在实际使用中flowInstTab的时候没有更新，所以这里使用this.tabActive就行了
+        if(this.tabActive === 'pending') {
             return button.position === 'table' && button.nodeId === this.currentInst.currentNode;
         }
-        return button.position === 'table' && button.buttonSign.indexOf(tabActive) > -1;
+        return button.position === 'table' && button.buttonSign.indexOf(this.tabActive) > -1;
     }
 
     execDiyBtnScripts(type,data,fnBody) {

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

@@ -562,14 +562,14 @@ export default {
        */
       saveNextStept() {
         this.isDisabled1 = false;
-        let dealers = this.chooseNextUserId;
-        let dealerNames = this.chooseNextUserName;
+        let dealers = this.chooseNextUserId || "";
+        let dealerNames = this.chooseNextUserName || "";
         let dealersObj = {};
         if (this.nextNode.nextType == "inclusiveGateway") {
           // 校验是否选人了
           let tempResult = true;
           Object.keys(this.chooseNextUserIdObj).forEach(key => {
-            let dealers = this.chooseNextUserIdObj[key];
+            dealers = this.chooseNextUserIdObj[key];
             if(Array.isArray(dealers)){
               dealersObj[key] = dealers.join(",");
             }else{