From 2e99c68ed071171dba9f048363fd873ed268d22e Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 10 四月 2023 17:09:43 +0800
Subject: [PATCH] !695 下拉图标选择组件优化：1.已选择图标高亮回显 2.滚动条采用el-scrollbar Merge pull request !695 from 绿色心情/icon-select
---
ruoyi-ui/src/utils/request.js | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 1080f52..8797e3f 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -72,37 +72,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;
- MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
- type: 'warning'
- }
- ).then(() => {
- isRelogin.show = false;
- store.dispatch('LogOut').then(() => {
- location.href = '/index';
- })
+ MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+ isRelogin.show = false;
+ store.dispatch('LogOut').then(() => {
+ location.href = '/index';
+ })
}).catch(() => {
isRelogin.show = false;
});
}
return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) {
- Message({
- message: msg,
- type: 'error'
- })
+ Message({ message: msg, type: 'error' })
return Promise.reject(new Error(msg))
+ } else if (code === 601) {
+ Message({ message: msg, type: 'warning' })
+ return Promise.reject('error')
} else if (code !== 200) {
- Notification.error({
- title: msg
- })
+ Notification.error({ title: msg })
return Promise.reject('error')
} else {
return res.data
@@ -113,18 +106,12 @@
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) + "异常";
}
- Message({
- message: message,
- type: 'error',
- duration: 5 * 1000
- })
+ Message({ message: message, type: 'error', duration: 5 * 1000 })
return Promise.reject(error)
}
)
@@ -138,8 +125,8 @@
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.2