From a78211ca00d0261349cd4e761e4ddb70aadd6469 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 10 Aug 2020 12:20:52 +0800
Subject: [PATCH] 优化上级菜单不能选择自己
---
ruoyi-ui/src/utils/ruoyi.js | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 08fbd9d..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);
}
// 通用下载方法
@@ -145,4 +143,3 @@
});
return treeData != '' ? treeData : data;
}
-
--
Gitblit v1.9.2