diff --git a/src/Agenda3/components/calendar/Calendar.tsx b/src/Agenda3/components/calendar/Calendar.tsx index 9d40aa7..3c8ea54 100644 --- a/src/Agenda3/components/calendar/Calendar.tsx +++ b/src/Agenda3/components/calendar/Calendar.tsx @@ -42,6 +42,7 @@ const Calendar = ({ onCalendarTitleChange }: CalendarProps, ref) => { const { updateEntity } = useAgendaEntities() const tasksWithStart = useAtomValue(tasksWithStartAtom) const settings = useAtomValue(settingsAtom) + const startingDay = settings.general?.startOfWeek const groupType = settings.selectedFilters?.length ? 'filter' : 'page' const showTasks = tasksWithStart?.filter((task) => settings.viewOptions?.hideCompleted ? task.status === 'todo' : true, @@ -185,7 +186,7 @@ const Calendar = ({ onCalendarTitleChange }: CalendarProps, ref) => { weekNumbers weekNumberContent={({ num, date }) => } defaultTimedEventDuration="00:30" - firstDay={1} + firstDay={Number(startingDay)} fixedWeekCount={false} ref={calendarRef} height="100%" diff --git a/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx b/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx index 7bc545e..0e3d3e1 100644 --- a/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx +++ b/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx @@ -8,7 +8,7 @@ const GeneralSettingsForm = () => { const { t, i18n } = useTranslation() const { settings, setSettings } = useSettings() - const onChange = (key: string, value: string | boolean | undefined | Filter[] | string[]) => { + const onChange = (key: string, value: number | string | boolean | undefined | Filter[] | string[]) => { setSettings(key, value) } // 当切换语言时,更新 i18n 的语言 @@ -44,6 +44,24 @@ const GeneralSettingsForm = () => { ]} /> +
+
Start of Week
+