n20-common-lib 2.22.62 → 2.22.64

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 (12) hide show
  1. package/package.json +1 -1
  2. package/src/components/ApprovalRecord/approvalImgPro/child.vue +2 -4
  3. package/src/components/ApprovalRecord/approvalImgPro/index.vue +5 -7
  4. package/style/index.css +1 -1
  5. package/theme/blue.css +1 -1
  6. package/theme/cctcRed.css +1 -1
  7. package/theme/green.css +1 -1
  8. package/theme/lightBlue.css +1 -1
  9. package/theme/orange.css +1 -1
  10. package/theme/purple.css +1 -1
  11. package/theme/red.css +1 -1
  12. package/theme/yellow.css +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.22.62",
3
+ "version": "2.22.64",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
package/src/components/ApprovalRecord/approvalImgPro/child.vue CHANGED
@@ -66,10 +66,9 @@
66
66
  <div class="m-b el-dialog__title">{{ '加签流程' | $lc }}</div>
67
67
  <div class="p-a" style="text-align: center">
68
68
  <svg v-if="addTaskList.length" :width="addTaskList.length * 160 - 50" height="82">
69
- <template v-for="(item, i) in addTaskList">
69
+ <g v-for="(item, i) in addTaskList" :key="item.addTaskDefId">
70
70
  <g
71
71
  v-if="i > 0"
72
- :key="i + '-flow'"
73
72
  class="djs-element djs-connection activiti-line-achieve"
74
73
  :class="{
75
74
  'activiti-line-reject': item.examineType === 'reject'
@@ -86,7 +85,6 @@
86
85
  />
87
86
  </g>
88
87
  <g
89
- :key="i"
90
88
  class="djs-element djs-shape activiti-node-achieve"
91
89
  :class="{
92
90
  'activiti-node-at': dataPro.currentActivityIdList.includes(item.addTaskDefId),
@@ -122,7 +120,7 @@
122
120
  </text>
123
121
  <use xlink:href="#symbol_node_User" style="fill: rgb(102, 102, 102)" />
124
122
  </g>
125
- </template>
123
+ </g>
126
124
  </svg>
127
125
  </div>
128
126
  </div>
package/src/components/ApprovalRecord/approvalImgPro/index.vue CHANGED
@@ -90,10 +90,9 @@
90
90
  <div class="m-b el-dialog__title">{{ '加签流程' | $lc }}</div>
91
91
  <div class="p-a" style="text-align: center">
92
92
  <svg v-if="addTaskList.length" :width="addTaskList.length * 160 - 50" height="82">
93
- <template v-for="(item, i) in addTaskList">
93
+ <g v-for="(item, i) in addTaskList" :key="item.addTaskDefId">
94
94
  <g
95
95
  v-if="i > 0"
96
- :key="i + '-flow'"
97
96
  class="djs-element djs-connection activiti-line-achieve"
98
97
  :class="{
99
98
  'activiti-line-reject': item.examineType === 'reject'
@@ -110,7 +109,6 @@
110
109
  />
111
110
  </g>
112
111
  <g
113
- :key="i"
114
112
  class="djs-element djs-shape activiti-node-achieve"
115
113
  :class="{
116
114
  'activiti-node-at': dataPro.currentActivityIdList.includes(item.addTaskDefId),
@@ -146,7 +144,7 @@
146
144
  </text>
147
145
  <use xlink:href="#symbol_node_User" style="fill: rgb(102, 102, 102)" />
148
146
  </g>
149
- </template>
147
+ </g>
150
148
  </svg>
151
149
  </div>
152
150
  </div>
@@ -270,7 +268,7 @@ export default {
270
268
  currentActivityIdList.forEach((currentActivityId) => {
271
269
  let assignee = currAssMap[currentActivityId]
272
270
  let assigneeEnd = taskDefIdMap[currentActivityId]
273
- let task = this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`)
271
+ let task = this.svgWrap.querySelector(`[data-element-id="${currentActivityId}"]`)
274
272
  if (task) {
275
273
  task.classList.add('activiti-node-at')
276
274
  if (!currentActivityId.includes('@addTaskType')) {
@@ -286,7 +284,7 @@ export default {
286
284
  typeof submitter === 'string' &&
287
285
  submitter.trim()
288
286
  ) {
289
- let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
287
+ let taskK = this.svgWrap.querySelector(`[data-element-id="${k}"]`)
290
288
  if (taskK) {
291
289
  this.addEvent(taskK, { assignee: `${$lc('发起人')}：${submitter.trim()}` }, 'pending')
292
290
  }
@@ -294,7 +292,7 @@ export default {
294
292
  }
295
293
  for (let k in taskDefIdMap) {
296
294
  if (!currentActivityIdList.includes(k)) {
297
- let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
295
+ let taskK = this.svgWrap.querySelector(`[data-element-id="${k}"]`)
298
296
  if (taskK) {
299
297
  if (!k.includes('@addTaskType')) {
300
298
  this.addEvent(taskK, taskDefIdMap[k])