sasp-flow-render 1.1.9 → 1.1.11

package/package.json

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

package/src/components/flowInst/flowInstList.vue

@@ -19,7 +19,7 @@
                         </el-input>
                     </el-form-item>
                     <el-form-item label="当前任务" v-if="isShow('pending,processed,flowQuery')">
-                        <el-select v-model="crud.searchForm.currentNode" filterable clearable style="width: 130px;">
+                        <el-select v-model="crud.searchForm.currentNode" filterable clearable :style="{'width': flowIds.includes(',') ? '200px' : '130px'}">
                             <el-option v-for="(nodeName,nodeIdStr) in flowNodeNameObj" :key="nodeIdStr" :value="nodeIdStr"
                                        :label="nodeName"></el-option>
                         </el-select>
@@ -82,7 +82,7 @@
                     <el-button type="primary" icon="el-icon-document-copy" size="small" round v-if="isShow('pending')"
                                @click="openFlowBatchPendingDialog">批量处理
                     </el-button>
-                    <el-button type="warning" icon="el-icon-document-copy" size="small" round v-if="isShow('pending') && getFormDataByDataIds"
+                    <el-button type="warning" icon="el-icon-document-copy" size="small" round v-if="isShow('pending') && getFormDataByDataIds && flowDefine.openBatch === '1'"
                                @click="openFlowBatchPendingDialogNew">快捷处理
                     </el-button>
                 </el-header>
@@ -111,7 +111,7 @@
                                          v-if="!isShow('draft')" show-overflow-tooltip :sortable="tabType === 'pending' ? 'custom' : false">
                             <template slot-scope="scope">
                                 {{formatterCurrentNodeName(scope.row)}}
-                                <span v-if="scope.row.operateStatus == '0' && scope.row.agentType == '0'">(正常)</span>
+                                <span v-if="scope.row.operateStatus == '0' && scope.row.agentType == '0'"></span>
                                 <span v-if="scope.row.operateStatus == '1'"
                                       style="color: rgba(14,192,82,1);">(加签)</span>
                                 <span v-if="scope.row.operateStatus == '3'"

package/src/components/flowInst/flowInstTab.vue

@@ -968,6 +968,7 @@
                 pages: 1, //总页数
                 total: 0, //总条数
                 pageSize: 50, //每页多少条
+                flowEventScriptByFlowId: {},
             }
         },
         watch:{
@@ -1103,7 +1104,6 @@
                     let version = this.flowDefine.releaseVersion;
                     currentNode = this.flowVersionNodeObj[version][this.startNodeKeyObj[version]];
                 }
-                // console.log(currentNode);
                 return new Promise(resolve => {
                     if(this.initFormInfo){
                         let promise = this.initFormInfo(type,dataId,JSON.parse(currentNode.fieldOperate || "{}"),rowData);
@@ -1131,7 +1131,7 @@
                     this.flowVersionNodeObj = this.flowVersionNodeObjByFlowId[row.flowId];
                     this.initFlowObj();
                     // 加载工作流脚本与工作流事件规则
-                    this.initFlowScript();
+                    // this.initFlowScript();
                     // Object.assign(this.formInfo, this.formInfoByFlowId[row.flowId]);
                 }
 
@@ -1158,6 +1158,9 @@
              * 打开[修改和处理]窗口
              */
             openUpdateFlowForm(row,executePosition) {
+                if (this.flowId.includes(",")) {
+                    this.setFlowScript(row.flowId);
+                }
                 this.currentRowData = row;
                 this.currNodeName = 'noEnd';
                 let currentNodeObj1 = this.flowNodeIdToInfo[row.currentNode] ||{};
@@ -1234,7 +1237,6 @@
 
             // 新批量处理弹框回调事件
             openNewBatchUpdateFlowForm() {
-                // console.log('this.sysDataObj', this.sysDataObj, this.loginUser);
                 Object.assign(this.formSearchObj, {
                     flowNewBatchDealArr: [],
                     isNewSelectBatchDeal: false,
@@ -1317,7 +1319,6 @@
                         rows: this.pageSize,
                         page: this.currentPage
                     }).then(res => {
-                        // console.log('initNewBatchDeal', res);
                         this.total = res.data.total;
                         this.pages = res.data.pages;
                         let flowNewBatchDeal = [];
@@ -2883,6 +2884,8 @@
                         for (const allFlowNode of allFlowNodeArr) {
                             this.startNodeKeyObj = {};
                             this.flowVersionNodeObj = {};
+                            let flowId = allFlowNode[0].flowId;
+                            this.flowDefine = this.flowDefineByFlowId[flowId];
                             (allFlowNode || []).forEach(item => {
                                 if (item.nodeLinkId.indexOf("Activity_draft") > -1) {
                                     this.startNodeKey = item.nodeLinkId;
@@ -2898,7 +2901,11 @@
                                 let nodeArr = ['StartEvent', 'ParallelGateway', 'SequenceFlow', 'ExclusiveGateway', 'InclusiveGateway'];
                                 if (item.nodeType && nodeArr.indexOf(item.nodeType) === -1) {
                                     if (!this.flowNodeNameObj[item.nodeLinkId]) {
-                                        this.$set(this.flowNodeNameObj, item.nodeLinkId, item.nodeName);
+                                        let nodeName = item.nodeName;
+                                        if (this.flowId.includes(",")) {
+                                            nodeName = this.flowDefine.flowName + "-" + item.nodeName;
+                                        }
+                                        this.$set(this.flowNodeNameObj, item.nodeLinkId, nodeName);
                                     } else {
                                         if (this.flowNodeNameObj[item.nodeLinkId] !== item.nodeName) {
                                             this.flowNodeNameObj[item.nodeLinkId] = this.flowNodeNameObj[item.nodeLinkId] + "," + item.nodeName;
@@ -2924,23 +2931,45 @@
                                 this.nodeFormButtonObj[item.id] = this.sortButtonArr(formButton);
                                 this.nodeFormBtnObj[item.id] = this.formatterFormButton(formButton);
                             });
-                            let flowId = allFlowNode[0].flowId;
                             this.$set(this.startNodeKeyObjByFlowId, flowId, this.startNodeKeyObj);
                             this.$set(this.flowVersionNodeObjByFlowId, flowId, this.flowVersionNodeObj);
-                            this.flowDefine = this.flowDefineByFlowId[flowId];
                             // this.initFlowScript().then(() => {
                             //     resolve(true);
                             // });
                         }
+                        const initFlowScriptFunc = flowIdArr.map(flowId => () => this.initFlowScript(flowId));
+                        Promise.all(initFlowScriptFunc.map(func => func())).then(scriptArr => {
+                            (scriptArr || []).forEach(scriptEventObj => {
+                                Object.keys(scriptEventObj).forEach(key => {
+                                    if (key) {
+                                        this.flowEventScriptByFlowId[key] = scriptEventObj[key];
+                                    }
+                                });
+                            });
+                        }).catch(reason => {
+                            console.log('流程脚本加载出错了', reason);
+                        });
                         resolve(true);
                     });
                 });
             },
 
+            setFlowScript(flowId) {
+                if (flowId) {
+                    let scriptObj = this.flowEventScriptByFlowId[flowId] || {};
+                    this.scriptObj = scriptObj.scriptObj || {};
+                    this.newScriptObj = scriptObj.newScriptObj || {};
+                    this.newEventObj = scriptObj.newEventObj || {};
+                }
+            },
+
             /**
              *  加载工作流脚本与工作流事件规则
              */
-            initFlowScript(){
+            initFlowScript(flowId){
+                if (flowId) {
+                    this.flowDefine = this.flowDefineByFlowId[flowId] || {};
+                }
                 return new Promise(resolve => {
                     this.saspFlowAxios.all([
                         this.saspFlowAxios.post(this.api.plFlowScript.find,{"flowId": this.flowDefine.id}),
@@ -3140,7 +3169,8 @@
                             });
                         }
                         // 结束
-                        resolve();
+                        let obj = {"scriptObj": this.scriptObj, "newScriptObj": this.newScriptObj, "newEventObj": this.newEventObj};
+                        resolve({[flowId]: obj});
                     }));
                 })
             },
@@ -3283,7 +3313,7 @@
                         }
                     });
                 }catch (e) {
-                    // console.log(e);
+                    console.log(e);
                     result=false;
                 }