From 3e1bd8e3bc6c94ed5fc39ee7955a1aef97c68d97 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: Tue, 21 Jul 2020 10:18:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20utils/index.js=20?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E5=8C=85=E5=90=AB=20parseTime=20=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/utils/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js
index 49897c99..2893bc83 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 camelCase(str) {
 export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
- 
\ No newline at end of file
+ 

From a09a342f58c282a89df6b5bc274cf8f37f8bf6f3 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: Tue, 21 Jul 2020 10:22:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20uitls/ruoyi.js=20?=
 =?UTF-8?q?=E4=B8=AD=20selectDictLabel=20=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E8=BF=AD=E4=BB=A3=E5=99=A8=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=20some=20=E6=8F=90=E9=AB=98=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/utils/ruoyi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index dc18b912..decad410 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -68,10 +68,10 @@ export function addDateRange(params, dateRange) {
 // 回显数据字典
 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 @@ export function handleTree(data, id, parentId, children, rootId) {
 	});
 	return treeData != '' ? treeData : data;
   }
-  
\ No newline at end of file
+