Procházet zdrojové kódy

优化下载解析blob异常提示

RuoYi před 4 roky
rodič
revize
2a5091c6f4

+ 8 - 1
ruoyi-ui/src/plugins/download.js

@@ -2,6 +2,7 @@ import axios from 'axios'
2 2
 import { Message } from 'element-ui'
3 3
 import { saveAs } from 'file-saver'
4 4
 import { getToken } from '@/utils/auth'
5
+import errorCode from '@/utils/errorCode'
5 6
 import { blobValidate } from "@/utils/ruoyi";
6 7
 
7 8
 const baseURL = process.env.VUE_APP_BASE_API
@@ -20,12 +21,18 @@ export default {
20 21
         const blob = new Blob([res.data], { type: 'application/zip' })
21 22
         this.saveAs(blob, name)
22 23
       } else {
23
-        Message.error('无效的会话,或者会话已过期,请重新登录。');
24
+        this.printErrMsg(res.data);
24 25
       }
25 26
     })
26 27
   },
27 28
   saveAs(text, name, opts) {
28 29
     saveAs(text, name, opts);
30
+  },
31
+  async printErrMsg(data) {
32
+    const resText = await data.text();
33
+    const rspObj = JSON.parse(resText);
34
+    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
35
+    Message.error(errMsg);
29 36
   }
30 37
 }
31 38
 

+ 4 - 1
ruoyi-ui/src/utils/request.js

@@ -108,7 +108,10 @@ export function download(url, params, filename) {
108 108
       const blob = new Blob([data])
109 109
       saveAs(blob, filename)
110 110
     } else {
111
-      Message.error('无效的会话,或者会话已过期,请重新登录。');
111
+      const resText = await data.text();
112
+      const rspObj = JSON.parse(resText);
113
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
114
+      Message.error(errMsg);
112 115
     }
113 116
     downloadLoadingInstance.close();
114 117
   }).catch((r) => {