sasp-flow-render 1.1.26-decoupling → 1.1.28-decoupling

package/package.json

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

package/src/assets/js/api/apiFlow.js

@@ -251,6 +251,7 @@ let objResult = {
         saveDataFlowDrafts: "/flowEngine/saveDataFlowDrafts",
         startFlow: "/flowEngine/startFlow",
         completeTask: "/flowEngine/completeTask",
+        saveFlowDraft: "/flowEngine/saveFlowDraft",
     }
 };
 

package/src/components/flowInst/flowInstTab.vue

@@ -641,6 +641,7 @@
                     saveFormInfo: this.saveFormInfo,
                     getFormInfo: this.getFormInfo,
                     forceUpdateComponent: this.forceUpdateComponent,
+                    setParams:this.setParams
                 }
             });
 

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

@@ -23,6 +23,12 @@ class WorkflowEngine {
         this.currentInst = {};
         this.installListObj = this.$this.EVENT_PLUGIN['installEventObj']||{}; //已经安装的流程事件
         this.loginUser = this.$this.FLOW_CACHE_GLOBAL.getLoginUser();
+        if(!this.loginUser.id){ // 判断是否是表单独立登录
+            if(this.$this.FORM_USER_GLOBAL){
+                this.loginUser = this.$this.FORM_USER_GLOBAL.getLoginUser();
+            }
+        }
+
         this.skipAutoInit = false;
         if(flowAttrs.skipAutoInit){
             this.skipAutoInit = flowAttrs.skipAutoInit;
@@ -1843,6 +1849,13 @@ class WorkflowEngine {
         })
     }
 
+    syncFlowDialogPrams(params){
+        Object.keys(params).forEach(key => {
+            this[key] = params[key];
+        });
+        this.setParams && this.setParams(params);
+    }
+
     /**
      * 恢复方法
      */
@@ -2206,7 +2219,14 @@ class WorkflowEngine {
         })
     }
 
-    open(dataId,type,callback){
+    /**
+     *
+     * @param dataId 数据ID
+     * @param type 操作类型，view-查看、update-编辑
+     * @param forceOpen 是否强制打开，默认false，为true时可以将非工作流列表数据自动插入草稿数据并打开
+     * @param callback 回调函数
+     */
+    open(dataId,type,forceOpen,callback){
         if(!this.tableviewId){
             this.$this.$message.error("请先设置tableviewId");
             return;
@@ -2220,12 +2240,11 @@ class WorkflowEngine {
                 formInfo: this.formInfo
             });
             if(dataId){
-                this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.getFlowInstByFlowDataId,{flowId:this.flowId,dataId:dataId}).then(res => {
-                    if(!res.data){
+                this.getDataByDataId(dataId,forceOpen).then(rowData => {
+                    if(!rowData){
                         this.$this.$message.error("未获取到此流程数据！");
                         return;
                     }
-                    let rowData = res.data || {};
                     if(type !== "view" && rowData.operateAuth === "0"){
                         console.log("当前登录用户无此流程数据操作权限，已自动切换为查看！");
                         type = "view";
@@ -2260,6 +2279,53 @@ class WorkflowEngine {
         })
     }
 
+    /**
+     * 根据数据ID获取流程数据
+     * @param dataId
+     * @returns {Promise<unknown>}
+     */
+    getDataByDataId(dataId,forceOpen){
+        return new Promise(resolve => {
+            this.getFlowInstByDataId(dataId).then(rowData => {
+                if(!rowData) {
+                    if (forceOpen) {
+                        this.$this.axios.post(this.$this.api.flowEngine.saveFlowDraft, {
+                            flowId: this.flowId,
+                            dataId: dataId,
+                            userCode: this.loginUser.id
+                        }).then(flowDraftRes => {
+                            let flowDraftData = flowDraftRes.data || {};
+                            if (flowDraftData.requestStatus === "1") {
+                                this.getFlowInstByDataId(dataId).then(rowData => {
+                                    resolve(rowData);
+                                });
+                            }else{
+                                resolve(false);
+                            }
+                        });
+                    }else{
+                        resolve(false);
+                    }
+                }else{
+                    resolve(rowData);
+                }
+            })
+        })
+    }
+
+    getFlowInstByDataId(dataId){
+        return new Promise(resolve => {
+            this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.getFlowInstByFlowDataId,{flowId:this.flowId,dataId:dataId}).then(res => {
+                if(!res.data){
+                    resolve(false);
+                    return;
+                }
+                let rowData = res.data || {};
+                resolve(rowData);
+            });
+        })
+    }
+
     openFlowDialog(args){
         this.$flowDialog.openFlowDialog(args);
     }

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

@@ -645,6 +645,11 @@ export default {
         if(this.flowNextOperation) {
           this.flowNextOperation(obj.instId, obj.dealers, obj.dealerNames, obj.taskId);
         }
+        this.workFlowUtil.syncFlowDialogPrams({
+            chooseNextUserId: this.chooseNextUserId,
+            chooseNextUserName: this.chooseNextUserName,
+            chooseNextUserIdObj: this.chooseNextUserIdObj
+        });
         let params = {"SASP_FLOW_USE_VARIABLES":"yes"};
         Object.assign(params,this.flowParams || {},obj);
         this.saspFlowAxios.post(this.api.plFlowInst.executeNextStep,params).then(res => {