Fixed wux-weapp#304

wangxiaobo87 · Aug 29, 2019 · a00bf1e · a00bf1e
1 parent cadc163
commit a00bf1e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/example/dist/date-picker-view/index.js b/example/dist/date-picker-view/index.js
@@ -38,7 +38,16 @@ function setMonth(date, month) {
 }
 
 function valueToDate(value, props = {}) {
-    if (!Array.isArray(value)) return new Date(value)
+    if (!Array.isArray(value)) {
+        if (typeof value === 'string') {
+            value = value.replace(/\-/g, '/')
+        }
+        if (!isNaN(Number(value))) {
+            value = Number(value)
+        }
+        return new Date(value)
+    }
+
     const { mode, use12Hours } = props
     const now = new Date()
     const year = now.getFullYear()

diff --git a/example/pages/date-picker-view/index.js b/example/pages/date-picker-view/index.js
@@ -1,10 +1,10 @@
 function getDateString(date = new Date) {
     return {
-        year: date.getFullYear(),
-        month: date.getMonth(),
-        day: date.getDate(),
-        hour: date.getHours(),
-        minute: date.getMinutes(),
+        year: date.getFullYear() + '',
+        month: date.getMonth() + '',
+        day: date.getDate() + '',
+        hour: date.getHours() + '',
+        minute: date.getMinutes() + '',
     }
 }
 

diff --git a/src/date-picker-view/index.js b/src/date-picker-view/index.js
@@ -38,7 +38,16 @@ function setMonth(date, month) {
 }
 
 function valueToDate(value, props = {}) {
-    if (!Array.isArray(value)) return new Date(value)
+    if (!Array.isArray(value)) {
+        if (typeof value === 'string') {
+            value = value.replace(/\-/g, '/')
+        }
+        if (!isNaN(Number(value))) {
+            value = Number(value)
+        }
+        return new Date(value)
+    }
+
     const { mode, use12Hours } = props
     const now = new Date()
     const year = now.getFullYear()