From 5188d56b4aa85743b10ef4feb595295ad5cb9b90 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sat, 18 Sep 2021 18:41:03 +0800
Subject: [PATCH] !321 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格 Merge pull request !321 from 疯狂的狮子Li/N/A
---
ruoyi-ui/src/utils/ruoyi.js | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index c136ed0..5669a43 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -72,8 +72,8 @@
export function selectDictLabel(datas, value) {
var actions = [];
Object.keys(datas).some((key) => {
- if (datas[key].dictValue == ('' + value)) {
- actions.push(datas[key].dictLabel);
+ if (datas[key].value == ('' + value)) {
+ actions.push(datas[key].label);
return true;
}
})
@@ -122,6 +122,22 @@
return str;
}
+// 数据合并
+export function mergeRecursive(source, target) {
+ for (var p in target) {
+ try {
+ if (target[p].constructor == Object) {
+ source[p] = mergeRecursive(source[p], target[p]);
+ } else {
+ source[p] = target[p];
+ }
+ } catch(e) {
+ source[p] = target[p];
+ }
+ }
+ return source;
+};
+
/**
* 构造树型结构数据
* @param {*} data 数据源
--
Gitblit v1.9.2