From 107672419e484d7893ecf624d4af2101cc72d890 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: Tue, 04 Aug 2020 11:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
ruoyi-ui/src/utils/ruoyi.js | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 23879aa..08fbd9d 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -78,18 +78,17 @@
}
// 回显数据字典（字符串数组）
-export function selectDictLabels(datas, value, separator) {
- var actions = [];
- var currentSeparator = undefined === separator ? "," : separator;
- var temp = value.split(currentSeparator);
- Object.keys(value.split(currentSeparator)).some((val) => {
- Object.keys(datas).some((key) => {
- if (datas[key].dictValue == ('' + temp[val])) {
- actions.push(datas[key].dictLabel + currentSeparator);
- }
- })
- })
- return actions.join('').substring(0, actions.join('').length - 1);
+export function selectDictLabels (datas = {}, value = '', separator = ',') {
+ const actions = []
+ const temp = value.split(separator)
+ temp.forEach((_, index) => {
+ Object.keys(datas).forEach(key => {
+ if (datas[key].dictValue === temp[index].toString()) {
+ actions.push(datas[key].dictLabel)
+ }
+ })
+ })
+ return actions.join(separator)
}
// 通用下载方法
--
Gitblit v1.9.2