From 0070297fe11ceb3a013721ae35ffd4ad56ad1065 Mon Sep 17 00:00:00 2001
From: gst <332882090@qq.com>
Date: 星期二, 11 八月 2020 10:59:02 +0800
Subject: [PATCH] 根节点为子部门时，树状结构显示问题
---
ruoyi-ui/src/utils/ruoyi.js | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 380e3ce..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
*/
@@ -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,39 @@
}
// 添加日期范围
-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
}
// 回显数据字典
export function selectDictLabel(datas, value) {
var actions = [];
- Object.keys(datas).map((key) => {
+ Object.keys(datas).some((key) => {
if (datas[key].dictValue == ('' + value)) {
actions.push(datas[key].dictLabel);
- return false;
+ return true;
}
})
return actions.join('');
+}
+
+// 回显数据字典（字符串数组）
+export function selectDictLabels(datas, value, separator) {
+ var actions = [];
+ 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])) {
+ actions.push(datas[key].dictLabel + currentSeparator);
+ }
+ })
+ })
+ return actions.join('').substring(0, actions.join('').length - 1);
}
// 通用下载方法
@@ -96,10 +110,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;
}
/**
@@ -114,19 +128,18 @@
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))
//循环所有项
- 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 => {
+ let branchArr = cloneData.filter(child => {
+ //返回每一项的子级数组
+ return father[id] === child[parentId]
+ });
+ branchArr.length > 0 ? father.children = branchArr : '';
+ //返回第一层
+ return father[parentId] === rootId;
});
return treeData != '' ? treeData : data;
- }
-
\ No newline at end of file
+}
--
Gitblit v1.9.2