sasp-flow-render 1.1.30-decoupling → 1.1.32-decoupling

package/package.json

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

package/src/components/flowInst/flowInstTab.vue

@@ -36,7 +36,7 @@
         </div>
         <div style="height: 100%" v-else>
         <el-tabs v-model="tabActive" v-if="initSuccess" type="border-card" @tab-click="tabClick"
-                 style="width: 100%;height: 100%;">
+                 style="width: 100%;height: 100%;box-sizing: border-box">
             <el-tab-pane name="draft" v-if="tabShow('draft')" style="height: 100%;" :lazy="true">
                 <span slot="label">
                     <i v-if="tabTypeObj['showTabIcon']" :class="tabTypeObj['draft'].iconShow"></i>
@@ -1514,7 +1514,7 @@
 
 <style lang="scss" scoped>
     /deep/ .el-tabs__content {
-        height: calc(100% - 60px);
+        height: calc(100% - 70px);
     }
 
     .el-tab-pane {

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

@@ -58,6 +58,8 @@ class WorkflowEngine {
         this.forceUpdateComponent = methods["forceUpdateComponent"];
         this.nextStepAfterSave = methods["nextStepAfterSave"]; // 流程下一步保存表单数据后的回调
         this.afterNextStepSuccess = methods["afterNextStepSuccess"]; // 流程下一步成功后，即关闭对话框后的回调
+        this.backSubmitEvent = methods["backSubmitEvent"]; // 退回后执行方法
+        this.getBackSubmitEvent = methods["getBackSubmitEvent"]; // 取回后执行方法
         this.setParams = methods["setParams"];
 
         if(!this.initFormInfo){
@@ -932,6 +934,10 @@ class WorkflowEngine {
                                 chooseNextUserName: this.chooseNextUserName
                             });
                         } else if (this.nextNode.nodeType == "EndEvent") {
+                            if(window.skipFlowEnd && window.skipFlowEnd.includes(this.flowId)){
+                                this.$flowDialog.saveNextStept();
+                                return;
+                            }
                             this.nextSteptUserDialog = true;
                             this.$flowDialog.operateDialog('nextSteptUserDialog',true);
                             return;
@@ -1006,7 +1012,7 @@ class WorkflowEngine {
         return new Promise(resolve => {
             if(this.nextStepAfterSave){
                 let result = this.nextStepAfterSave(this.$this,this);
-                if(result && result.then){
+                if(result && (result instanceof Promise)){
                     result.then(res => {
                         resolve(res);
                     })
@@ -1024,7 +1030,7 @@ class WorkflowEngine {
         return new Promise(resolve => {
             if(this.saveFormInfo){
                 let result = this.saveFormInfo(type);
-                if(result && result.then){
+                if(result && (result instanceof Promise)){
                     result.then(res => {
                         if(!res){
                             this.isDisabled['nextStep'] = true;
@@ -1762,6 +1768,9 @@ class WorkflowEngine {
                 }).then(res => {
                 if (res && res.data && res.data.operateSuccess) {
                     this.$this.$message({type: "success", message: "退回成功！"});
+                    let currentNodeObj = this.flowNodeIdToInfo[currentInst.currentNode] ||{};
+                    this.exeNewFlowEvent("backSubmit",currentNodeObj.nodeLinkId);
+                    this.backSubmitEvent && this.backSubmitEvent(this.$this,this,currentInst);
                     this.initTabNum && this.initTabNum();
                     if (this.getFlowBatchDialog && this.getFlowBatchDialog()) {
                         this.batchTabRemove(this.currentInst.dataId);
@@ -1802,6 +1811,9 @@ class WorkflowEngine {
                 }).then(res => {
                 if (res && res.data && res.data.operateSuccess) {
                     this.$this.$message({type: "success", message: "取回成功！"});
+                    let currentNodeObj = this.flowNodeIdToInfo[currentInst.currentNode] ||{};
+                    this.exeNewFlowEvent("getBackSubmit",currentNodeObj.nodeLinkId);
+                    this.getBackSubmitEvent && this.getBackSubmitEvent(this.$this,this,currentInst);
                     this.initTabNum && this.initTabNum();
                     if (this.getFlowBatchDialog && this.getFlowBatchDialog()) {
                         this.batchTabRemove(this.currentInst.dataId);

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

@@ -832,6 +832,10 @@ export default {
       return optFormData;
     },
 
+    closeInstDialog(){
+        this.flowInstDataDialog = false;
+    },
+
     /**
      * 保存表单信息
      */