From 503dd64e3fa83f3615e833a9c679e4519053ff1b Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期二, 04 八月 2020 14:32:29 +0800
Subject: [PATCH] 优化 addDateRange js 函数
---
ruoyi-ui/src/utils/ruoyi.js | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 08fbd9d..00dcb47 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,15 +54,12 @@
}
// 添加日期范围
-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
}
// 回显数据字典
@@ -126,23 +123,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 => {
+ const branchArr = cloneData.filter(child => {
//返回每一项的子级数组
return father[id] === child[parentId]
});
- branchArr.length > 0 ? father.children = branchArr : '';
+ branchArr.length && (father.children = branchArr);
//返回第一层
return father[parentId] === rootId;
});
- return treeData != '' ? treeData : data;
+ return treeData !== '' ? treeData : data;
}
--
Gitblit v1.9.2