github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

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

DatePicker: fix null value shows 1970, fixed #2388
pull/2395/head
baiyaaaaa 2017-01-13 14:57:44 +08:00 committed by GitHub
parent 123069ddd5 92d5522c37
commit 9898ac49e1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/date-picker/src/util/index.js
View File

@ -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;
};