mirror of https://github.com/ElemeFE/element
DatePicker: fix date not disabled when type=datetime and input by text
parent
fff57cdfcc
commit
46650289b7
|
@ -407,13 +407,17 @@
|
||||||
|
|
||||||
set(val) {
|
set(val) {
|
||||||
const date = parseDate(val, 'yyyy-MM-dd');
|
const date = parseDate(val, 'yyyy-MM-dd');
|
||||||
if (date) {
|
if (!date) {
|
||||||
date.setHours(this.date.getHours());
|
return;
|
||||||
date.setMinutes(this.date.getMinutes());
|
|
||||||
date.setSeconds(this.date.getSeconds());
|
|
||||||
this.date = date;
|
|
||||||
this.resetView();
|
|
||||||
}
|
}
|
||||||
|
if (typeof this.disabledDate === 'function' && this.disabledDate(date)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
date.setHours(this.date.getHours());
|
||||||
|
date.setMinutes(this.date.getMinutes());
|
||||||
|
date.setSeconds(this.date.getSeconds());
|
||||||
|
this.date = date;
|
||||||
|
this.resetView();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue