From a5c170fa2abfbd308a2e98afae90f60cd44276e4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 08 二月 2020 17:05:46 +0800
Subject: [PATCH] 修改同一页面el-upload和Editor时不显示问题。

---
 ruoyi-ui/src/utils/ruoyi.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 602fdd6..069a1ae 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -7,7 +7,7 @@
 
 // 日期格式化
 export function parseTime(time, pattern) {
-	if (arguments.length === 0) {
+	if (arguments.length === 0 || !time) {
 		return null
 	}
 	const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'

--
Gitblit v1.9.2