n20-common-lib 2.22.51 → 2.22.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.22.51",
+  "version": "2.22.52",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -231,7 +231,7 @@ export default {
     this.setSvgAttrs(flowSvg)
     this.setPendingUserInfo(unApplayUserTaskCandidate)
     this.bindTaskEvents({ currentActivityIdList, currAssMap, taskDefIdMap, addTask, addTaskPre, seqRecords })
-    await this.initPanzoom()
+    await this.initPanZoom()
     document.body.addEventListener('click', this.addTaskFn)
   },
 
@@ -266,48 +266,49 @@ export default {
           this.setTaskRecord(obj)
         })
 
-      // 非加签节点添加事件
-      currentActivityIdList.forEach((currentActivityId) => {
-        let assignee = currAssMap[currentActivityId]
-        let assigneeEnd = taskDefIdMap[currentActivityId]
-        let task = this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`)
-        if (task) {
-          task.classList.add('activiti-node-at')
-          if (!currentActivityId.includes('@addTaskType')) {
-            this.addEvent(task, { assignee, assigneeEnd }, 'pending')
+        // 非加签节点添加事件
+        currentActivityIdList.forEach((currentActivityId) => {
+          let assignee = currAssMap[currentActivityId]
+          let assigneeEnd = taskDefIdMap[currentActivityId]
+          let task = this.svgW.querySelector(`[data-element-id="${currentActivityId}"]`)
+          if (task) {
+            task.classList.add('activiti-node-at')
+            if (!currentActivityId.includes('@addTaskType')) {
+              this.addEvent(task, { assignee, assigneeEnd }, 'pending')
+            }
           }
-        }
-      })
-      for (let k in currAssMap) {
-        let submitter = currAssMap[k]
-        if (
-          !currentActivityIdList.includes(k) &&
-          !k.includes('@addTaskType') &&
-          typeof submitter === 'string' &&
-          submitter.trim()
-        ) {
-          let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
-          if (taskK) {
-            this.addEvent(taskK, { assignee: `${$lc('发起人')}：${submitter.trim()}` }, 'pending')
+        })
+        for (let k in currAssMap) {
+          let submitter = currAssMap[k]
+          if (
+            !currentActivityIdList.includes(k) &&
+            !k.includes('@addTaskType') &&
+            typeof submitter === 'string' &&
+            submitter.trim()
+          ) {
+            let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
+            if (taskK) {
+              this.addEvent(taskK, { assignee: `${$lc('发起人')}：${submitter.trim()}` }, 'pending')
+            }
           }
         }
-      }
-      for (let k in taskDefIdMap) {
-        if (!currentActivityIdList.includes(k)) {
-          let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
-          if (taskK) {
-            if (!k.includes('@addTaskType')) {
-              this.addEvent(taskK, taskDefIdMap[k])
-              this.addChildEvent(taskK, taskDefIdMap[k])
+        for (let k in taskDefIdMap) {
+          if (!currentActivityIdList.includes(k)) {
+            let taskK = this.svgW.querySelector(`[data-element-id="${k}"]`)
+            if (taskK) {
+              if (!k.includes('@addTaskType')) {
+                this.addEvent(taskK, taskDefIdMap[k])
+                this.addChildEvent(taskK, taskDefIdMap[k])
+              }
             }
           }
         }
+      } catch (error) {
+        console.warn('setTaskErr:', error)
       }
-    } catch (error) {
-      console.warn('setTaskErr:', error)
-    }
-
-    let { default: panzoom } = await importG('panzoom', () => import(/*webpackChunkName: "panzoom"*/ 'panzoom'))
+    },
+    async initPanZoom() {
+      let { default: panzoom } = await importG('panzoom', () => import(/*webpackChunkName: "panzoom"*/ 'panzoom'))
 
       this.svgPanzoom = panzoom(this.svgElement, {
         maxZoom: this.max,