sasp-flow-render 1.0.4 → 1.0.6

package/package.json

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

package/src/assets/js/flowInstall.js

@@ -14,7 +14,7 @@ const install = function (Vue, opts = {}) {
 
     Vue.use(flowUserGlobal,opts);
     Vue.prototype.FLOW_GLOBAL = flowGlobal;
-    Vue.prototype.CACHE_GLOBAL = cacheGlobal;
+    Vue.prototype.FLOW_CACHE_GLOBAL = cacheGlobal;
     Vue.prototype.INTER_CACHE = interfaceCache;
     Vue.prototype.FLOW_USER_GLOBAL = flowUserGlobal;
     Object.assign(Vue.prototype.api, apiFlow.apis);

package/src/components/flowChart.vue

@@ -236,7 +236,7 @@
             },
             //初始化用户信息
             initUserInfo(){
-                this.loginUser = this.CACHE_GLOBAL.getLoginUser();
+                this.loginUser = this.FLOW_CACHE_GLOBAL.getLoginUser();
             }
         }
     }

package/src/components/flowInst/flowInstList.vue

@@ -10,11 +10,8 @@
                     </el-form-item>
                     <el-form-item label="启动人"
                                   v-if="isShow('pending,processed,finished,rescinded,discontinue,flowQuery')">
-                        <el-select v-model="crud.searchForm.startUserName" style="width: 90px;" filterable allow-create clearable>
-                            <el-option v-for="item in userArr" :key="item.id" :value="item.id" :label="item.userName">
-
-                            </el-option>
-                        </el-select>
+                        <el-input v-model="crud.searchForm.startUserName" style="width: 90px;">
+                        </el-input>
                     </el-form-item>
 
                     <el-form-item label="当前处理人" v-if="isShow('flowQuery')">
@@ -380,8 +377,8 @@
                     noClearSearchColumns: this.initNoClearSearch(),
                     initNoSearch: true,
                 }),
-                loginUser: this.CACHE_GLOBAL.getLoginUser(),//当前登录用户
-                userDept: this.CACHE_GLOBAL.getLoginDept(),
+                loginUser: this.FLOW_CACHE_GLOBAL.getLoginUser(),//当前登录用户
+                userDept: this.FLOW_CACHE_GLOBAL.getLoginDept(),
                 flowStatusObj: {//流程状态
                     all: '',
                     draft: 0,

package/src/components/flowInst/flowInstTab.vue

@@ -476,6 +476,7 @@
             initMessageFunc:{type: Function,default:null},
             initFormInfo:{type: Function,default:null}, // 添加修改打开表单时执行的事件
             saveFormInfo:{type: Function,default:null}, // 保存表单时执行的事件
+            getFormInfo:{type: Function,default:null}, // 获取表单内容，以方便进行表单信息修改
             dataPermis:{type:String,default:''},
             flowNextOperation:{type: Function,default:null} // 流程下一步时的参数回调事件
         },
@@ -888,8 +889,8 @@
             }
             this.agentFormObj.flowId = this.flowData.flowId;
             this.isShowAgentSet = false;
-            this.loginUser = this.CACHE_GLOBAL.getLoginUser();
-            this.userDept = this.CACHE_GLOBAL.getLoginDept();
+            this.loginUser = this.FLOW_CACHE_GLOBAL.getLoginUser();
+            this.userDept = this.FLOW_CACHE_GLOBAL.getLoginDept();
             this.initTabOpts(); // 初始化外部选项卡权限
 
             this.getFlowInfo().then(res => {
@@ -909,6 +910,7 @@
                 let nowVersion = this.flowDefine.releaseVersion; //只要已发布最小版本为1.0
                 this.currentRowData = {};
                 this.initFieldStatus(this.startNodeKeyObj[nowVersion],nowVersion).then(()=>{
+                    this.flowInstDataDialog = true;
                     this.initFormInfoFunc('add').then(() => {
                         this.formBtnArr = this.getAddAndUpdateFormBtn({});
                         Object.assign(this.formInfo, {
@@ -916,7 +918,14 @@
                             opt: "add"
                         });
                         this.currentInst = {};
-                        this.flowInstDataDialog = true;
+                        this.$nextTick(() => {
+                            this.exeFlowEvent("add","afterClick");
+                            let startNodeKey = this.startNodeKeyObj[nowVersion];
+                            let startNodeObj = this.flowVersionNodeObj[nowVersion][startNodeKey] || {};
+                            if(startNodeObj.openEvent == '1'){
+                                this.exeNewFlowEvent("addAfter");//新事件规则
+                            }
+                        })
                     })
                 });
                 // this.$refs.flowInstDataInfo && (this.$refs.flowInstDataInfo.optFormData = {});
@@ -954,8 +963,18 @@
                 }
                 // console.log(currentNode);
                 return new Promise(resolve => {
-                    this.initFormInfo && this.initFormInfo(type,dataId,JSON.parse(currentNode.fieldOperate || "{}"),rowData);
-                    resolve();
+                    if(this.initFormInfo){
+                        let promise = this.initFormInfo(type,dataId,JSON.parse(currentNode.fieldOperate || "{}"),rowData);
+                        if(promise.then){
+                            promise.then(() => {
+                                resolve();
+                            })
+                        }else{
+                            resolve();
+                        }
+                    } else{
+                        resolve();
+                    }
                 })
             },
             /**
@@ -992,17 +1011,13 @@
                 this.currNodeName = 'noEnd';
                 this.flowInstDataDialog = true;
                 this.initUpdateFlowForm(row).then(() =>{
-                    this.flowInstDataDialog = true;
-                    // this.$nextTick(() => {
-                    //     this.$refs.flowInstDataInfo.loadData().then(() => {
-                    //         this.exeFlowEvent(executePosition,"afterClick",row.currentNode);
-                    //
-                    //         let currentNodeObj = this.flowNodeIdToInfo[row.currentNode] ||{};
-                    //         if(currentNodeObj.openEvent== '1'){ //开启事件
-                    //             this.exeNewFlowEvent("editAfter",currentNodeObj.nodeLinkId ||'');//新事件规则
-                    //         }
-                    //     })
-                    // })
+                    this.$nextTick(() => {
+                        this.exeFlowEvent(executePosition,"afterClick",row.currentNode);
+                        let currentNodeObj = this.flowNodeIdToInfo[row.currentNode] ||{};
+                        if(currentNodeObj.openEvent== '1'){ //开启事件
+                            this.exeNewFlowEvent("editAfter",currentNodeObj.nodeLinkId ||'');//新事件规则
+                        }
+                    })
                 });
             },
 
@@ -1016,6 +1031,7 @@
                     this.currNodeName = "end";
                 }
                 this.initFieldStatus(row.nodeKey || startNodeKey,row.version,row.flowStatus).then(() =>{
+                    this.flowInstDataDialog = true;
                     this.initFormInfoFunc('view',row).then(() => {
                         this.currentStartUser = this.userMap[row.startUserId] || "";
                         this.currentStartTime = row.startTime;
@@ -1026,7 +1042,6 @@
                             opt: "view",
                         });
                         this.formBtnArr = this.getViewFormBtn(row);
-                        this.flowInstDataDialog = true;
                     });
                 });
             },
@@ -1375,20 +1390,20 @@
              */
             nextStep() {
                 // let type = this.flowBatchPendingDialog ? "batch" : "";
-                // let afterClickResult;
-                // let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
-                // afterClickResult=this.exeFlowEvent("nextStep","afterClick", this.currentInst.currentNode || this.draftNodeId);
+                let afterClickResult;
+                let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
+                afterClickResult=this.exeFlowEvent("nextStep","afterClick", this.currentInst.currentNode || this.draftNodeId);
                 //
-                // if(currentNodeObj.openEvent == '1'){
-                //     afterClickResult = this.exeNewFlowEvent("nextClick",currentNodeObj.nodeLinkId);
-                // }
+                if(currentNodeObj.openEvent == '1'){
+                    afterClickResult = this.exeNewFlowEvent("nextClick",currentNodeObj.nodeLinkId);
+                }
 
                 // let afterValidateResult;
                 // let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
-                // afterValidateResult=this.exeFlowEvent("nextStep","afterValidate", this.currentInst.currentNode || this.draftNodeId);
-                // if(currentNodeObj.openEvent == '1'){
-                //     afterValidateResult = this.exeNewFlowEvent("nextCheck",currentNodeObj.nodeLinkId);
-                // }
+                this.exeFlowEvent("nextStep","afterValidate", this.currentInst.currentNode || this.draftNodeId);
+                if(currentNodeObj.openEvent == '1'){
+                    this.exeNewFlowEvent("nextCheck",currentNodeObj.nodeLinkId);
+                }
 
                 this.isDisabled['nextStep'] = false;
                 this.flowParams = {};
@@ -2532,12 +2547,15 @@
                 // executePosition:add:['afterClick'],update:['afterClick'],handle:['afterClick'],
                 // nextStep:['afterClick','afterValidate','submitSuccess'],view:['afterClick'],
                 // （columnFormatter:['finished','end']?暂时不用）
-                let formData;
-                if(batchDataRef){//批量处理走单独方法
-                    formData=this.$refs[batchDataRef][0] && this.$refs[batchDataRef][0].optFormData || {};
-                }else{
-                    formData=(this.$refs.flowInstDataInfo && this.$refs.flowInstDataInfo.optFormData) || {};
+                let formData = {};
+                if(this.getFormInfo){
+                    formData = this.getFormInfo();
                 }
+                // if(batchDataRef){//批量处理走单独方法
+                //     formData=this.$refs[batchDataRef][0] && this.$refs[batchDataRef][0].optFormData || {};
+                // }else{
+                //     formData=(this.$refs.flowInstDataInfo && this.$refs.flowInstDataInfo.optFormData) || {};
+                // }
                 let CTX = window.JAVA_URL;
                 let paramValues = [this,this.axios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode,null]; // 入参
                 if(executePosition == "add" || executePosition == "update"){
@@ -2568,12 +2586,16 @@
              * 执行工作流新版本事件规则
              */
             exeNewFlowEvent(executeType,nodeKey,batchDataRef){
-                let formData;
-                if(batchDataRef){//批量处理走单独方法
-                    formData=this.$refs[batchDataRef][0] && this.$refs[batchDataRef][0].optFormData || {};
-                }else{
-                    formData=(this.$refs.flowInstDataInfo && this.$refs.flowInstDataInfo.optFormData) || {};
+                let formData = {};
+                if(this.getFormInfo){
+                    formData = this.getFormInfo();
                 }
+                // let formData;
+                // if(batchDataRef){//批量处理走单独方法
+                //     formData=this.$refs[batchDataRef][0] && this.$refs[batchDataRef][0].optFormData || {};
+                // }else{
+                //     formData=(this.$refs.flowInstDataInfo && this.$refs.flowInstDataInfo.optFormData) || {};
+                // }
                 //执行自定义脚本
                 let CTX = window.JAVA_URL;
                 let paramValues = [this,this.axios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode]; // 入参

package/src/components/flowRoamRecords.vue

@@ -559,6 +559,12 @@
                     if(b.activityType == "startEvent"){
                         return 1;
                     }
+                    if(a.activityType == "noneEndEvent"){
+                        return 1;
+                    }
+                    if(b.activityType == "noneEndEvent"){
+                        return -1;
+                    }
                     if(a.activityId == b.activityId){
                         return a.endTime - b.endTime;
                     }

package/src/views/flowInstView.vue

@@ -2,7 +2,7 @@
     <flow-inst-tab :flow-id="useFlowId" :userArr="userArr" :userMap="userMap"
                    :operateRootArr="operateArr" :dataPermis="dataPermis"
                    :initFormInfo="initFormInfo" :saveFormInfo="saveFormInfo" :class='flowViewMainClass'
-                   :flow-next-operation="flowNextOperation">
+                   :flow-next-operation="flowNextOperation" :getFormInfo="getFormInfo">
         <template slot="formInfo">
             <slot name="formInfo"></slot>
         </template>
@@ -21,6 +21,7 @@
             operateArr:{type:Array,default:null},
             initFormInfo:{type: Function,default:null}, // 添加修改打开表单时执行的事件
             saveFormInfo:{type: Function,default:null}, // 保存表单时执行的事件
+            getFormInfo:{type: Function,default:null}, // 获取表单内容，以方便进行表单信息修改
             flowNextOperation:{type: Function,default:null} // 流程下一步时的参数回调事件
         },
         data(){
@@ -70,7 +71,7 @@
             },
             init(){
                 if(this.loginUser){
-                    this.CACHE_GLOBAL.setLoginUser(this.loginUser);
+                    this.FLOW_CACHE_GLOBAL.setLoginUser(this.loginUser);
                 }else{
                     let loginUser = {};
                     if(this.userId){
@@ -81,7 +82,7 @@
                     if(this.userName){
                         loginUser.userName = this.userName;
                     }
-                    this.CACHE_GLOBAL.setLoginUser(loginUser);
+                    this.FLOW_CACHE_GLOBAL.setLoginUser(loginUser);
                 }
                 if(this.flowId){
                     this.useFlowId = this.flowId;

package/src/views/menuRouter/flowMenuRouter.vue

@@ -102,7 +102,7 @@
                 }
                   // let menuObj = window.menuIdToMenuObj[this.menuId] || {};
 
-                let loginUser = this.CACHE_GLOBAL.getLoginUser(); //获取当前用户
+                let loginUser = this.FLOW_CACHE_GLOBAL.getLoginUser(); //获取当前用户
                 //根据 当前用户查询 数据权限和操作权限
                 //判断当前用户类型
                 if(loginUser.userType == 'sup' || this.isCloudView){ //开发者

package/src/views/menuRouter/flowResRouter.vue

@@ -77,7 +77,7 @@
                 //let menuObj = window.resourceToMemu[this.resourceId];
                 //this.menuId = menuObj.id;
 
-                let loginUser = this.CACHE_GLOBAL.getLoginUser(); //获取当前用户
+                let loginUser = this.FLOW_CACHE_GLOBAL.getLoginUser(); //获取当前用户
                 //根据 当前用户查询 数据权限和操作权限
                 //判断当前用户类型
                 if(loginUser.userType == 'sup'){ //开发者