From 02f4fdb2e5b68ec97cc1d6ef83d145dc6318f89d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 19 十月 2022 09:16:06 +0800
Subject: [PATCH] !241 【轻量级 PR】修正Excel导出字典值转换方法由于内部调用缓存不生效问题 Merge pull request !241 from MichelleChung/dev
---
ruoyi-ui/src/utils/request.js | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index f880199..2473bc1 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -9,7 +9,7 @@
let downloadLoadingInstance;
// 鏄惁鏄剧ず閲嶆柊鐧诲綍
-let isReloginShow;
+export let isRelogin = { show: false };
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 瀵瑰簲鍥介檯鍖栬祫婧愭枃浠跺悗缂�
@@ -78,23 +78,20 @@
return res.data
}
if (code === 401) {
- if (!isReloginShow) {
- isReloginShow = true;
+ if (!isRelogin.show) {
+ isRelogin.show = true;
MessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', {
confirmButtonText: '閲嶆柊鐧诲綍',
cancelButtonText: '鍙栨秷',
type: 'warning'
}
).then(() => {
- isReloginShow = false;
+ isRelogin.show = false;
store.dispatch('LogOut').then(() => {
- // 濡傛灉鏄櫥褰曢〉闈笉闇�瑕侀噸鏂板姞杞�
- if (window.location.hash.indexOf("#/login") != 0) {
- location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
- }
+ location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
})
}).catch(() => {
- isReloginShow = false;
+ isRelogin.show = false;
});
}
return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�')
@@ -135,12 +132,13 @@
)
// 閫氱敤涓嬭浇鏂规硶
-export function download(url, params, filename) {
+export function download(url, params, filename, config) {
downloadLoadingInstance = Loading.service({ text: "姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��", spinner: "el-icon-loading", 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) {
--
Gitblit v1.9.3