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/ruoyi.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 380e3ce..decad41 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -17,6 +17,8 @@
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
+ } else if (typeof time === 'string') {
+ time = time.replace(new RegExp(/-/gm), '/');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
@@ -66,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('');
@@ -129,4 +131,4 @@
});
return treeData != '' ? treeData : data;
}
-
\ No newline at end of file
+
--
Gitblit v1.9.2