sasp-flow-render 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/assets/js/api/apiFlow.js +8 -2
  3. package/src/components/flowInst/flowInstTab.vue +1 -1
  4. package/src/components/flowRoamRecords.vue +3 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sasp-flow-render",
3
- "version": "1.1.0",
3
+ "version": "1.1.1",
4
4
  "description": "业务应用支撑平台-智慧流程渲染组件",
5
5
  "scripts": {
6
6
  "build": "vue-cli-service build"
package/src/assets/js/api/apiFlow.js CHANGED
@@ -162,6 +162,12 @@ let objResult = {
162
162
  find:"/plFlowDefineVersionController/find",
163
163
  deleteByCondition:"/plFlowDefineVersionController/deleteByCondition"
164
164
  },
165
+ sysInterModuleController:{
166
+ url:"/sysInterModuleController",
167
+ add:"/sysInterModuleController/add",
168
+ update:"/sysInterModuleController/update",
169
+ find:"/sysInterModuleController/find",
170
+ },
165
171
  plFlowEventDetail:{
166
172
  url:"/plFlowEventDetailController",
167
173
  find:"/plFlowEventDetailController/find",
@@ -172,8 +178,8 @@ let objResult = {
172
178
  findByFlowAndLeadFunc:"/plFlowEventDetailController/findByFlowAndLeadFunc",
173
179
  },
174
180
  loginMethod:{
175
- login: "/loginController/login",
176
- logout: "/loginController/logout",
181
+ login: "/flowLoginController/login",
182
+ logout: "/flowLoginController/logout",
177
183
  },
178
184
  plFlowDomain:{
179
185
  url:"/plFlowDomainController",
package/src/components/flowInst/flowInstTab.vue CHANGED
@@ -249,7 +249,7 @@
249
249
  :key="item.dataId"
250
250
  :label="userMap[item.startUserId]"
251
251
  :name="item.dataId" :closable="batchUpdateFormInfo.dataRows.length > 1" :lazy="true">
252
- <template v-if="batchUpdateFormInfo.formShow">
252
+ <template v-if="item.dataId == batchUpdateFormInfo.activeName">
253
253
  <slot name="formInfo"></slot>
254
254
  </template>
255
255
  </el-tab-pane>
package/src/components/flowRoamRecords.vue CHANGED
@@ -467,7 +467,7 @@
467
467
  }else if(variables["back_" + item.taskId]){ // 退回
468
468
  item.nodeInstStatus = "3";
469
469
  item.actorUserName += "(由用户‘"+ userIdsMap[variables["back_" + item.taskId]] + "’退回)";
470
- item.nodeMask = plNodeInstMap[item.taskId] === undefined ? "" : plNodeInstMap[item.taskId].backMsg;
470
+ // item.nodeMask = plNodeInstMap[item.taskId] === undefined ? "" : plNodeInstMap[item.taskId].backMsg;
471
471
  }else if(Object.keys(variables).indexOf("autoEnd_" + item.taskId) > -1){ // 自动处理
472
472
  item.actorUserName += "(系统自动处理)";
473
473
  }else if(variables["assignTask_" + item.taskId]){ // 退回
@@ -478,7 +478,8 @@
478
478
  }else{
479
479
  item.actorUserName += "(" + item.nodeInstStatusName + ")";
480
480
  }
481
- if(turnSignObj[item.taskId]){
481
+ item.nodeMask = plNodeInstMap[item.taskId] === undefined ? "" : plNodeInstMap[item.taskId].backMsg;
482
+ if(turnSignObj[item.taskId]){
482
483
  if(!getbackObj[item.taskId]){
483
484
  item.actorUserName += "(转签任务)";
484
485
  }