From 26dfee2ce8ac0112d698bffdb66c0e3ca5bf61d1 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期三, 05 八月 2020 10:24:54 +0800
Subject: [PATCH] 彻底重写回显数据字典方法
---
.gitignore | 3 ++-
ruoyi-ui/src/utils/ruoyi.js | 27 +++++++++------------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4916f7a..a58be01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,8 @@
# Others
*.log
*.xml.versionsBackup
+*.swp
!*/build/*.java
!*/build/*.html
-!*/build/*.xml
\ No newline at end of file
+!*/build/*.xml
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 00dcb47..b669fb3 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -63,29 +63,20 @@
}
// 鍥炴樉鏁版嵁瀛楀吀
-export function selectDictLabel(datas, value) {
- var actions = [];
- Object.keys(datas).some((key) => {
- if (datas[key].dictValue == ('' + value)) {
- actions.push(datas[key].dictLabel);
- return true;
- }
- })
- return actions.join('');
+export function selectDictLabel(datas = [], value = '') {
+ if (!value) return '-';
+ const dataArr = datas.filter(item => item.dictValue === value.toString());
+ return dataArr.length ? dataArr[0].dictLabel : 'Error Dict';
}
// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆鏁扮粍锛�
-export function selectDictLabels (datas = {}, value = '', separator = ',') {
- const actions = []
- const temp = value.split(separator)
+export function selectDictLabels(datas = [], value = '', separator = ',') {
+ const actions = [];
+ const temp = value.split(separator).filter(item => item);
temp.forEach((_, index) => {
- Object.keys(datas).forEach(key => {
- if (datas[key].dictValue === temp[index].toString()) {
- actions.push(datas[key].dictLabel)
- }
- })
+ actions.push(selectDictLabel(datas, temp[index]));
})
- return actions.join(separator)
+ return actions.join(separator);
}
// 閫氱敤涓嬭浇鏂规硶
--
Gitblit v1.9.3