Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: date-range 按年份加载月份数据 #11370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2betop merged 1 commit into from
Jan 6, 2025
Merged

fix: date-range 按年份加载月份数据 #11370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 10 additions & 55 deletions packages/amis-ui/src/components/CalendarMobile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export interface CalendarMobileProps extends ThemeProps, LocaleProps {
export interface CalendarMobileState {
startDate?: moment.Moment;
endDate?: moment.Moment;
monthHeights?: number[];
currentDate: moment.Moment;
showToast: boolean;
isScrollToBottom: boolean;
Expand Down Expand Up @@ -207,24 +206,13 @@ export class CalendarMobile extends React.Component<

initMonths() {
if (this.mobileBody.current) {
const header = this.mobileHeader.current;
let monthHeights: number[] = [];
const monthCollection = this.mobileBody.current.children;
for (let i = 0; i < monthCollection.length; i++) {
monthHeights[i] = monthCollection[i].offsetTop - header.clientHeight;
}
this.setState({
monthHeights
});
const defaultDate = this.props.defaultDate || this.state.currentDate;
this.scollToDate(defaultDate ? moment(defaultDate) : moment());
}
}

scollToDate(date: moment.Moment) {
const {showViewMode} = this.props;
const {minDate} = this.state;
const index = date.diff(minDate, showViewMode);
const index = date.month();
const currentEl = this.mobileBody.current.children[index];
if (!currentEl) {
return;
Expand All @@ -238,33 +226,6 @@ export class CalendarMobile extends React.Component<
);
}

@autobind
onMobileBodyScroll(e: any) {
const {showViewMode} = this.props;
const {monthHeights} = this.state;
let minDate = this.state.minDate?.clone();
if (!this.mobileBody?.current || !monthHeights || !minDate) {
return;
}
const scrollTop = this.mobileBody.current.scrollTop;
const clientHeight = this.mobileBody.current.clientHeight;
const scrollHeight = this.mobileBody.current.scrollHeight;

let i = 0;
for (i; i < monthHeights.length; i++) {
if (scrollTop < monthHeights[i]) {
break;
}
}
i--;
i < 0 && (i = 0);
const currentDate = minDate.add(i, showViewMode);
this.setState({
currentDate,
isScrollToBottom: scrollTop + clientHeight === scrollHeight
});
}

@autobind
scrollPreYear() {
if (!this.state.currentDate) {
Expand Down Expand Up @@ -585,11 +546,12 @@ export class CalendarMobile extends React.Component<
} = this.props;
const __ = this.props.translate;

const {minDate, maxDate} = this.state;
const {minDate, maxDate, currentDate} = this.state;
if (!minDate || !maxDate) {
return;
}
let calendarDates: moment.Moment[] = [];
const currentYear = moment(currentDate).format('YYYY');
for (
let minDateClone = minDate.clone();
minDateClone.isSameOrBefore(maxDate);
Expand All @@ -602,15 +564,13 @@ export class CalendarMobile extends React.Component<
month: date.get('month')
});
}
calendarDates.push(date);
if (date.year() === +currentYear) {
calendarDates.push(date);
}
}

return (
<div
className={cx('CalendarMobile-body')}
ref={this.mobileBody}
onScroll={this.onMobileBodyScroll}
>
<div className={cx('CalendarMobile-body')} ref={this.mobileBody}>
{calendarDates.map((calendarDate: moment.Moment, index: number) => {
const rdtOldNone =
showViewMode === 'months' &&
Expand Down Expand Up @@ -766,13 +726,6 @@ export class CalendarMobile extends React.Component<
maxDate,
isPopupOpen
} = this.state;
let dateNow = currentDate
? currentDate.format(
__(`Calendar.${showViewMode === 'months' ? 'yearmonth' : 'year'}`)
)
: moment().format(
__(`Calendar.${showViewMode === 'months' ? 'yearmonth' : 'year'}`)
);

const header = (
<div className={cx('CalendarMobile-header')} ref={this.mobileHeader}>
Expand All @@ -784,7 +737,9 @@ export class CalendarMobile extends React.Component<
&lsaquo;
</a>
)}
<span onClick={this.openDatePicker}>{dateNow}</span>
<span onClick={this.openDatePicker}>
{moment(currentDate).format('YYYY')}
</span>
{(currentDate &&
currentDate.isSameOrAfter(maxDate, showViewMode)) ||
isScrollToBottom ? null : (
Expand Down
Loading