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/ruoyi.js | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 5d46531..3ba2868 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -68,8 +68,11 @@
return search;
}
-// 鍥炴樉鏁版嵁瀛楀吀
+// 鍥炴樉鏁版嵁瀛楀吀
export function selectDictLabel(datas, value) {
+ if (value === undefined) {
+ return "";
+ }
var actions = [];
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + value)) {
@@ -77,23 +80,34 @@
return true;
}
})
+ if (actions.length === 0) {
+ actions.push(value);
+ }
return actions.join('');
}
// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆鏁扮粍锛�
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);
Object.keys(value.split(currentSeparator)).some((val) => {
+ var match = false;
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + temp[val])) {
actions.push(datas[key].label + currentSeparator);
+ match = true;
}
})
+ if (!match) {
+ actions.push(temp[val] + currentSeparator);
+ }
})
return actions.join('').substring(0, actions.join('').length - 1);
}
@@ -196,10 +210,10 @@
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
- if (value !== null && typeof (value) !== "undefined") {
+ if (value !== null && value !== "" && typeof (value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
- if (value[key] !== null && typeof (value[key]) !== 'undefined') {
+ if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
let params = propName + '[' + key + ']';
var subPart = encodeURIComponent(params) + "=";
result += subPart + encodeURIComponent(value[key]) + "&";
--
Gitblit v1.9.3