From 9f23adbc14e12001c5920e5ec4a71255feb1fe54 Mon Sep 17 00:00:00 2001 From: xbigcat Date: Wed, 23 Jan 2019 13:32:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20parseTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复传入的时间戳是字符串类型，不能转换时间的问题 例：parseTime("1548221490638") --- src/utils/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/utils/index.js b/src/utils/index.js index 0445827b32e..ab240b1ee36 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -11,7 +11,10 @@ export function parseTime(time, cFormat) { if (typeof time === 'object') { date = time } else { - if (('' + time).length === 10) time = parseInt(time) * 1000 + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + if (time.toString().length === 10) time = time * 1000 + } date = new Date(time) } const formatObj = { From 84c65eec6dff43eb41bcc6ced98b3f59f2ed4d7f Mon Sep 17 00:00:00 2001 From: xbigcat Date: Thu, 24 Jan 2019 14:35:53 +0800 Subject: [PATCH 2/2] Update index.js --- src/utils/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/index.js b/src/utils/index.js index ab240b1ee36..821392e9b6d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -13,7 +13,9 @@ export function parseTime(time, cFormat) { } else { if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { time = parseInt(time) - if (time.toString().length === 10) time = time * 1000 + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 } date = new Date(time) }