fix:fixed parseTime bug in ie and safari

776f10e197
2020-06-04 21:19:22 +08:00
parent 4502d3ebc7
commit 97290e6f49
2 changed files with 13 additions and 2 deletions
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -17,9 +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)
+    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
    }