From c4ee9ea7c86d870e47c8939f793ec8c3a1bfc032 Mon Sep 17 00:00:00 2001
From: wanglei <cn_wlei@163.com>
Date: 星期五, 07 八月 2020 14:26:30 +0800
Subject: [PATCH] 修复注释错误
---
ruoyi-ui/src/utils/ruoyi.js | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 00dcb47..462dc8f 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -55,11 +55,11 @@
// 娣诲姞鏃ユ湡鑼冨洿
export function addDateRange (params = {}, dateRange) {
- if (dateRange != null && dateRange !== '') {
- params.beginTime = this.dateRange[0]
- params.endTime = this.dateRange[1]
- }
- return params
+ if (dateRange != null && dateRange !== '') {
+ params.beginTime = this.dateRange[0]
+ params.endTime = this.dateRange[1]
+ }
+ return params
}
// 鍥炴樉鏁版嵁瀛楀吀
@@ -75,17 +75,18 @@
}
// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆鏁扮粍锛�
-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)
+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);
}
// 閫氱敤涓嬭浇鏂规硶
@@ -123,19 +124,22 @@
* @param {*} children 瀛╁瓙鑺傜偣瀛楁 榛樿 'children'
* @param {*} rootId 鏍笽d 榛樿 0
*/
-export function handleTree(data = [], id = 'id', parentId = 'parentId', children = 'children', rootId = 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 => {
- const branchArr = cloneData.filter(child => {
+ let branchArr = cloneData.filter(child => {
//杩斿洖姣忎竴椤圭殑瀛愮骇鏁扮粍
return father[id] === child[parentId]
});
- branchArr.length && (father.children = branchArr);
+ branchArr.length > 0 ? father.children = branchArr : '';
//杩斿洖绗竴灞�
return father[parentId] === rootId;
});
- return treeData !== '' ? treeData : data;
+ return treeData != '' ? treeData : data;
}
-
--
Gitblit v1.9.3