From 876ecf21c713ce333e676f9b81c57de4ecc983d3 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期二, 04 八月 2020 14:11:02 +0800
Subject: [PATCH] 优化构建树形数据JS方法

---
 ruoyi-ui/src/utils/ruoyi.js |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 23879aa..7561353 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -78,18 +78,17 @@
 }
 
 // 回显数据字典(字符串数组)
-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);
+export function selectDictLabels (datas = {}, value = '', separator = ',') {
+  const actions = []
+  const temp = value.split(separator)
+  temp.forEach((_, index) => {
+    Object.keys(datas).forEach(key => {
+      if (datas[key].dictValue === temp[index].toString()) {
+        actions.push(datas[key].dictLabel)
+      }
+    })
+  })
+  return actions.join(separator)
 }
 
 // 通用下载方法
@@ -127,23 +126,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