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): select min effective range (#4569)

Browse Source 
* fix(Calendar): select min effective range

* fix(Calendar): fix prefer-destructuring
This commit is contained in:
nemo-shen 2021-10-20 09:30:20 +08:00 committed by GitHub
parent 1860ddfcb1
commit 1ab6abfc19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/calendar/components/month/index.ts
View File

@ -6,7 +6,7 @@ import {
getNextDay, getNextDay,
} from '../../utils'; } from '../../utils';
interface Day { export interface Day {
date: Date; date: Date;
type: string; type: string;
text: number; text: number;

31
packages/calendar/index.ts
View File

@ -12,6 +12,7 @@ import {
getMonths, getMonths,
getDayByOffset, getDayByOffset,
} from './utils'; } from './utils';
import { Day } from './components/month/index';
import Toast from '../toast/toast'; import Toast from '../toast/toast';
import { requestAnimationFrame } from '../common/utils'; import { requestAnimationFrame } from '../common/utils';
@ -25,6 +26,8 @@ const initialMaxDate = (() => {
now.getDate() now.getDate()
).getTime(); ).getTime();
})(); })();
const getTime = (date: Date | number) =>
date instanceof Date ? date.getTime() : date;
VantComponent({ VantComponent({
props: { props: {
@ -230,14 +233,8 @@ VantComponent({
scrollIntoView() { scrollIntoView() {
requestAnimationFrame(() => { requestAnimationFrame(() => {
const { const { currentDate, type, show, poppable, minDate, maxDate } =
currentDate, this.data;
type,
show,
poppable,
minDate,
maxDate,
} = this.data;
// @ts-ignore // @ts-ignore
const targetDate = type === 'single' ? currentDate : currentDate[0]; const targetDate = type === 'single' ? currentDate : currentDate[0];
const displayed = show || !poppable; const displayed = show || !poppable;
@ -278,8 +275,8 @@ VantComponent({
if (this.data.readonly) { if (this.data.readonly) {
return; return;
} }
const { date } = event.detail; let { date } = event.detail;
const { type, currentDate, allowSameDay } = this.data; const { type, currentDate, allowSameDay } = this.data;
if (type === 'range') { if (type === 'range') {
@ -290,6 +287,17 @@ VantComponent({
const compareToStart = compareDay(date, startDay); const compareToStart = compareDay(date, startDay);
if (compareToStart === 1) { if (compareToStart === 1) {
const { days } = this.selectComponent('.month').data;
days.some((day: Day, index) => {
const isDisabled =
day.type === 'disabled' &&
getTime(startDay) < getTime(day.date) &&
getTime(day.date) < getTime(date);
if (isDisabled) {
({ date } = days[index - 1]);
}
return isDisabled;
});
this.select([startDay, date], true); this.select([startDay, date], true);
} else if (compareToStart === -1) { } else if (compareToStart === -1) {
this.select([date, null]); this.select([date, null]);
@ -358,9 +366,6 @@ VantComponent({
}, },
emit(date) { emit(date) {
const getTime = (date: Date | number) =>
date instanceof Date ? date.getTime() : date;
this.setData({ this.setData({
currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date), currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date),
}); });