sasp-flow-render 1.1.12 → 1.1.14

package/package.json

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

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

@@ -155,6 +155,7 @@ let objResult = {
         reStartFlow:"/plFlowInstController/reStartFlow", //重启办结状态下的流程
         batchUpdateFlowStatus:"/plFlowInstController/batchUpdateFlowStatus", //新版流程批量处理的批量修改流程状态
         batchExecuteNextStep:"/plFlowInstController/batchExecuteNextStep", //新版流程批量处理的批量执行下一步
+        recoverNode:"/plFlowInstController/recoverNode", //恢复指定节点
     },
 
     plFlowSetting:{

package/src/components/flowInst/flowInstTab.vue

@@ -302,6 +302,7 @@
                            :key="btn.btnType"
                            :type="btn.type"
                            :icon="btn.icon"
+                           :disabled="btn.disabled"
                            size="small">
                     {{btn.text}}
                 </el-button>
@@ -594,6 +595,7 @@
                         text: "存草稿",
                         type: "success",
                         icon: "el-icon-check",
+                        disabled: false,
                         show: true,
                         method: () => {
                             this.saveDraft();
@@ -604,6 +606,7 @@
                         text: "下一步",
                         type: "primary",
                         icon: "el-icon-d-arrow-right",
+                        disabled: false,
                         show: true,
                         method: () => {
                             this.nextStep();
@@ -615,6 +618,7 @@
                         text: "加签",
                         type: "primary",
                         icon: "saspiconfont pl-icon-jiaqian",
+                        disabled: false,
                         show: false,
                         method: () => {
                             this.completeSignDialog = true;
@@ -625,6 +629,7 @@
                         text: "转签",
                         type: "primary",
                         icon: "saspiconfont pl-icon-zhuanqian-icon",
+                        disabled: false,
                         show: false,
                         method: () => {
                             this.turnSignDialog = true;
@@ -635,6 +640,7 @@
                         text: "退回",
                         type: "danger",
                         icon: "el-icon-d-arrow-left",
+                        disabled: false,
                         show: false,
                         method: () => {
                             this.backToPrevious(this.currentInst);
@@ -645,6 +651,7 @@
                         text: "退回指定节点",
                         type: "danger",
                         icon: "el-icon-refresh-left",
+                        disabled: false,
                         show: false,
                         method: () => {
                             this.retSpecified(this.currentInst); //退回指定节点
@@ -655,6 +662,7 @@
                         text: "中止",
                         type: "danger",
                         icon: "saspiconfont pl-icon-yizhongzhi",
+                        disabled: false,
                         show: false,
                         method: () => {
                             this.saspFlowAxios.post(this.api.plFlowInst.stopFlow, {
@@ -701,6 +709,7 @@
                         text: "撤销",
                         type: "danger",
                         icon: "saspiconfont pl-icon-chexiao",
+                        disabled: false,
                         show: false,
                         isView: true,
                         method: () => {
@@ -739,6 +748,7 @@
                         text: "取回",
                         type: "danger",
                         icon: "el-icon-refresh-left",
+                        disabled: false,
                         show: false,
                         isView: true,
                         method: () => {
@@ -750,6 +760,7 @@
                         text: "恢复",
                         type: "success",
                         icon: "saspiconfont pl-icon-chexiao",
+                        disabled: false,
                         show: false,
                         isView: true,
                         method: () => {
@@ -760,6 +771,7 @@
                         text: "流转记录",
                         type: "warning",
                         icon: "saspiconfont pl-icon-liuchengtu",
+                        disabled: false,
                         show: true,
                         isView: true,
                         method: () => {
@@ -770,6 +782,7 @@
                         text: "关闭",
                         type: "",
                         icon: "el-icon-close",
+                        disabled: false,
                         show: true,
                         isView: true,
                         method: () => {
@@ -1122,7 +1135,7 @@
             /**
              * 打开[修改和处理]窗口
              */
-            initUpdateFlowForm(row) {
+            initUpdateFlowForm(row, type) {
                 this.currentRowData = row;
                 this.currNodeName = 'noEnd';
                 if (this.flowId.includes(',')) {
@@ -1138,7 +1151,7 @@
                 return new Promise(resolve => {
                     let startNodeKey =  this.startNodeKeyObj[row.version];
                     this.initFieldStatus(row.nodeKey || startNodeKey,row.version).then(()=>{
-                        this.initFormInfoFunc('update',row).then(() => {
+                        this.initFormInfoFunc(type,row).then(() => {
                             this.currentStartUser = this.userMap[row.startUserId] || "";
                             this.currentStartTime = row.startTime;
                             this.currentInst = row;
@@ -1169,7 +1182,7 @@
                     return;
                 }
                 this.flowInstDataDialog = true;
-                this.initUpdateFlowForm(row).then(() =>{
+                this.initUpdateFlowForm(row, 'update').then(() =>{
                     this.$nextTick(() => {
                         this.exeFlowEvent(executePosition,"afterClick",row.currentNode);
                         let currentNodeObj = this.flowNodeIdToInfo[row.currentNode] ||{};
@@ -1221,15 +1234,33 @@
                     activeName: arrRows[0].dataId,
                     batchDataId: arrRows[0].dataId
                 });
-
+                let currentNodeObj = this.flowNodeIdToInfo[arrRows[0].currentNode] ||{};
+                let result = null;
+                let type = "update";
+                if (currentNodeObj.openEvent === '1') {
+                  result = this.exeNewFlowEvent("editBefore",currentNodeObj.nodeLinkId ||'');//新事件规则
+                  if (result === false && typeof result == "boolean") {
+                    type = "view";
+                  }
+                }
                 this.flowBatchPendingDialog = true;
-                this.initUpdateFlowForm(arrRows[0]).then(()=>{
+                this.initUpdateFlowForm(arrRows[0],type).then(()=>{
                     // this.batchUpdateFormInfo.formShow = true;
                     let ref='batchTableForm'+arrRows[0].dataId+'Ref'
 
                     this.$nextTick(()=>{
                         // this.$refs[ref][0].loadData().then(() => {
+                        if(result === false && typeof result == "boolean"){
+                          this.formBtnArr.forEach(item => {
+                            if (item.btnType !== "close" && item.btnType !== "record") {
+                              item.disabled = true;
+                            }
+                          });
+                        }
                         this.exeFlowEvent("handle","afterClick",arrRows[0].currentNode,ref);
+                        if(currentNodeObj.openEvent === '1'){ //开启事件
+                          this.exeNewFlowEvent("editAfter",currentNodeObj.nodeLinkId ||'');//新事件规则
+                        }
                         // })
                     })
                 });
@@ -1884,18 +1915,33 @@
             nextStep() {
                 // let type = this.flowBatchPendingDialog ? "batch" : "";
                 let afterClickResult;
+                let result;
                 let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
                 afterClickResult=this.exeFlowEvent("nextStep","afterClick", this.currentInst.currentNode || this.draftNodeId);
-                //
+
+                if(typeof afterClickResult == "boolean" && afterClickResult === false){
+                    return;
+                }
+
                 if(currentNodeObj.openEvent === '1'){
                     afterClickResult = this.exeNewFlowEvent("nextClick",currentNodeObj.nodeLinkId);
                 }
 
+                if(typeof afterClickResult == "boolean" && afterClickResult === false){
+                    return;
+                }
+
                 // let afterValidateResult;
                 // let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
-                this.exeFlowEvent("nextStep","afterValidate", this.currentInst.currentNode || this.draftNodeId);
+                result = this.exeFlowEvent("nextStep","afterValidate", this.currentInst.currentNode || this.draftNodeId);
+                if(typeof result == "boolean" && result === false){
+                    return;
+                }
                 if(currentNodeObj.openEvent === '1'){
-                    this.exeNewFlowEvent("nextCheck",currentNodeObj.nodeLinkId);
+                    result = this.exeNewFlowEvent("nextCheck",currentNodeObj.nodeLinkId);
+                    if(typeof result == "boolean" && result === false){
+                        return;
+                    }
                 }
 
                 this.isDisabled['nextStep'] = false;
@@ -2070,17 +2116,36 @@
              */
             batchTabClick(val) {
                 this.batchUpdateFormInfo.batchDataId = val.name;
-                this.initUpdateFlowForm(this.batchUpdateFormInfo.dataRows[val.index]);
                 let dataId=this.batchUpdateFormInfo.dataRows[val.index].dataId;
                 let currentNode=this.batchUpdateFormInfo.dataRows[val.index].currentNode;
-                let ref='batchTableForm'+dataId+'Ref';
 
-                this.$nextTick(()=>{
+                let currentNodeObj = this.flowNodeIdToInfo[currentNode] ||{};
+                let result = null;
+                let type = "update";
+                if (currentNodeObj.openEvent === '1') {
+                  result = this.exeNewFlowEvent("editBefore",currentNodeObj.nodeLinkId ||'');//新事件规则
+                  if (result === false && typeof result == "boolean") {
+                    type = "view";
+                  }
+                }
+                this.initUpdateFlowForm(this.batchUpdateFormInfo.dataRows[val.index], type).then(() => {
+                  let ref='batchTableForm'+dataId+'Ref';
+                  this.$nextTick(()=>{
+                    if(result === false && typeof result == "boolean"){
+                      this.formBtnArr.forEach(item => {
+                        if (item.btnType !== "close" && item.btnType !== "record") {
+                          this.$set(item, 'disabled', true);
+                        }
+                      });
+                    }
                     // this.$refs[ref][0].loadData().then(() => {
                     this.exeFlowEvent("handle","afterClick",currentNode,ref);
+                    if(currentNodeObj.openEvent === '1'){ //开启事件
+                      this.exeNewFlowEvent("editAfter",currentNodeObj.nodeLinkId ||'');//新事件规则
+                    }
                     // })
+                  })
                 })
-
             },
 
             /**
@@ -2104,13 +2169,33 @@
                     this.batchUpdateFormInfo.activeName = nextTab.dataId;
                     this.batchUpdateFormInfo.batchDataId =nextTab.dataId;
                     this.batchUpdateFormInfo.formShow = false;
+
+                    let currentNodeObj = this.flowNodeIdToInfo[nextTab.currentNode] ||{};
+                    let result = null;
+                    let type = "update";
+                    if (currentNodeObj.openEvent === '1') {
+                      result = this.exeNewFlowEvent("editBefore",currentNodeObj.nodeLinkId ||'');//新事件规则
+                      if (result === false && typeof result == "boolean") {
+                        type = "view";
+                      }
+                    }
                     this.$nextTick(() => {
                         this.batchUpdateFormInfo.formShow = true;
-                        this.initUpdateFlowForm(nextTab).then(()=>{
+                        this.initUpdateFlowForm(nextTab, type).then(()=>{
                             this.$nextTick(()=>{
                                 let ref='batchTableForm'+nextTab.dataId+'Ref';
+                                if(result === false && typeof result == "boolean"){
+                                  this.formBtnArr.forEach(item => {
+                                    if (item.btnType !== "close" && item.btnType !== "record") {
+                                      item.disabled = true;
+                                    }
+                                  });
+                                }
                                 // this.$refs[ref][0].loadData().then(() => {
                                 this.exeFlowEvent("handle","afterClick",nextTab.currentNode,ref);
+                                if(currentNodeObj.openEvent === '1'){ //开启事件
+                                  this.exeNewFlowEvent("editAfter",currentNodeObj.nodeLinkId ||'');//新事件规则
+                                }
                                 // })
                             })
                         });
@@ -3407,6 +3492,14 @@
                         if (obj.dealerType === "variable" && obj.variable) {
                             this.isRefreshGetNextUsers.push(obj.variable);
                         }
+                        if (obj.dealerType === "interface" && obj.dealerUrlParam) {
+                            let dealerUrlParam = JSON.parse(obj.dealerUrlParam || "[]");
+                            dealerUrlParam.forEach(param => {
+                                if (param.paramType === "variable") {
+                                    this.isRefreshGetNextUsers.push(param.paramVal);
+                                }
+                            })
+                        }
                     }
                 });
                 if (!this.flowId.includes(",")) {

package/src/components/flowRoamRecords.vue

@@ -265,13 +265,26 @@
                 ],
 
                 appendSignNodeArr: [],
-                flowNodeAppendSignDatas: []
+                flowNodeAppendSignDatas: [],
+                linkProcId: '',
+                isPrevious: false
             };
         },
         created() {
+            this.initData();
             this.init();
         },
         methods: {
+            initData() {
+                this.saspFlowAxios.post(this.api.plFlowInst.getById,{"id":this.instId}).then(res => {
+                    let flowInst = res.data;
+                    this.linkProcId = flowInst["linkProcId"] || '';
+                    if(flowInst["previousInstId"]) {
+                        this.isPrevious = true;
+                    }
+                })
+            },
+
             init() {
                 this.flowInstNodeArr = [];
                 this.loading = true;
@@ -459,6 +472,9 @@
                         }
                         if(item.activityType == "startEvent"){
                             item.actorUserName = "";
+                            if(this.isPrevious && this.linkProcId !== '' && item.rootProcessInstanceId === this.linkProcId) {
+                                item.activityName = "恢复";
+                            }
                         }else if(variables["resolve_" + item.taskId]){ // 代理
                             item.actorUserName += "(由用户‘"+ userIdsMap[variables["resolve_" + item.taskId]] + "’代理完成)";
                         }else if(variables["getBack_" + item.taskId]){ // 取回
@@ -560,6 +576,9 @@
             },
 
             sortInst(a,b){
+                if(this.isPrevious) {
+                    return  a.endTime - b.endTime;
+                }
                 if(a.endTime && b.endTime){
                     if(a.activityType == "startEvent"){
                         return -1;
@@ -617,6 +636,9 @@
              */
             nodeInstIcon(nodeInst) {
                 if (nodeInst.activityType == "startEvent") {
+                    if(this.isPrevious && this.linkProcId !== '' && nodeInst.rootProcessInstanceId === this.linkProcId) {
+                        return "el-icon-refresh";
+                    }
                     return "el-icon-caret-right";
                 } else if (nodeInst.activityType == "userTask") {
                     return "el-icon-user-solid";