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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-03-17 02:10:02 +00:00
commit 743a9c755e
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
View File

@ -153,9 +153,6 @@ export const DatePicker: ComposedDatePicker = (props: any) => {
return disabledTime; return disabledTime;
}); });
}; };
console.log(disabledDate);
const newProps = { const newProps = {
utc, utc,
...props, ...props,

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

@ -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);
let startDate = dateM.clone().startOf('month'); const startDate = dateM.clone().startOf('month');
let endDate = startDate.clone().endOf('month'); const endDate = startDate.clone().endOf('month');
/** /**
* view === month 时，会显示当月日程 * view === month 时，会显示当月日程
@ -141,16 +141,16 @@ const useEvents = (
* 假设 10.1 号是星期六，我们需要将日程的开始时间调整为这一周的星期一，也就是 9.25 号 * 假设 10.1 号是星期六，我们需要将日程的开始时间调整为这一周的星期一，也就是 9.25 号
* 而结束时间需要调整为 10.31 号这一周的星期日，也就是 10.5 号 * 而结束时间需要调整为 10.31 号这一周的星期日，也就是 10.5 号
*/ */
if (view === 'month') { // if (view === 'month') {
startDate = startDate.startOf('week'); // startDate = startDate.startOf('week');
endDate = endDate.endOf('week'); // endDate = endDate.endOf('week');
} // }
const push = (eventStart: Dayjs = start.clone()) => { const push = (eventStart: Dayjs = start.clone()) => {
// 必须在这个月的开始时间和结束时间，且在日程的开始时间之后 // 必须在这个月的开始时间和结束时间，且在日程的开始时间之后
if ( if (
eventStart.isBefore(start) || // 开始时间早于 start eventStart.isBefore(start) || // 开始时间早于 start
(!eventStart.isBetween(startDate, endDate) && !end.isBetween(startDate, endDate)) // 开始时间和结束时间不在月份范围内 (!eventStart.isBetween(startDate, endDate, null, '[]') && !end.isBetween(startDate, endDate)) // 开始时间和结束时间不在月份范围内
) { ) {
return; return;
} }