From 133a10ecf2ac2082ce68f1f9799a05937c7df9b7 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 22 七月 2020 13:00:51 +0800
Subject: [PATCH] !47 修复和优化前端 utils 工具函数 Merge pull request !47 from FungLeo/master
---
ruoyi-ui/src/utils/index.js | 4 +++-
ruoyi-ui/src/utils/ruoyi.js | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js
index 49897c9..2893bc8 100644
--- a/ruoyi-ui/src/utils/index.js
+++ b/ruoyi-ui/src/utils/index.js
@@ -1,3 +1,5 @@
+import { parseTime } from './ruoyi'
+
/**
* 琛ㄦ牸鏃堕棿鏍煎紡鍖�
*/
@@ -385,4 +387,4 @@
export function isNumberStr(str) {
return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
}
-
\ No newline at end of file
+
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index dc18b91..decad41 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -68,10 +68,10 @@
// 鍥炴樉鏁版嵁瀛楀吀
export function selectDictLabel(datas, value) {
var actions = [];
- Object.keys(datas).map((key) => {
+ Object.keys(datas).some((key) => {
if (datas[key].dictValue == ('' + value)) {
actions.push(datas[key].dictLabel);
- return false;
+ return true;
}
})
return actions.join('');
@@ -131,4 +131,4 @@
});
return treeData != '' ? treeData : data;
}
-
\ No newline at end of file
+
--
Gitblit v1.9.3