From 51b5d9537c5830c9269cd020a5171ca191d522e3 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 15 十一月 2022 14:24:50 +0800
Subject: [PATCH] 修复回显数据字典数组异常问题
---
src/utils/request.js | 41 +++++++++++------------------------------
src/utils/ruoyi.js | 5 ++++-
2 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 55936f9..001ec11 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -78,37 +78,24 @@
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'
- })
+ 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)
@@ -119,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) + "寮傚父";
}
- ElMessage({
- message: message,
- type: 'error',
- duration: 5 * 1000
- })
+ ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
return Promise.reject(error)
}
)
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 9e276da..3ba2868 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -88,9 +88,12 @@
// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆鏁扮粍锛�
export function selectDictLabels(datas, value, separator) {
- if (value === undefined) {
+ if (value === undefined || value.length ===0) {
return "";
}
+ if (Array.isArray(value)) {
+ value = value.join(",");
+ }
var actions = [];
var currentSeparator = undefined === separator ? "," : separator;
var temp = value.split(currentSeparator);
--
Gitblit v1.9.3