From 8b5acaf341fc6dafc3e0a85ecdbcc00a972ebff6 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 12 Jan 2023 11:44:49 +0800
Subject: [PATCH] 升级spring-cloud相关组件到最新版
---
ruoyi-ui/src/utils/ruoyi.js | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index e001def..243c4c7 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -1,4 +1,4 @@
-
+
/**
* 通用js方法封装处理
@@ -68,7 +68,7 @@
return search;
}
-// 回显数据字典
+// 回显数据字典
export function selectDictLabel(datas, value) {
if (value === undefined) {
return "";
@@ -86,10 +86,13 @@
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;
@@ -207,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]) + "&";
@@ -233,4 +236,4 @@
} catch (error) {
return true;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3