Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions components/date_select/DateRangeSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const factory = (Trigger, SelectInput, DateRange) => {
maxDate: PropTypes.object,
onChange: PropTypes.func,
ranges: PropTypes.arrayOf(
PropTypes.oneOf(['今日', '昨日', '近7日', '近30日', '近三个月', '近一年'])
PropTypes.oneOf(['今日', '昨日', '近7日', '近30日', '近三个月', '近一年', '全部'])
),
theme: PropTypes.shape({
DaySelected: PropTypes.object,
Expand All @@ -30,15 +30,15 @@ const factory = (Trigger, SelectInput, DateRange) => {
static defaultProps = {
minDate: moment('2016-03-01'),
maxDate: moment(),
ranges: ['今日', '昨日', '近7日', '近30日', '近三个月', '近一年'],
ranges: ['今日', '昨日', '近7日', '近30日', '近三个月', '近一年', '全部'],
onChange: () => void 0,
}

constructor(props) {
super(props);

this.state = {
ranges: pick(props.ranges, allRanges),
ranges: pick(props.ranges, allRanges(this.props.minDate)),
startDate: 'startDate' in props ? props.startDate : moment(),
endDate: 'endDate' in props ? props.endDate : moment(),
open: false,
Expand All @@ -65,7 +65,7 @@ const factory = (Trigger, SelectInput, DateRange) => {
}

if (nextProps.ranges !== this.props.ranges) {
this.setState({ ranges: pick(nextProps.ranges, allRanges) })
this.setState({ ranges: pick(nextProps.ranges, allRanges(nextProps.minDate)) })
}
}

Expand Down
62 changes: 36 additions & 26 deletions components/date_select/ranges.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,60 @@
export default {
'今日': {
export default function (minDate) {
return {
'今日': {
startDate(e) {
return e;
return e;
},
endDate(e) {
return e;
return e;
},
},
'昨日': {
},
'昨日': {
startDate(e) {
return e.add(-1, 'days');
return e.add(-1, 'days');
},
endDate(e) {
return e.add(-1, 'days');
return e.add(-1, 'days');
},
},
'近7日': {
},
'近7日': {
startDate(e) {
return e.add(-7, 'days');
return e.add(-6, 'days');
},
endDate(e) {
return e;
return e;
},
},
'近30日': {
},
'近30日': {
startDate(e) {
return e.add(-1, 'months');
return e.add(-1, 'months');
},
endDate(e) {
return e;
return e;
},
},
'近三个月': {
},
'近三个月': {
startDate(e) {
return e.add(-3, 'months');
return e.add(-3, 'months');
},
endDate(e) {
return e;
return e;
},
},
'近一年': {
},
'近一年': {
startDate(e) {
return e.add(-1, 'years');
return e.add(-1, 'years');
},
endDate(e) {
return e;
return e;
},
},
};
},
'全部': {
startDate(e) {
return minDate;
},
endDate(e) {
return e;
},
},
};
}
Loading