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

DatePicker: update view when setting default value, fixed #1050 (#1097)

pull/1100/head
cinwell.li 2016-11-16 14:48:15 +08:00 committed by 杨奕
parent d54bf670a2
commit af4bca8abe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,8 +145,8 @@
}, },
value(newVal) { value(newVal) {
if (newVal instanceof Date) { newVal = new Date(newVal);
if (!isNaN(newVal)) {
if (typeof this.disabledDate === 'function' && if (typeof this.disabledDate === 'function' &&
this.disabledDate(new Date(newVal))) { this.disabledDate(new Date(newVal))) {
return; return;

2
test/unit/specs/date-picker.spec.js
View File

@ -684,7 +684,7 @@ describe('DatePicker', () => {
vm.picker.value = date; vm.picker.value = date;
setTimeout(_ => { setTimeout(_ => {
expect(vm.picker.date === date).to.true; expect(vm.picker.date.getTime() === date.getTime()).to.true;
done(); done();
}, DELAY); }, DELAY);
}); });