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

date-picker: fix #11152 (#12114)

pull/12110/merge
Jiewei Qian 2018-07-25 15:07:46 +10:00 committed by Jikkai Xiao
parent 5c9eb37549
commit 69dd5399aa
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/date-picker/src/basic/date-table.vue
View File

@ -235,10 +235,6 @@
if (newVal && !oldVal) { if (newVal && !oldVal) {
this.rangeState.selecting = false; this.rangeState.selecting = false;
this.markRange(newVal); this.markRange(newVal);
this.$emit('pick', {
minDate: this.minDate,
maxDate: this.maxDate
});
} }
} }
}, },

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

@ -1923,6 +1923,17 @@ describe('DatePicker', () => {
const leftCell = pickers[0].querySelector('td.available'); const leftCell = pickers[0].querySelector('td.available');
const rightCell = pickers[1].querySelector('td.available'); const rightCell = pickers[1].querySelector('td.available');
const {
minDate,
maxDate
} = vm.picker;
expect(minDate.getHours()).to.be.equal(10);
expect(minDate.getMinutes()).to.be.equal(10);
expect(minDate.getSeconds()).to.be.equal(0);
expect(maxDate.getHours()).to.be.equal(10);
expect(maxDate.getMinutes()).to.be.equal(10);
expect(maxDate.getSeconds()).to.be.equal(0);
triggerEvent(leftCell, 'mousemove', true); triggerEvent(leftCell, 'mousemove', true);
setTimeout(_ => { setTimeout(_ => {
triggerEvent(leftCell, 'click', true); triggerEvent(leftCell, 'click', true);
@ -2024,6 +2035,17 @@ describe('DatePicker', () => {
const leftCell = pickers[0].querySelector('td.available'); const leftCell = pickers[0].querySelector('td.available');
const rightCell = pickers[1].querySelector('td.available'); const rightCell = pickers[1].querySelector('td.available');
const {
minDate,
maxDate
} = vm.picker;
expect(minDate.getHours()).to.be.equal(10);
expect(minDate.getMinutes()).to.be.equal(10);
expect(minDate.getSeconds()).to.be.equal(0);
expect(maxDate.getHours()).to.be.equal(10);
expect(maxDate.getMinutes()).to.be.equal(10);
expect(maxDate.getSeconds()).to.be.equal(0);
triggerEvent(leftCell, 'mousemove', true); triggerEvent(leftCell, 'mousemove', true);
setTimeout(_ => { setTimeout(_ => {
triggerEvent(leftCell, 'click', true); triggerEvent(leftCell, 'click', true);