n20-common-lib 2.22.50 → 2.22.51

package/package.json

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

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

@@ -133,6 +133,7 @@
 <script>
 import { $lc } from '../../../utils/i18n/index'
 import importG from '../../../utils/importGlobal.js'
+
 export default {
   filters: {
     zoomFormat(val) {
@@ -218,6 +219,20 @@ export default {
           }
         }
       })
+      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}"]`)

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

@@ -168,10 +168,12 @@
 </template>
 
 <script>
+import child from './child.vue'
+
 import axios from '../../../utils/axios.js'
 import { $lc } from '../../../utils/i18n/index'
 import importG from '../../../utils/importGlobal.js'
-import child from './child.vue'
+
 export default {
   components: {
     child
@@ -264,34 +266,48 @@ export default {
           this.setTaskRecord(obj)
         })
 
-        currentActivityIdList.forEach((currentActivityId) => {
-          let assignee = currAssMap[currentActivityId]
-          let assigneeEnd = taskDefIdMap[currentActivityId]
-          let task = this.svgWrap.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 taskDefIdMap) {
-          if (!currentActivityIdList.includes(k)) {
-            let taskK = this.svgWrap.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 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])
             }
           }
         }
-      } catch (error) {
-        console.warn('setTaskErr:', error)
       }
-    },
-    async initPanzoom() {
-      let { default: panzoom } = await importG('panzoom', () => import(/*webpackChunkName: "panzoom"*/ 'panzoom'))
+    } catch (error) {
+      console.warn('setTaskErr:', error)
+    }
+
+    let { default: panzoom } = await importG('panzoom', () => import(/*webpackChunkName: "panzoom"*/ 'panzoom'))
 
       this.svgPanzoom = panzoom(this.svgElement, {
         maxZoom: this.max,

package/src/utils/axios.js

@@ -92,7 +92,7 @@ axios.interceptors.request.use((opt) => {
   return opt
 })
 
-function errorFn(status, msg, noMsg, isErr, res) {
+function errorFn(status, msg, noMsg, res) {
   if (status === 401 || msg === 'Request failed with status code 401') {
     noMsg || showMsg($lc('超时未操作，请重新登录！'))
     setTimeout(() => {
@@ -118,7 +118,7 @@ function errorFn(status, msg, noMsg, isErr, res) {
   } else {
     // noMsg || showMsg(msg)
   }
-  throw { code: status, msg: msg, response: res }
+  return { code: status, msg: msg, response: res }
 }
 
 axios.interceptors.response.use(
@@ -134,48 +134,51 @@ axios.interceptors.response.use(
         return new Promise((resolve, reject) => {
           const reader = new FileReader()
           reader.onload = (e) => {
+            let result
             try {
-              const result = JSON.parse(e.target.result)
-              console.log(result, 'result')
-              msg = result.msg || result.message || msg
-              errorFn(status, msg, noMsg, false, res)
-              reject({ code: status, msg: msg, response: res })
+              result = JSON.parse(e.target.result)
             } catch (error) {
               // 如果解析失败，说明可能是正常的文件下载
               resolve(res)
+              return
             }
+
+            msg = (result && (result.msg || result.message)) || msg
+            reject(errorFn(status, msg, noMsg, res))
           }
+          reader.onerror = () => reject(errorFn(status, msg, noMsg, res))
           reader.readAsText(res.data)
         })
       }
 
-      return errorFn(status, msg, noMsg, false, res)
+      throw errorFn(status, msg, noMsg, res)
     }
   },
   (err) => {
-    let status = err.status
+    let status = (err.response && err.response.status) || err.code || err.status
     let msg = err.message || ''
     let noMsg = err.config && err.config.noMsg
     // 如果是 blob 类型的错误响应
-    if (err.config && err.config.responseType === 'blob') {
+    if (err.config && err.config.responseType === 'blob' && err.response && err.response.data) {
       return new Promise((resolve, reject) => {
         const reader = new FileReader()
         reader.onload = (e) => {
+          let result
           try {
-            const result = JSON.parse(e.target.result)
-            msg = result.msg || result.message || msg
-            errorFn(status, msg, noMsg, true)
-            reject({ code: status, msg: msg, response: err.response })
+            result = JSON.parse(e.target.result)
           } catch (error) {
-            errorFn(status, msg, noMsg, true)
-            reject(err)
+            // 保留 axios 原始错误信息
           }
+
+          msg = (result && (result.msg || result.message)) || msg
+          reject(errorFn(status, msg, noMsg, err.response))
         }
+        reader.onerror = () => reject(errorFn(status, msg, noMsg, err.response))
         reader.readAsText(err.response.data)
       })
     }
 
-    return errorFn(status, msg, noMsg, true)
+    throw errorFn(status, msg, noMsg, err.response)
   }
 )
 
@@ -184,9 +187,11 @@ function request(opt) {
   showLoading({ loading })
 
   if (debounceObj[opt.method + opt.url]) {
-    debounceObj[opt.method + opt.url].finally(() => {
-      closeLoading({ loading })
-    })
+    debounceObj[opt.method + opt.url]
+      .finally(() => {
+        closeLoading({ loading })
+      })
+      .catch(() => {})
 
     // 短时间多次请求,均返回第一次请求结果
     return debounceObj[opt.method + opt.url]