From a9f4a4e11136334b7828cb98a0cd2066bb0f74d4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 07 八月 2020 09:22:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

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

diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 71fc8da..838fc1f 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -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,8 +110,36 @@
 
 // 杞崲瀛楃涓诧紝undefined,null绛夎浆鍖栦负""
 export function praseStrEmpty(str) {
-    if (!str || str == "undefined" || str == "null") {
-        return "";
-    }
-    return str;
-}
\ No newline at end of file
+	if (!str || str == "undefined" || str == "null") {
+		return "";
+	}
+	return str;
+}
+
+/**
+ * 鏋勯�犳爲鍨嬬粨鏋勬暟鎹�
+ * @param {*} data 鏁版嵁婧�
+ * @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 || 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;
+}

--
Gitblit v1.9.3