diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx index 4e61346003..1bc7493d70 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx @@ -135,10 +135,12 @@ const useEvents = ( const push = (eventStart: Dayjs = start.clone()) => { // 必须在这个月的开始时间和结束时间,且在日程的开始时间之后 - if (eventStart.isBefore(start) || !eventStart.isBetween(startDate, endDate)) { + if ( + eventStart.isBefore(start) || // 开始时间早于 start + (!eventStart.isBetween(startDate, endDate) && !end.isBetween(startDate, endDate)) // 开始时间和结束时间不在月份范围内 + ) { return; } - let out = false; const res = exclude?.some((d) => { if (d.endsWith('_after')) { @@ -162,6 +164,7 @@ const useEvents = ( events.push(event); }; + if (cron === 'every_week') { let nextStart = start .clone()