From cb80de3742d66cfee20bc3136c735e5ca5a7d45c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 29 十一月 2023 12:44:42 +0800
Subject: [PATCH] 优化字典标签支持自定义分隔符
---
src/utils/request.js | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 79c720c..ce6382b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -42,6 +42,12 @@
data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
time: new Date().getTime()
}
+ const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 璇锋眰鏁版嵁澶у皬
+ const limitSize = 5 * 1024 * 1024; // 闄愬埗瀛樻斁鏁版嵁5M
+ if (requestSize >= limitSize) {
+ console.warn(`[${config.url}]: ` + '璇锋眰鏁版嵁澶у皬瓒呭嚭鍏佽鐨�5M闄愬埗锛屾棤娉曡繘琛岄槻閲嶅鎻愪氦楠岃瘉銆�')
+ return config;
+ }
const sessionObj = cache.session.getJSON('sessionObj')
if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
cache.session.setJSON('sessionObj', requestObj)
@@ -72,37 +78,30 @@
// 鑾峰彇閿欒淇℃伅
const msg = errorCode[code] || res.data.msg || errorCode['default']
// 浜岃繘鍒舵暟鎹垯鐩存帴杩斿洖
- if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){
+ if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
return res.data
}
if (code === 401) {
if (!isRelogin.show) {
isRelogin.show = true;
- ElMessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', {
- confirmButtonText: '閲嶆柊鐧诲綍',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }
- ).then(() => {
- isRelogin.show = false;
- useUserStore().logOut().then(() => {
- location.href = '/index';
- })
+ ElMessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', { confirmButtonText: '閲嶆柊鐧诲綍', cancelButtonText: '鍙栨秷', type: 'warning' }).then(() => {
+ isRelogin.show = false;
+ useUserStore().logOut().then(() => {
+ location.href = '/index';
+ })
}).catch(() => {
isRelogin.show = false;
});
}
return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�')
} else if (code === 500) {
- ElMessage({
- message: msg,
- type: 'error'
- })
+ ElMessage({ message: msg, type: 'error' })
+ return Promise.reject(new Error(msg))
+ } else if (code === 601) {
+ ElMessage({ message: msg, type: 'warning' })
return Promise.reject(new Error(msg))
} else if (code !== 200) {
- ElNotification.error({
- title: msg
- })
+ ElNotification.error({ title: msg })
return Promise.reject('error')
} else {
return Promise.resolve(res.data)
@@ -113,32 +112,27 @@
let { message } = error;
if (message == "Network Error") {
message = "鍚庣鎺ュ彛杩炴帴寮傚父";
- }
- else if (message.includes("timeout")) {
+ } else if (message.includes("timeout")) {
message = "绯荤粺鎺ュ彛璇锋眰瓒呮椂";
- }
- else if (message.includes("Request failed with status code")) {
+ } else if (message.includes("Request failed with status code")) {
message = "绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父";
}
- ElMessage({
- message: message,
- type: 'error',
- duration: 5 * 1000
- })
+ ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
return Promise.reject(error)
}
)
// 閫氱敤涓嬭浇鏂规硶
-export function download(url, params, filename) {
+export function download(url, params, filename, config) {
downloadLoadingInstance = ElLoading.service({ text: "姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��", background: "rgba(0, 0, 0, 0.7)", })
return service.post(url, params, {
transformRequest: [(params) => { return tansParams(params) }],
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- responseType: 'blob'
+ responseType: 'blob',
+ ...config
}).then(async (data) => {
- const isLogin = await blobValidate(data);
- if (isLogin) {
+ const isBlob = blobValidate(data);
+ if (isBlob) {
const blob = new Blob([data])
saveAs(blob, filename)
} else {
--
Gitblit v1.9.3