Skip to content

Commit 69dd539

Browse files
wacky6jikkai
authored andcommitted
date-picker: fix #11152 (#12114)
1 parent 5c9eb37 commit 69dd539

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

packages/date-picker/src/basic/date-table.vue

-4
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,6 @@
235235
if (newVal && !oldVal) {
236236
this.rangeState.selecting = false;
237237
this.markRange(newVal);
238-
this.$emit('pick', {
239-
minDate: this.minDate,
240-
maxDate: this.maxDate
241-
});
242238
}
243239
}
244240
},

test/unit/specs/date-picker.spec.js

+22
Original file line numberDiff line numberDiff line change
@@ -1923,6 +1923,17 @@ describe('DatePicker', () => {
19231923
const leftCell = pickers[0].querySelector('td.available');
19241924
const rightCell = pickers[1].querySelector('td.available');
19251925

1926+
const {
1927+
minDate,
1928+
maxDate
1929+
} = vm.picker;
1930+
expect(minDate.getHours()).to.be.equal(10);
1931+
expect(minDate.getMinutes()).to.be.equal(10);
1932+
expect(minDate.getSeconds()).to.be.equal(0);
1933+
expect(maxDate.getHours()).to.be.equal(10);
1934+
expect(maxDate.getMinutes()).to.be.equal(10);
1935+
expect(maxDate.getSeconds()).to.be.equal(0);
1936+
19261937
triggerEvent(leftCell, 'mousemove', true);
19271938
setTimeout(_ => {
19281939
triggerEvent(leftCell, 'click', true);
@@ -2024,6 +2035,17 @@ describe('DatePicker', () => {
20242035
const leftCell = pickers[0].querySelector('td.available');
20252036
const rightCell = pickers[1].querySelector('td.available');
20262037

2038+
const {
2039+
minDate,
2040+
maxDate
2041+
} = vm.picker;
2042+
expect(minDate.getHours()).to.be.equal(10);
2043+
expect(minDate.getMinutes()).to.be.equal(10);
2044+
expect(minDate.getSeconds()).to.be.equal(0);
2045+
expect(maxDate.getHours()).to.be.equal(10);
2046+
expect(maxDate.getMinutes()).to.be.equal(10);
2047+
expect(maxDate.getSeconds()).to.be.equal(0);
2048+
20272049
triggerEvent(leftCell, 'mousemove', true);
20282050
setTimeout(_ => {
20292051
triggerEvent(leftCell, 'click', true);

0 commit comments

Comments
 (0)