n20-common-lib 3.2.31 → 3.2.33

package/package.json

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

package/src/assets/css/layout-header.scss

@@ -56,13 +56,6 @@ $--header-color: #3d4a57;
     margin-right: 10px;
     cursor: pointer;
   }
-
-  .el-badge {
-    .el-badge__content {
-      line-height: 14px;
-      height: 14px;
-    }
-  }
 }
 
 .header-notice-tabs {
@@ -141,7 +134,6 @@ $--header-color: #3d4a57;
   }
 }
 
-
 .uif-user-w {
   box-sizing: border-box;
   height: 202px;
@@ -284,9 +276,9 @@ $--header-color: #3d4a57;
   color: #33383d;
   letter-spacing: 0;
   line-height: 22px;
-  opacity: .98;
+  opacity: 0.98;
   background-color: #fff;
-  box-shadow: 0 12px 30px -15px rgba(0, 0, 0, .1);
+  box-shadow: 0 12px 30px -15px rgba(0, 0, 0, 0.1);
   width: calc(100vw - 190px);
   height: 20px;
   position: fixed;
@@ -295,7 +287,9 @@ $--header-color: #3d4a57;
   z-index: 1000;
   max-height: 0;
   min-height: 0;
-  transition: max-height .3s ease, min-height .3s ease;
+  transition:
+    max-height 0.3s ease,
+    min-height 0.3s ease;
   overflow: hidden;
   cursor: pointer;
   display: flex;
@@ -316,7 +310,6 @@ $--header-color: #3d4a57;
     padding-top: 32px;
 
     &_title {
-
       display: inline-block;
       font-weight: 700;
       padding: 4px;
@@ -337,7 +330,6 @@ $--header-color: #3d4a57;
     flex: 0 0 33.33%;
 
     &_title {
-
       display: inline-block;
       padding: 4px;
 
@@ -347,7 +339,6 @@ $--header-color: #3d4a57;
       }
     }
   }
-
 }
 
 .wrapper-mask {
@@ -367,4 +358,4 @@ $--header-color: #3d4a57;
   min-height: 350px;
   overflow-y: auto;
   padding-bottom: 20px;
-}
+}

package/src/assets/css/view-toggle.scss

@@ -34,7 +34,7 @@
 }
 
 .n20-toggle-item.active {
-  color: var(--primary-6, #007aff);
+  color: var(--color-primary);
   font-weight: 500;
 }
 
@@ -51,4 +51,4 @@
   border-radius: 2px;
   transition: transform 0.2s;
   z-index: 0;
-}
+}

package/src/components/FileUploadTable/index.vue

@@ -824,7 +824,15 @@ export default {
           showClose: true
         })
       }
-      this.$emit('delete-rows', this.selectionList)
+      this.$msgboxPor({
+        title: $lc('确认删除所选附件吗？'),
+        message: $lc('删除后数据不可恢复'),
+        type: 'error',
+        confirmButtonText: $lc('确认'),
+        cancelButtonText: $lc('取消')
+      }).then(() => {
+        this.$emit('delete-rows', this.selectionList)
+      }).catch(() => undefined)
     },
 
     async getFileInfo(row, type) {

package/src/components/v3/UploadList/index.vue

@@ -611,9 +611,17 @@ export default {
      * @returns {void}
      */
     deleteSingleRow(row) {
-      const index = this.tableData.findIndex((item) => item === row)
-      if (index > -1) this.tableData.splice(index, 1)
-      this.$emit('delete-rows', [row])
+      this.$msgboxPor({
+        title: $lc('确认删除所选附件吗？'),
+        message: $lc('删除后数据不可恢复'),
+        type: 'error',
+        confirmButtonText: $lc('确认'),
+        cancelButtonText: $lc('取消')
+      }).then(() => {
+        const index = this.tableData.findIndex((item) => item === row)
+        if (index > -1) this.tableData.splice(index, 1)
+        this.$emit('delete-rows', [row])
+      }).catch(() => undefined)
     },
     /**
      * 切换展开/收起未上传类型。

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]