From bd39b971cf9fbecdc3086f4ef75a37291b98505d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 10 十月 2020 09:19:20 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/utils/ruoyi.js | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 838fc1f..e8243f6 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,12 +54,15 @@
}
// 娣诲姞鏃ユ湡鑼冨洿
-export function addDateRange (params = {}, dateRange) {
- if (dateRange != null && dateRange !== '') {
- params.beginTime = this.dateRange[0]
- params.endTime = this.dateRange[1]
+export function addDateRange(params, dateRange) {
+ var search = params;
+ search.beginTime = "";
+ search.endTime = "";
+ if (null != dateRange && '' != dateRange) {
+ search.beginTime = dateRange[0];
+ search.endTime = dateRange[1];
}
- return params
+ return search;
}
// 鍥炴樉鏁版嵁瀛楀吀
@@ -128,7 +131,7 @@
id = id || 'id'
parentId = parentId || 'parentId'
children = children || 'children'
- rootId = rootId || 0
+ rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
//瀵规簮鏁版嵁娣卞害鍏嬮殕
const cloneData = JSON.parse(JSON.stringify(data))
//寰幆鎵�鏈夐」
--
Gitblit v1.9.3