Merge pull request ElemeFE#2390 from QingWei-Li/fix/datepicker/value

DatePicker: fix null value shows 1970, fixed ElemeFE#2388
et · Jan 13, 2017 · 9898ac4 · 9898ac4
2 parents 123069d + 92d5522
commit 9898ac4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/date-picker/src/util/index.js b/packages/date-picker/src/util/index.js
@@ -17,8 +17,8 @@ export const toDate = function(date) {
 };
 
 export const isDate = function(date) {
-  date = new Date(date);
-  if (isNaN(date.getTime())) return false;
+  if (date === null || date === undefined) return false;
+  if (isNaN(new Date(date).getTime())) return false;
   return true;
 };