sasp-flow-render 1.1.24-decoupling → 1.1.26-decoupling

package/package.json

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

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

@@ -33,6 +33,9 @@ class WorkflowEngine {
         }
         this.$flowDialog = this.$this.$flowDialog;
         this.flowDefine = {};
+        this.flowRecordObj = {};
+        this.flowChartObj = {};
+        this.draftNodeId = "";
 
         // 初始化插入部分方法
         let methods = flowAttrs["methods"] || {};
@@ -110,6 +113,8 @@ class WorkflowEngine {
         this.nextSteptUserArr = [];
 
         this.newEventObj = {};
+        this.newScriptObj = {};
+        this.scriptObj = {};
         this.resourceTabOpts = ['draft','pending','processed','rescinded','finished','discontinue','flowQuery'];
         //表单按钮
         this.formButtonObj = {
@@ -368,6 +373,7 @@ class WorkflowEngine {
     init(){
         return new Promise(resolve => {
             if(!this.skipAutoInit && !this.loadSuccess){
+                this.initUserData();
                 this.$this.saspFlowAxios.all([
                     this.initFlowInfo(),
                     this.initFlowFormInfo()
@@ -378,7 +384,6 @@ class WorkflowEngine {
             }else{
                 resolve();
             }
-            this.initUserData();
             this.initDialogProps();
         })
     }
@@ -477,6 +482,9 @@ class WorkflowEngine {
                         }
                         if (item.nodeType === "UserTask" && (item.nodeLinkId || "").indexOf("Activity_draft") > -1) {
                             this.draftNodeId = item.id; // 草稿节点id
+                            this.$flowDialog.fillFlowDialogParams({
+                                draftNodeId: this.draftNodeId
+                            });
                         }
                         // 行按钮
                         let listButton = JSON.parse(item.listButton || "[]") || [];
@@ -528,6 +536,7 @@ class WorkflowEngine {
                     flowVersionNodeObjByFlowId :  this.flowVersionNodeObjByFlowId,
                     flowEventScriptByFlowId :  this.flowEventScriptByFlowId
                 };
+                this.$flowDialog.fillFlowDialogParams(result);
                 resolve(result);
             });
         });
@@ -590,6 +599,9 @@ class WorkflowEngine {
                             }
                             if(item.nodeType == "UserTask" && (item.nodeLinkId || "").indexOf("Activity_draft") > -1){
                                 this.draftNodeId = item.id; // 草稿节点id
+                                this.$flowDialog.fillFlowDialogParams({
+                                    draftNodeId: this.draftNodeId
+                                });
                             }
                             // }
                             this.allNodeInfo[item.id] = item;
@@ -655,6 +667,7 @@ class WorkflowEngine {
                             diyButtonsObj : this.diyButtonsObj,
                         };
                         this.initFlowObj();
+                        this.$flowDialog.fillFlowDialogParams(result);
                         resolve(result);
                     })
                 });
@@ -1354,7 +1367,7 @@ class WorkflowEngine {
             formData = this.getFormInfo();
         }
         let CTX = "";
-        let paramValues = [this,this.$this.saspFlowAxios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode,null]; // 入参
+        let paramValues = [this.$this,this.$this.saspFlowAxios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode,null]; // 入参
         if(executePosition == "add" || executePosition == "update"){
             ((this.scriptObj[executePosition] || {})[executeTime] || []).forEach(event => {
                 event && event(...paramValues); // 执行事件
@@ -1388,7 +1401,7 @@ class WorkflowEngine {
         //执行自定义脚本
         // let CTX = window.JAVA_URL;
         let CTX = "";
-        let paramValues = [this,this.$this.saspFlowAxios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode]; // 入参
+        let paramValues = [this.$this,this.$this.saspFlowAxios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode]; // 入参
         if(executeType == "addAfter"){ //新增或后
             (this.newScriptObj[executeType] || []).forEach(event => {
                 event && event(...paramValues); // 执行事件
@@ -1497,6 +1510,24 @@ class WorkflowEngine {
             let version = this.flowDefine.releaseVersion;
             currentNode = this.flowVersionNodeObj[version][this.startNodeKeyObj[version]];
         }
+        let result = {
+            draftNodeId: this.draftNodeId,
+            // operateType : this.operateType,
+            // tabActive : this.tabActive,
+            flowDefine : this.flowDefine,
+            startNodeKey : this.startNodeKey,
+            startNodeKeyObj : this.startNodeKeyObj,
+            flowVersionNodeObj : this.flowVersionNodeObj,
+            allNodeInfo : this.allNodeInfo,
+            flowNodeNameObj : this.flowNodeNameObj,
+            flowNodeIdToInfo : this.flowNodeIdToInfo,
+            nodeListButtonObj : this.nodeListButtonObj,
+            nodeFormButtonObj : this.nodeFormButtonObj,
+            nodeFormBtnObj : this.nodeFormBtnObj,
+            // optColumnWidth : this.optColumnWidth,
+            diyButtonsObj : this.diyButtonsObj,
+        };
+        this.$flowDialog.fillFlowDialogParams(result);
         return new Promise(resolve => {
             if(this.initFormInfo){
                 let promise = this.initFormInfo(type,dataId,JSON.parse(currentNode.fieldOperate || "{}"),rowData);
@@ -1854,6 +1885,23 @@ class WorkflowEngine {
             flowRecordObj: this.flowRecordObj
         });
     }
+
+    openFlowChart(row) {
+        let flowId = "";
+        let instId = "";
+        let linkProcId = "";
+        let isRelease = "";
+        if (row) {
+            flowId = row.flowId;
+            instId = row.flowInstId;
+            linkProcId = row.linkProcId;
+            isRelease = row.isRelease;
+        }
+        this.flowChartObj = {flowId: flowId,instId: instId,linkProcId:linkProcId,isRelease:isRelease, dialogVisible: true};
+        this.$flowDialog.fillFlowDialogParams({
+            flowChartObj: this.flowChartObj,
+        })
+    }
     
     // end of button methods 按钮方法结束
 
@@ -2115,7 +2163,7 @@ class WorkflowEngine {
                 })
                 this.userArr = arr;
                 this.$this.INTER_CACHE.setUserArr(arr);
-                this.$this.userMap = this.$this.INTER_CACHE.getUserMap();
+                this.userMap = this.$this.INTER_CACHE.getUserMap();
             })
         })
     }
@@ -2215,6 +2263,48 @@ class WorkflowEngine {
     openFlowDialog(args){
         this.$flowDialog.openFlowDialog(args);
     }
+
+    openRecordEvent(dataId){ // 采用初始化构造类时传递flowId
+        if(!this.flowId){
+            this.$this.$message.error("请先设置flowId");
+            return;
+        }
+        this.openRecord(this.flowId,dataId);
+    }
+
+    openRecord(flowId,dataId){
+        this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.getFlowInstByFlowDataId,{flowId:(flowId || this.flowId),dataId:dataId}).then(res => {
+            if (!res.data) {
+                this.$this.$message.error("未获取到此流程数据！");
+                return;
+            }
+            let currentInst = res.data || {};
+            this.openFlowRecord(currentInst);
+        });
+    }
+
+    openChartEvent(dataId){ // 采用初始化构造类时传递flowId
+        if(!this.flowId){
+            this.$this.$message.error("请先设置flowId");
+            return;
+        }
+        this.openChart(this.flowId,dataId);
+    }
+
+    openChart(flowId,dataId){
+        if(dataId){
+            this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.getFlowInstByFlowDataId,{flowId:flowId || this.flowId,dataId:dataId}).then(res => {
+                if (!res.data) {
+                    this.$this.$message.error("未获取到此流程数据");
+                    return;
+                }
+                let currentInst = res.data || {};
+                this.openFlowChart(currentInst);
+            });
+        }else{
+            this.openFlowChart({flowId:(flowId || this.flowId)});
+        }
+    }
 }
 
 export default {

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

@@ -180,7 +180,7 @@
                :visible.sync="flowChartObj.dialogVisible"
                width="90%" height="90%"
                top="5vh">
-      <flow-chart :flow-id="(flowChartObj.flowId) + ''" :inst-id="flowChartObj.instId + ''"
+      <flow-chart :flow-id="(flowChartObj.flowId || workFlowUtil.flowId) + ''" :inst-id="flowChartObj.instId + ''"
                   :link-proc-id="flowChartObj.linkProcId + ''"
                   :is-release="flowChartObj.isRelease"
                   v-if="flowChartObj.dialogVisible"></flow-chart>