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

DateRange: support reversed selection in range mode (#8156)

pull/10035/head
Jason Zoo 2018-03-06 19:21:56 +08:00 committed by 杨奕
parent 74eaaf7eca
commit 9d6d0d69c1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,9 +331,15 @@
const index = i * 7 + j + (this.showWeekNumber ? -1 : 0);
const time = nextDate(startDate, index - this.offsetDay).getTime();
cell.inRange = minDate && time >= clearHours(minDate) && time <= clearHours(maxDate);
cell.start = minDate && time === clearHours(minDate.getTime());
cell.end = maxDate && time === clearHours(maxDate.getTime());
if (maxDate && maxDate < minDate) {
cell.inRange = minDate && time >= clearHours(maxDate) && time <= clearHours(minDate);
cell.start = maxDate && time === clearHours(maxDate.getTime());
cell.end = minDate && time === clearHours(minDate.getTime());
} else {
cell.inRange = minDate && time >= clearHours(minDate) && time <= clearHours(maxDate);
cell.start = minDate && time === clearHours(minDate.getTime());
cell.end = maxDate && time === clearHours(maxDate.getTime());
}
}
}
},
@ -442,8 +448,9 @@
});
} else {
const minDate = new Date(newDate.getTime());
this.rangeState.selecting = false;
this.$emit('pick', { minDate, maxDate: this.maxDate }, false);
this.$emit('pick', { minDate, maxDate: this.minDate });
}
} else if (!this.minDate) {
const minDate = new Date(newDate.getTime());