From 26dfee2ce8ac0112d698bffdb66c0e3ca5bf61d1 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期三, 05 八月 2020 10:24:54 +0800
Subject: [PATCH] 彻底重写回显数据字典方法
---
ruoyi-ui/src/utils/ruoyi.js | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 380e3ce..b669fb3 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -17,6 +17,8 @@
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
+ } else if (typeof time === 'string') {
+ time = time.replace(new RegExp(/-/gm), '/');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
@@ -52,27 +54,29 @@
}
// 添加日期范围
-export function addDateRange(params, dateRange) {
- var search = params;
- search.beginTime = "";
- search.endTime = "";
- if (null != dateRange && '' != dateRange) {
- search.beginTime = this.dateRange[0];
- search.endTime = this.dateRange[1];
- }
- return search;
+export function addDateRange (params = {}, dateRange) {
+ if (dateRange != null && dateRange !== '') {
+ params.beginTime = this.dateRange[0]
+ params.endTime = this.dateRange[1]
+ }
+ return params
}
// 回显数据字典
-export function selectDictLabel(datas, value) {
- var actions = [];
- Object.keys(datas).map((key) => {
- if (datas[key].dictValue == ('' + value)) {
- actions.push(datas[key].dictLabel);
- return false;
- }
- })
- 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).filter(item => item);
+ temp.forEach((_, index) => {
+ actions.push(selectDictLabel(datas, temp[index]));
+ })
+ return actions.join(separator);
}
// 通用下载方法
@@ -96,10 +100,10 @@
// 转换字符串，undefined,null等转化为""
export function praseStrEmpty(str) {
- if (!str || str == "undefined" || str == "null") {
- return "";
- }
- return str;
+ if (!str || str == "undefined" || str == "null") {
+ return "";
+ }
+ return str;
}
/**
@@ -110,23 +114,19 @@
* @param {*} children 孩子节点字段 默认 'children'
* @param {*} rootId 根Id 默认 0
*/
-export function handleTree(data, id, parentId, children, rootId) {
- id = id || 'id'
- parentId = parentId || 'parentId'
- children = children || 'children'
- rootId = rootId || 0
+export function handleTree(data = [], id = 'id', parentId = 'parentId', children = 'children', rootId = 0) {
//对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data))
//循环所有项
- const treeData = cloneData.filter(father => {
- let branchArr = cloneData.filter(child => {
- //返回每一项的子级数组
- return father[id] === child[parentId]
- });
- branchArr.length > 0 ? father.children = branchArr : '';
- //返回第一层
- return father[parentId] === rootId;
+ const treeData = cloneData.filter(father => {
+ const branchArr = cloneData.filter(child => {
+ //返回每一项的子级数组
+ return father[id] === child[parentId]
+ });
+ branchArr.length && (father.children = branchArr);
+ //返回第一层
+ return father[parentId] === rootId;
});
- return treeData != '' ? treeData : data;
- }
-
\ No newline at end of file
+ return treeData !== '' ? treeData : data;
+}
+
--
Gitblit v1.9.2