sasp-flow-render 1.1.0 → 1.1.2

package/package.json

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

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

@@ -162,6 +162,12 @@ let objResult = {
         find:"/plFlowDefineVersionController/find",
         deleteByCondition:"/plFlowDefineVersionController/deleteByCondition"
     },
+    sysInterModuleController:{
+        url:"/sysInterModuleController",
+        add:"/sysInterModuleController/add",
+        update:"/sysInterModuleController/update",
+        find:"/sysInterModuleController/find",
+    },
     plFlowEventDetail:{
         url:"/plFlowEventDetailController",
         find:"/plFlowEventDetailController/find",
@@ -172,8 +178,8 @@ let objResult = {
         findByFlowAndLeadFunc:"/plFlowEventDetailController/findByFlowAndLeadFunc",
     },
     loginMethod:{
-        login: "/loginController/login",
-        logout: "/loginController/logout",
+        login: "/flowLoginController/login",
+        logout: "/flowLoginController/logout",
     },
     plFlowDomain:{
         url:"/plFlowDomainController",
@@ -181,6 +187,7 @@ let objResult = {
         add:"/plFlowDomainController/add",
         update:"/plFlowDomainController/update",
         delete:"/plFlowDomainController/delete",
+        findRealUrl:"/plFlowDomainController/findRealUrl",
     },
     plFlowInterface:{
         url:"/plFlowInterfaceController",
@@ -210,6 +217,11 @@ let objResult = {
         delete:"/plFlowCss/delete",
         getById:"/plFlowCss/getById",
     },
+    operationLog: {
+        url:"/operationLogController",
+        find:"/operationLogController/find",
+        getById:"/operationLogController/getById"
+    },
 };
 
 import {SaspModuleUtil} from "sasp-base";

package/src/assets/js/global/cacheGlobal.js

@@ -40,10 +40,14 @@ export default {
         setLocalJSON('LOGINUSER', user);
     },
     setLoginToken(token) {
-        setLocalJSON('USERTOKEN', "pl_token_" + token);
-
-        localStorage["Authorization" + (window.projectSuffix || "")] = "pl_token_" + token;
-        axios.defaults.headers.common["Authorization"] = "pl_token_" + token;
+        let customToken = window.customToken;
+        if(!customToken) {
+            customToken = "pl_token_";
+        }
+        setLocalJSON('USERTOKEN', customToken + token);
+
+        localStorage["Authorization" + (window.projectSuffix || "")] = customToken + token;
+        axios.defaults.headers.common["Authorization"] = customToken + token;
     },
 
     clearLoginToken(token) { // 登陆前清空登录认证token

package/src/assets/js/global/flowUserGlobal.js

@@ -13,9 +13,13 @@ export default {
         axios.defaults.headers.common["Authorization"] = "";
     },
     setLoginToken(token){
-        setLocalJSON('USERTOKEN', "pl_token_" + token);
-        localStorage["Authorization" + (window.projectSuffix || "")] = "pl_token_" + token;
-        axios.defaults.headers.common["Authorization"] = "pl_token_" + token;
+        let customToken = window.customToken;
+        if(!customToken) {
+            customToken = "pl_token_";
+        }
+        setLocalJSON('USERTOKEN', customToken + token);
+        localStorage["Authorization" + (window.projectSuffix || "")] = customToken + token;
+        axios.defaults.headers.common["Authorization"] = customToken + token;
     },
 
     getLoginUser() {
@@ -32,4 +36,4 @@ export default {
         localStorage["Authorization" + (window.projectSuffix || "")] = "";
         axios.defaults.headers.common["Authorization"] = "";
     },
-}
+}

package/src/components/flowInst/flowInstTab.vue

@@ -243,13 +243,13 @@
             <el-tabs type="card" v-model="batchUpdateFormInfo.activeName"
                      :closable="batchUpdateFormInfo.dataRows.length > 1" @tab-click="batchTabClick"
                      @tab-remove="batchTabRemove"
-                     v-if="flowBatchPendingDialog">
+                     v-if="flowBatchPendingDialog" style="height: 100%">
                 <el-tab-pane
                         v-for="(item, index) in batchUpdateFormInfo.dataRows"
                         :key="item.dataId"
                         :label="userMap[item.startUserId]"
                         :name="item.dataId" :closable="batchUpdateFormInfo.dataRows.length > 1" :lazy="true">
-                    <template v-if="batchUpdateFormInfo.formShow">
+                    <template v-if="item.dataId == batchUpdateFormInfo.activeName">
                         <slot name="formInfo"></slot>
                     </template>
                 </el-tab-pane>

package/src/components/flowRoamRecords.vue

@@ -467,7 +467,7 @@
                         }else if(variables["back_" + item.taskId]){ // 退回
                             item.nodeInstStatus = "3";
                             item.actorUserName += "(由用户‘"+ userIdsMap[variables["back_" + item.taskId]] + "’退回)";
-                            item.nodeMask = plNodeInstMap[item.taskId] === undefined ? "" : plNodeInstMap[item.taskId].backMsg;
+                            // item.nodeMask = plNodeInstMap[item.taskId] === undefined ? "" : plNodeInstMap[item.taskId].backMsg;
                         }else if(Object.keys(variables).indexOf("autoEnd_" + item.taskId) > -1){ // 自动处理
                             item.actorUserName += "(系统自动处理)";
                         }else if(variables["assignTask_" + item.taskId]){ // 退回
@@ -478,7 +478,8 @@
                         }else{
                             item.actorUserName += "(" + item.nodeInstStatusName + ")";
                         }
-                        if(turnSignObj[item.taskId]){
+                      item.nodeMask = plNodeInstMap[item.taskId] === undefined ? "" : plNodeInstMap[item.taskId].backMsg;
+                      if(turnSignObj[item.taskId]){
                             if(!getbackObj[item.taskId]){
                                 item.actorUserName += "(转签任务)";
                             }

package/src/components/userSelect.vue

@@ -130,7 +130,7 @@
              */
             loadUserData(){
                 let dataInter = this.sysInterfaceObj['userData'];
-                this.axios.post(this.api.plFlowDomain.find,{status:'1'}).then(res => {
+                this.axios.post(this.api.plFlowDomain.findRealUrl,{status:'1'}).then(res => {
                     (res.data || []).forEach(item => {
                         this.doMainDatasObj[item.id] = item.domainUrl;
                     })
@@ -534,4 +534,4 @@
             }
         }
     }
-</style>
+</style>

package/src/views/flowInstView.vue

@@ -106,7 +106,7 @@
                 }
             },
             loadUserData(dataInter){
-                this.axios.post(this.api.plFlowDomain.find,{status:'1'}).then(res => {
+                this.axios.post(this.api.plFlowDomain.findRealUrl,{status:'1'}).then(res => {
                     (res.data || []).forEach(item => {
                         this.doMainDatasObj[item.id] = item.domainUrl;
                     })

package/src/views/menuRouter/flowMenuRouter.vue

@@ -114,9 +114,9 @@
                     operatePermisList.forEach(item =>{
                         //处理操作权限
                         if(item.powerCode=='children'){//叶子节点
-                            checkOperateKeysLeaf.push(item);
+                            checkOperateKeysLeaf.push(item.powerKey);
                         }else{
-                            checkOperateKeysRoot.push(item);
+                            checkOperateKeysRoot.push(item.powerKey);
                         }
                     });
                    /* checkOperateKeysLeaf.forEach(leaf=>{