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

Fix sort of date arrays

Browse source
This commit is contained in:
Sergio Crisostomo 2018-01-31 13:30:01 +01:00
parent 73a34dfab5
commit 5092777d17
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/date-picker/panel/Date/date-range.vue
View file

@ -127,6 +127,10 @@
const prefixCls = 'ivu-picker-panel'; const prefixCls = 'ivu-picker-panel';
const datePrefixCls = 'ivu-date-picker'; const datePrefixCls = 'ivu-date-picker';
const dateSorter = (a, b) => {
if (!a || !b) return 0;
return a.getTime() - b.getTime();
};
export default { export default {
name: 'RangeDatePickerPanel', name: 'RangeDatePickerPanel',
@ -185,14 +189,14 @@
return { return {
left: this.leftPickerTable === tableType ? this.handleRangePick : this.handlePreSelection.bind(this, 'left'), left: this.leftPickerTable === tableType ? this.handleRangePick : this.handlePreSelection.bind(this, 'left'),
right: this.leftPickerTable === tableType ? this.handleRangePick : this.handlePreSelection.bind(this, 'right'), right: this.leftPickerTable === tableType ? this.handleRangePick : this.handlePreSelection.bind(this, 'right'),
} };
} }
}, },
watch: { watch: {
value(newVal) { value(newVal) {
const minDate = newVal[0] ? toDate(newVal[0]) : null; const minDate = newVal[0] ? toDate(newVal[0]) : null;
const maxDate = newVal[1] ? toDate(newVal[1]) : null; const maxDate = newVal[1] ? toDate(newVal[1]) : null;
this.dates = [minDate, maxDate].sort(); this.dates = [minDate, maxDate].sort(dateSorter);
this.rangeState = { this.rangeState = {
from: this.dates[0], from: this.dates[0],
@ -308,7 +312,7 @@
}, },
handleRangePick (val) { handleRangePick (val) {
if (this.rangeState.selecting || this.currentView === 'time'){ if (this.rangeState.selecting || this.currentView === 'time'){
const [minDate, maxDate] = [this.rangeState.from, val].sort((a, b) => a - b); const [minDate, maxDate] = [this.rangeState.from, val].sort(dateSorter);
this.dates = [minDate, maxDate]; this.dates = [minDate, maxDate];
if (this.currentView === 'time'){ if (this.currentView === 'time'){
this.dates = val; this.dates = val;