drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hide ranges in month and year tables

Browse source
This commit is contained in:
Sergio Crisostomo 2018-02-08 11:46:10 +01:00
parent a781ad1a11
commit e8a990f54f
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/date-picker/base/month-table.vue
View file

@ -12,7 +12,7 @@
</div> </div>
</template> </template>
<script> <script>
import { clearHours, isInRange } from '../util'; import { clearHours } from '../util';
import { deepCopy } from '../../../utils/assist'; import { deepCopy } from '../../../utils/assist';
import Locale from '../../../mixins/locale'; import Locale from '../../../mixins/locale';
import mixin from './mixin'; import mixin from './mixin';
@ -37,8 +37,6 @@
}; };
const tableYear = this.tableDate.getFullYear(); const tableYear = this.tableDate.getFullYear();
const rangeStart = this.rangeState.from && clearHours(new Date(this.rangeState.from.getFullYear(), this.rangeState.from.getMonth(), 1));
const rangeEnd = this.rangeState.to && clearHours(new Date(this.rangeState.to.getFullYear(), this.rangeState.to.getMonth(), 1));
const selectedDays = this.dates.filter(Boolean).map(date => clearHours(new Date(date.getFullYear(), date.getMonth(), 1))); const selectedDays = this.dates.filter(Boolean).map(date => clearHours(new Date(date.getFullYear(), date.getMonth(), 1)));
for (let i = 0; i < 12; i++) { for (let i = 0; i < 12; i++) {
@ -46,7 +44,6 @@
cell.date = new Date(tableYear, i, 1); cell.date = new Date(tableYear, i, 1);
cell.text = this.tCell(i + 1); cell.text = this.tCell(i + 1);
const time = clearHours(cell.date); const time = clearHours(cell.date);
cell.range = isInRange(time, rangeStart, rangeEnd);
cell.disabled = typeof this.disabledDate === 'function' && this.disabledDate(cell.date) && this.selectionMode === 'month'; cell.disabled = typeof this.disabledDate === 'function' && this.disabledDate(cell.date) && this.selectionMode === 'month';
cell.selected = selectedDays.includes(time); cell.selected = selectedDays.includes(time);
cells.push(cell); cells.push(cell);

6
src/components/date-picker/base/year-table.vue
View file

@ -11,7 +11,7 @@
</div> </div>
</template> </template>
<script> <script>
import { clearHours, isInRange } from '../util'; import { clearHours } from '../util';
import { deepCopy } from '../../../utils/assist'; import { deepCopy } from '../../../utils/assist';
import mixin from './mixin'; import mixin from './mixin';
import prefixCls from './prefixCls'; import prefixCls from './prefixCls';
@ -38,17 +38,13 @@
disabled: false disabled: false
}; };
const rangeStart = this.rangeState.from && clearHours(new Date(this.rangeState.from.getFullYear(), 0, 1));
const rangeEnd = this.rangeState.to && clearHours(new Date(this.rangeState.to.getFullYear(), 0, 1));
const selectedDays = this.dates.filter(Boolean).map(date => clearHours(new Date(date.getFullYear(), 0, 1))); const selectedDays = this.dates.filter(Boolean).map(date => clearHours(new Date(date.getFullYear(), 0, 1)));
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
const cell = deepCopy(cell_tmpl); const cell = deepCopy(cell_tmpl);
cell.date = new Date(this.startYear + i, 0, 1); cell.date = new Date(this.startYear + i, 0, 1);
cell.disabled = typeof this.disabledDate === 'function' && this.disabledDate(cell.date) && this.selectionMode === 'year'; cell.disabled = typeof this.disabledDate === 'function' && this.disabledDate(cell.date) && this.selectionMode === 'year';
const time = clearHours(cell.date); const time = clearHours(cell.date);
cell.range = isInRange(time, rangeStart, rangeEnd);
cell.selected = selectedDays.includes(time); cell.selected = selectedDays.includes(time);
cells.push(cell); cells.push(cell);
} }