!57 若干 ruoyi-ui 前端公共工具函数优化

Merge pull request !57 from FungLeo/master

.gitignore

@@ -37,7 +37,8 @@ nbdist/
 # Others
 *.log
 *.xml.versionsBackup
+*.swp
 
 !*/build/*.java
 !*/build/*.html
-!*/build/*.xml
+!*/build/*.xml

ruoyi-ui/src/utils/ruoyi.js

@@ -54,42 +54,29 @@ export function resetForm(refName) {
 }
 
 // 添加日期范围
-export function addDateRange(params, dateRange) {
+export function addDateRange (params = {}, dateRange) {
-	var search = params;
+  if (dateRange != null && dateRange !== '') {
-	search.beginTime = "";
+    params.beginTime = this.dateRange[0]
-	search.endTime = "";
+    params.endTime = this.dateRange[1]
-	if (null != dateRange && '' != dateRange) {
+  }
-		search.beginTime = this.dateRange[0];
+  return params
-		search.endTime = this.dateRange[1];
-	}
-	return search;
 }
 
 // 回显数据字典
-export function selectDictLabel(datas, value) {
+export function selectDictLabel(datas = [], value = '') {
-	var actions = [];
+  if (!value) return '-';
-	Object.keys(datas).some((key) => {
+  const dataArr = datas.filter(item => item.dictValue === value.toString());
-		if (datas[key].dictValue == ('' + value)) {
+  return dataArr.length ? dataArr[0].dictLabel : 'Error Dict';
-			actions.push(datas[key].dictLabel);
-			return true;
-		}
-	})
-	return actions.join('');
 }
 
 // 回显数据字典（字符串数组）
-export function selectDictLabels(datas, value, separator) {
+export function selectDictLabels(datas = [], value = '', separator = ',') {
-	var actions = [];
+  const actions = [];
-	var currentSeparator = undefined === separator ? "," : separator;
+  const temp = value.split(separator).filter(item => item);
-	var temp = value.split(currentSeparator);
+  temp.forEach((_, index) => {
-	Object.keys(value.split(currentSeparator)).some((val) => {
+    actions.push(selectDictLabel(datas, temp[index]));
-        Object.keys(datas).some((key) => {
+  })
-            if (datas[key].dictValue == ('' + temp[val])) {
+  return actions.join(separator);
-				actions.push(datas[key].dictLabel + currentSeparator);
-			}
-		})
-	})
-	return actions.join('').substring(0, actions.join('').length - 1);
 }
 
 // 通用下载方法
@@ -127,23 +114,19 @@ export function praseStrEmpty(str) {
  * @param {*} children 孩子节点字段 默认 'children'
  * @param {*} rootId 根Id 默认 0
  */
-export function handleTree(data, id, parentId, children, rootId) {
+export function handleTree(data = [], id = 'id', parentId = 'parentId', children = 'children', rootId = 0) {
-	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 => {
+		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;
 }