fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: missing data on boundary dates in weekly calendar view (#6587)

Browse Source
This commit is contained in:
Katherine 2025-03-28 18:04:35 +08:00 committed by GitHub
parent d9710fbb59
commit 8e90850e14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
View File

@ -108,7 +108,7 @@ const useEvents = (
title: string; title: string;
}, },
date: Date, date: Date,
view: (typeof Weeks)[number], view: (typeof Weeks)[number] | any = 'month',
) => { ) => {
const parseExpression = useLazy<typeof import('cron-parser').parseExpression>( const parseExpression = useLazy<typeof import('cron-parser').parseExpression>(
() => import('cron-parser'), () => import('cron-parser'),
@ -132,8 +132,8 @@ const useEvents = (
const intervalTime = end.diff(start, 'millisecond', true); const intervalTime = end.diff(start, 'millisecond', true);
const dateM = dayjs(date); const dateM = dayjs(date);
const startDate = dateM.clone().startOf('month'); const startDate = dateM.clone().startOf(view);
const endDate = startDate.clone().endOf('month'); const endDate = startDate.clone().endOf(view);
/** /**
* view === month 时，会显示当月日程 * view === month 时，会显示当月日程
@ -425,7 +425,6 @@ export const Calendar: any = withDynamicSchemaProps(
}; };
}; };
const BigCalendar = reactBigCalendar?.BigCalendar; const BigCalendar = reactBigCalendar?.BigCalendar;
return wrapSSR( return wrapSSR(
<div className={`${hashId} ${containerClassName}`} style={{ height: height || 700 }}> <div className={`${hashId} ${containerClassName}`} style={{ height: height || 700 }}>
<PopupContextProvider visible={visible} setVisible={setVisible}> <PopupContextProvider visible={visible} setVisible={setVisible}>