From 503dd64e3fa83f3615e833a9c679e4519053ff1b Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期二, 04 八月 2020 14:32:29 +0800
Subject: [PATCH] 优化 addDateRange js 函数
---
ruoyi-ui/src/utils/ruoyi.js | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index decad41..00dcb47 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];
- }
- return search;
+export function addDateRange (params = {}, dateRange) {
+ if (dateRange != null && dateRange !== '') {
+ params.beginTime = this.dateRange[0]
+ params.endTime = this.dateRange[1]
+ }
+ return params
}
// 鍥炴樉鏁版嵁瀛楀吀
@@ -75,6 +72,20 @@
}
})
return actions.join('');
+}
+
+// 鍥炴樉鏁版嵁瀛楀吀锛堝瓧绗︿覆鏁扮粍锛�
+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)
}
// 閫氱敤涓嬭浇鏂规硶
@@ -98,10 +109,10 @@
// 杞崲瀛楃涓诧紝undefined,null绛夎浆鍖栦负""
export function praseStrEmpty(str) {
- if (!str || str == "undefined" || str == "null") {
- return "";
- }
- return str;
+ if (!str || str == "undefined" || str == "null") {
+ return "";
+ }
+ return str;
}
/**
@@ -112,23 +123,19 @@
* @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
+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 => {
- //杩斿洖姣忎竴椤圭殑瀛愮骇鏁扮粍
- return father[id] === child[parentId]
- });
- branchArr.length > 0 ? father.children = branchArr : '';
- //杩斿洖绗竴灞�
- return father[parentId] === rootId;
+ const treeData = cloneData.filter(father => {
+ const branchArr = cloneData.filter(child => {
+ //杩斿洖姣忎竴椤圭殑瀛愮骇鏁扮粍
+ return father[id] === child[parentId]
+ });
+ branchArr.length && (father.children = branchArr);
+ //杩斿洖绗竴灞�
+ return father[parentId] === rootId;
});
- return treeData != '' ? treeData : data;
- }
-
+ return treeData !== '' ? treeData : data;
+}
+
--
Gitblit v1.9.3