From 74f52677be7718d63eef89e01c367058a2e43e57 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 10 八月 2020 10:12:39 +0800
Subject: [PATCH] 表格右侧工具栏组件
---
ruoyi-ui/src/utils/ruoyi.js | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 7561353..462dc8f 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,15 +54,12 @@
}
// 娣诲姞鏃ユ湡鑼冨洿
-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
}
// 鍥炴樉鏁版嵁瀛楀吀
@@ -78,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);
}
// 閫氱敤涓嬭浇鏂规硶
@@ -126,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