diff --git a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue index 3e80bb3c1d..6abc72aeb9 100644 --- a/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue +++ b/packages/nc-gui/components/smartsheet/calendar/SideMenu.vue @@ -202,22 +202,21 @@ const options = computed(() => { { label: 'Without dates', value: 'withoutDates' }, { label: 'All records', value: 'allRecords' }, { label: 'In selected hours', value: 'selectedHours' }, - { label: 'In selected date', value: 'selectedDate' }, ] } case 'week' as const: if (calDataType.value === UITypes.Date) { return [ - { label: 'In this day', value: 'day' }, + { label: 'In selected date', value: 'selectedDate' }, { label: 'Without dates', value: 'withoutDates' }, { label: 'All records', value: 'allRecords' }, ] } else { return [ - { label: 'In this day', value: 'day' }, { label: 'Without dates', value: 'withoutDates' }, { label: 'All records', value: 'allRecords' }, { label: 'In selected hours', value: 'selectedHours' }, + { label: 'In selected week', value: 'week' }, { label: 'In selected date', value: 'selectedDate' }, ] } diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue index 06c602972e..ac5312d325 100644 --- a/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue +++ b/packages/nc-gui/components/smartsheet/calendar/WeekView/DateTimeField.vue @@ -14,6 +14,7 @@ const { calendarRange, displayField, selectedTime, + selectedDate, updateRowProperty, sideBarFilterOption, showSideMenu, @@ -749,7 +750,12 @@ const viewMore = (hour: dayjs.Dayjs) => { '!border-l-0': date[0].day() === selectedDateRange.start?.day(), }" class="text-center relative h-20 text-sm text-gray-500 w-full py-1 border-gray-200 first:border-l-none border-1 border-r-gray-50 border-t-gray-50 bg-gray-50" - @click="selectedTime = hour" + @click=" + () => { + selectedTime = hour + selectedDate = hour + } + " > {{ hour.format('h A') }}