sasp-flow-render 1.1.24-decoupling → 1.1.25-decoupling

package/package.json

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

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

@@ -33,6 +33,8 @@ class WorkflowEngine {
         }
         this.$flowDialog = this.$this.$flowDialog;
         this.flowDefine = {};
+        this.flowRecordObj = {};
+        this.flowChartObj = {};
 
         // 初始化插入部分方法
         let methods = flowAttrs["methods"] || {};
@@ -110,6 +112,8 @@ class WorkflowEngine {
         this.nextSteptUserArr = [];
 
         this.newEventObj = {};
+        this.newScriptObj = {};
+        this.scriptObj = {};
         this.resourceTabOpts = ['draft','pending','processed','rescinded','finished','discontinue','flowQuery'];
         //表单按钮
         this.formButtonObj = {
@@ -1354,7 +1358,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 +1392,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); // 执行事件
@@ -1854,6 +1858,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 按钮方法结束
 
@@ -2215,6 +2236,32 @@ class WorkflowEngine {
     openFlowDialog(args){
         this.$flowDialog.openFlowDialog(args);
     }
+
+    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);
+        });
+    }
+
+    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>