From 81fefb313d0ad154dbfe8d0a0375dc5023214c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E5=98=89=E6=99=A8?= <panjiachen@bytedance.com>
Date: Fri, 20 Mar 2020 19:49:04 +0800
Subject: [PATCH] perf: refine

---
 src/utils/index.js                 | 14 ++++++++++----
 tests/unit/utils/parseTime.spec.js |  5 +++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index b50e3bd0..eb760d5e 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -17,11 +17,17 @@ export function parseTime(time, cFormat) {
   if (typeof time === 'object') {
     date = time
   } 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 === 'string')) {
+      if ((/^[0-9]+$/.test(time))) {
+        // support "1548221490638"
+        time = parseInt(time)
+      } else {
+        // support safari
+        // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
+        time = time.replace(new RegExp(/-/gm), '/')
+      }
     }
+
     if ((typeof time === 'number') && (time.toString().length === 10)) {
       time = time * 1000
     }
diff --git a/tests/unit/utils/parseTime.spec.js b/tests/unit/utils/parseTime.spec.js
index 77ecb9d5..bc61d1ac 100644
--- a/tests/unit/utils/parseTime.spec.js
+++ b/tests/unit/utils/parseTime.spec.js
@@ -4,6 +4,11 @@ describe('Utils:parseTime', () => {
   it('timestamp', () => {
     expect(parseTime(d)).toBe('2018-07-13 17:54:01')
   })
+
+  it('timestamp string', () => {
+    expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01')
+  })
+
   it('ten digits timestamp', () => {
     expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01')
   })