From 2c2dad24d59b37df254d1c003d6c3e1119b51d6c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 11 八月 2021 14:28:05 +0800
Subject: [PATCH] update 更新 阿里云 maven源 新地址
---
ruoyi-ui/src/utils/ruoyi.js | 80 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 29 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index e7f4180..fbe20fc 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,13 +54,17 @@
}
// 娣诲姞鏃ユ湡鑼冨洿
-export function addDateRange(params, dateRange) {
+export function addDateRange(params, dateRange, propName) {
var search = params;
- search.beginTime = "";
- search.endTime = "";
+ search.params = {};
if (null != dateRange && '' != dateRange) {
- search.beginTime = this.dateRange[0];
- search.endTime = this.dateRange[1];
+ if (typeof (propName) === "undefined") {
+ search.params["beginTime"] = dateRange[0];
+ search.params["endTime"] = dateRange[1];
+ } else {
+ search.params["begin" + propName] = dateRange[0];
+ search.params["end" + propName] = dateRange[1];
+ }
}
return search;
}
@@ -92,11 +96,6 @@
return actions.join('').substring(0, actions.join('').length - 1);
}
-// 閫氱敤涓嬭浇鏂规硶
-export function download(fileName) {
- window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
-}
-
// 瀛楃涓叉牸寮忓寲(%s )
export function sprintf(str) {
var args = arguments, flag = true, i = 1;
@@ -125,24 +124,47 @@
* @param {*} id id瀛楁 榛樿 'id'
* @param {*} parentId 鐖惰妭鐐瑰瓧娈� 榛樿 'parentId'
* @param {*} children 瀛╁瓙鑺傜偣瀛楁 榛樿 'children'
- * @param {*} rootId 鏍笽d 榛樿 0
*/
-export function handleTree(data, id, parentId, children, rootId) {
- id = id || 'id'
- parentId = parentId || 'parentId'
- children = children || 'children'
- rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 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;
- });
- return treeData != '' ? treeData : data;
+export function handleTree(data, id, parentId, children) {
+ let config = {
+ id: id || 'id',
+ parentId: parentId || 'parentId',
+ childrenList: children || 'children'
+ };
+
+ var childrenListMap = {};
+ var nodeIds = {};
+ var tree = [];
+
+ for (let d of data) {
+ let parentId = d[config.parentId];
+ if (childrenListMap[parentId] == null) {
+ childrenListMap[parentId] = [];
+ }
+ nodeIds[d[config.id]] = d;
+ childrenListMap[parentId].push(d);
+ }
+
+ for (let d of data) {
+ let parentId = d[config.parentId];
+ if (nodeIds[parentId] == null) {
+ tree.push(d);
+ }
+ }
+
+ for (let t of tree) {
+ adaptToChildrenList(t);
+ }
+
+ function adaptToChildrenList(o) {
+ if (childrenListMap[o[config.id]] !== null) {
+ o[config.childrenList] = childrenListMap[o[config.id]];
+ }
+ if (o[config.childrenList]) {
+ for (let c of o[config.childrenList]) {
+ adaptToChildrenList(c);
+ }
+ }
+ }
+ return tree;
}
--
Gitblit v1.9.3