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

DatePicker: fix dates selection date jump (#10973) 

see issue #10890
pull/10995/head
Jiewei Qian 2018-05-03 12:26:25 +10:00 committed by 杨奕
parent 326c0abb2a
commit 31b65b8e51
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/date-picker/src/panel/date.vue
View File

@ -188,6 +188,7 @@
}, },
value(val) { value(val) {
if (this.selectionMode === 'dates' && this.value) return;
if (isDate(val)) { if (isDate(val)) {
this.date = new Date(val); this.date = new Date(val);
} else { } else {

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

@ -28,6 +28,7 @@ export const toDate = function(date) {
export const isDate = function(date) { export const isDate = function(date) {
if (date === null || date === undefined) return false; if (date === null || date === undefined) return false;
if (isNaN(new Date(date).getTime())) return false; if (isNaN(new Date(date).getTime())) return false;
if (Array.isArray(date)) return false; // deal with `new Date([ new Date() ]) -> new Date()`
return true; return true;
}; };