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

[DatePicker]: fix #1506 - allow any visible date to be selected in range picker

pull/1635/head
Aleksey Beskosty 2016-12-07 11:49:23 +03:00 committed by 杨奕
parent 3d12579652
commit ec3bb5d3fe
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,8 +366,6 @@
const newDate = new Date(this.year, this.month, 1); const newDate = new Date(this.year, this.month, 1);
const clickNormalCell = className.indexOf('prev') === -1 && className.indexOf('next') === -1;
if (className.indexOf('prev') !== -1) { if (className.indexOf('prev') !== -1) {
if (month === 0) { if (month === 0) {
year = year - 1; year = year - 1;
@ -390,7 +388,7 @@
newDate.setDate(parseInt(text, 10)); newDate.setDate(parseInt(text, 10));
if (clickNormalCell && this.selectionMode === 'range') { if (this.selectionMode === 'range') {
if (this.minDate && this.maxDate) { if (this.minDate && this.maxDate) {
const minDate = new Date(newDate.getTime()); const minDate = new Date(newDate.getTime());
const maxDate = null; const maxDate = null;
@ -419,9 +417,7 @@
this.rangeState.selecting = true; this.rangeState.selecting = true;
this.markRange(this.minDate); this.markRange(this.minDate);
} }
} } else if (selectionMode === 'day') {
if (selectionMode === 'day') {
this.$emit('pick', newDate); this.$emit('pick', newDate);
} else if (selectionMode === 'week') { } else if (selectionMode === 'week') {
var weekNumber = getWeekNumber(newDate); var weekNumber = getWeekNumber(newDate);