Browse Source

fix(nc-gui): events in the spill over dates for previous & next month are not displayed

pull/7611/head
DarkPhoenix2704 8 months ago
parent
commit
a6d465ad98
  1. 12
      packages/nc-gui/components/smartsheet/calendar/MonthView.vue
  2. 21
      packages/nc-gui/composables/useCalendarViewStore.ts

12
packages/nc-gui/components/smartsheet/calendar/MonthView.vue

@ -6,16 +6,8 @@ import type { Row } from '#imports'
const emit = defineEmits(['new-record', 'expandRecord'])
const {
selectedDate,
selectedMonth,
formattedData,
formattedSideBarData,
displayField,
calendarRange,
calDataType,
updateRowProperty,
} = useCalendarViewStoreOrThrow()
const { selectedDate, selectedMonth, formattedData, formattedSideBarData, displayField, calendarRange, updateRowProperty } =
useCalendarViewStoreOrThrow()
const isMondayFirst = ref(true)

21
packages/nc-gui/composables/useCalendarViewStore.ts

@ -158,11 +158,15 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
fromDate = dayjs(selectedDateRange.value.start).startOf('day')
toDate = dayjs(selectedDateRange.value.end).endOf('day')
break
case 'month':
fromDate = dayjs(selectedMonth.value).startOf('month')
toDate = dayjs(selectedMonth.value).endOf('month')
case 'month': {
const startOfMonth = dayjs(selectedMonth.value).startOf('month')
const endOfMonth = dayjs(selectedMonth.value).endOf('month')
const daysToDisplay = Math.max(endOfMonth.diff(startOfMonth, 'day') + 1, 35)
fromDate = startOfMonth.subtract((startOfMonth.day() + 7) % 7, 'day').add(1, 'day')
toDate = fromDate.add(daysToDisplay, 'day')
break
}
case 'year':
fromDate = dayjs(selectedDate.value).startOf('year')
toDate = dayjs(selectedDate.value).endOf('year')
@ -325,10 +329,15 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
fromDate = dayjs(selectedDateRange.value.start).startOf('day')
toDate = dayjs(selectedDateRange.value.end).endOf('day')
break
case 'month':
fromDate = dayjs(selectedMonth.value).startOf('month')
toDate = dayjs(selectedMonth.value).endOf('month')
case 'month': {
const startOfMonth = dayjs(selectedMonth.value).startOf('month')
const endOfMonth = dayjs(selectedMonth.value).endOf('month')
const daysToDisplay = Math.max(endOfMonth.diff(startOfMonth, 'day') + 1, 35)
fromDate = startOfMonth.subtract((startOfMonth.day() + 7) % 7, 'day')
toDate = fromDate.add(daysToDisplay, 'day')
break
}
case 'year':
fromDate = dayjs(selectedDate.value).startOf('year')
toDate = dayjs(selectedDate.value).endOf('year')

Loading…
Cancel
Save