blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(calendar): fix cannot select the same day on allow-same-day (#5193)

Browse Source
This commit is contained in:
landluck 2023-01-12 17:56:17 +08:00 committed by GitHub
parent e9d521a8d2
commit 231aa05e8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/calendar/index.ts
View File

@ -18,6 +18,7 @@ import Toast from '../toast/toast';
import { requestAnimationFrame } from '../common/utils'; import { requestAnimationFrame } from '../common/utils';
const initialMinDate = getToday().getTime(); const initialMinDate = getToday().getTime();
const initialMaxDate = (() => { const initialMaxDate = (() => {
const now = getToday(); const now = getToday();
return new Date( return new Date(
@ -26,6 +27,7 @@ const initialMaxDate = (() => {
now.getDate() now.getDate()
).getTime(); ).getTime();
})(); })();
const getTime = (date: Date | number) => const getTime = (date: Date | number) =>
date instanceof Date ? date.getTime() : date; date instanceof Date ? date.getTime() : date;
@ -194,7 +196,7 @@ VantComponent({
}, },
getInitialDate(defaultDate: number | number[] | null = null) { getInitialDate(defaultDate: number | number[] | null = null) {
const { type, minDate, maxDate } = this.data; const { type, minDate, maxDate, allowSameDay } = this.data;
const now = getToday().getTime(); const now = getToday().getTime();
@ -210,10 +212,14 @@ VantComponent({
minDate, minDate,
getPrevDay(new Date(maxDate)).getTime() getPrevDay(new Date(maxDate)).getTime()
); );
const date = getTime(endDay || now);
const end = this.limitDateRange( const end = this.limitDateRange(
endDay || now, date,
getNextDay(new Date(minDate)).getTime() allowSameDay ? date : getNextDay(new Date(minDate)).getTime()
); );
return [start, end]; return [start, end];
} }