From 0070297fe11ceb3a013721ae35ffd4ad56ad1065 Mon Sep 17 00:00:00 2001
From: gst <332882090@qq.com>
Date: Tue, 11 Aug 2020 10:59:02 +0800
Subject: [PATCH] 根节点为子部门时，树状结构显示问题
---
ruoyi-ui/src/utils/ruoyi.js | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 23879aa..87ba221 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -1,4 +1,4 @@
-/**
+/**
* 通用js方法封装处理
* Copyright (c) 2019 ruoyi
*/
@@ -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];
+export function addDateRange (params = {}, dateRange) {
+ if (dateRange != null && dateRange !== '') {
+ params.beginTime = this.dateRange[0]
+ params.endTime = this.dateRange[1]
}
- return search;
+ return params
}
// 回显数据字典
@@ -83,8 +80,8 @@
var currentSeparator = undefined === separator ? "," : separator;
var temp = value.split(currentSeparator);
Object.keys(value.split(currentSeparator)).some((val) => {
- Object.keys(datas).some((key) => {
- if (datas[key].dictValue == ('' + temp[val])) {
+ Object.keys(datas).some((key) => {
+ if (datas[key].dictValue == ('' + temp[val])) {
actions.push(datas[key].dictLabel + currentSeparator);
}
})
@@ -131,7 +128,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))
//循环所有项
@@ -146,4 +143,3 @@
});
return treeData != '' ? treeData : data;
}
-
--
Gitblit v1.9.2