diff --git a/src/components/NumberInterval/NumberInterval.scss b/src/components/NumberInterval/NumberInterval.scss index bce28cc..bf1ee85 100644 --- a/src/components/NumberInterval/NumberInterval.scss +++ b/src/components/NumberInterval/NumberInterval.scss @@ -22,6 +22,7 @@ color: theme.$primary-color; white-space: nowrap; padding-right: 10px; + font-weight: 600; } .participant-control-checkbox-wrapper{ display: flex; diff --git a/src/components/Picker/CalendarUI/CalendarUI.tsx b/src/components/Picker/CalendarUI/CalendarUI.tsx index 10611ff..1835e94 100644 --- a/src/components/Picker/CalendarUI/CalendarUI.tsx +++ b/src/components/Picker/CalendarUI/CalendarUI.tsx @@ -7,6 +7,7 @@ import { getMonth, getWeekend, getWeekendOfCurrentWeek, + getOneMonth } from "@/utils/timeUtils"; import { PopupPicker } from "@/components/Picker/index"; import dayjs from "dayjs"; @@ -165,7 +166,7 @@ const NutUICalendar = React.forwardRef( onChange?.(dayList); }; const selectMonth = () => { - const dayList = getWeekendOfCurrentWeek(30); + const dayList = getOneMonth(); setSelectedValue(dayList); syncMonthTo(dayList[0]); onChange?.(dayList); diff --git a/src/utils/timeUtils.ts b/src/utils/timeUtils.ts index 6bf8e09..5cef7a1 100644 --- a/src/utils/timeUtils.ts +++ b/src/utils/timeUtils.ts @@ -292,4 +292,20 @@ export const calculateDuration = (startTime: string, endTime: string): string => } else { return ""; } +} + + +export const getOneMonth = (): Date[] => { + const dates: Date[] = []; + const currentDate = dayjs(); + const nextMonth = dayjs().add(1, 'month'); + + // 从当前日期开始,遍历到下个月的同一天 + let date = currentDate; + while (date.isBefore(nextMonth) || date.isSame(nextMonth, 'day')) { + dates.push(date.toDate()); + date = date.add(1, 'day'); + } + + return dates; } \ No newline at end of file