n20-common-lib 2.20.8 → 2.20.10

package/package.json

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

package/src/assets/css/normalize.scss

@@ -3,8 +3,6 @@
 // .button-4em{min-width: 72px;}
 /* 格式化样式 */
 
-
-
 html {
   height: 100%;
 }
@@ -12,7 +10,7 @@ html {
 body {
   height: 100%;
   font-size: $--font-size-base;
-  font-family: PingFang SC, Microsoft YaHei, SUN, Arial, sans-serif;
+  font-family: PingFang SC, Microsoft YaHei, SUN, Arial, sans-serif !important;
 }
 
 li {
@@ -263,7 +261,7 @@ iframe {
 .b-center {
   text-align: center;
 
-  &>* {
+  & > * {
     display: inline-block;
     vertical-align: bottom;
   }
@@ -272,7 +270,7 @@ iframe {
 .b-vertical {
   font-size: 0;
 
-  &>* {
+  & > * {
     vertical-align: middle;
     display: inline-block;
     font-size: 14px;
@@ -335,13 +333,11 @@ iframe {
   flex-direction: column;
 }
 
-.flex-box>*,
-.flex-column>* {
+.flex-box > *,
+.flex-column > * {
   flex: none;
 }
 
-
-
 .flex {
   &-wrap {
     flex-wrap: wrap;
@@ -394,12 +390,6 @@ iframe {
   }
 }
 
-
-
-
-
-
-
 /* 旋转图标90度
 -------------- */
 .rotate90 {
@@ -486,7 +476,6 @@ iframe {
 /* 边框
 -------------- */
 .bd {
-
   &-none,
   &-0 {
     border: none !important;
@@ -835,7 +824,6 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
 }
 
 @keyframes ping {
-
   75%,
   100% {
     transform: scale(2);
@@ -844,7 +832,6 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
 }
 
 @keyframes pulse {
-
   0%,
   100% {
     opacity: 1;
@@ -856,7 +843,6 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
 }
 
 @keyframes bounce {
-
   0%,
   100% {
     transform: translateY(-25%);
@@ -867,4 +853,4 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
     transform: translateY(0);
     animation-timing-function: cubic-bezier(0, 0, 0.2, 1);
   }
-}
+}

package/src/utils/axios.js

@@ -123,12 +123,33 @@ function errorFn(status, msg, noMsg, isErr, res) {
 
 axios.interceptors.response.use(
   (res) => {
+    res.status = 906
+    console.log(res, 'res')
     let status = (res.data && res.data.code) || res.status
     if (Number(status) === 200) {
       return res
     } else {
       let msg = (res.data && (res.data.msg || res.data.message)) || ''
       let noMsg = res.config && res.config.noMsg
+      // 如果是 blob 类型，需要读取错误信息
+      if (res.config.responseType === 'blob') {
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = (e) => {
+            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 })
+            } catch (error) {
+              // 如果解析失败，说明可能是正常的文件下载
+              resolve(res)
+            }
+          }
+          reader.readAsText(res.data)
+        })
+      }
 
       return errorFn(status, msg, noMsg, false, res)
     }
@@ -137,6 +158,24 @@ axios.interceptors.response.use(
     let status = err.status
     let msg = err.message || ''
     let noMsg = err.config && err.config.noMsg
+    // 如果是 blob 类型的错误响应
+    if (err.config && err.config.responseType === 'blob') {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.onload = (e) => {
+          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 })
+          } catch (error) {
+            errorFn(status, msg, noMsg, true)
+            reject(err)
+          }
+        }
+        reader.readAsText(err.response.data)
+      })
+    }
 
     return errorFn(status, msg, noMsg, true)
   }