Browse Source

fix(nc-gui): type for calendar range & update rowMeta

pull/7611/head
DarkPhoenix2704 8 months ago
parent
commit
5d45138c69
  1. 13
      packages/nc-gui/composables/useCalendarViewStore.ts
  2. 5
      packages/nc-gui/lib/types.ts

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

@ -91,7 +91,12 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
where: where?.value ?? '',
}))
const calendarRange = ref()
const calendarRange = ref<
Array<{
fk_from_col: ColumnType | null
fk_to_col: ColumnType | null
}>
>([])
const calDataType = computed(() => {
if (!calendarRange.value || !calendarRange.value[0]) return null
@ -536,10 +541,10 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
const calMeta = typeof res.meta === 'string' ? JSON.parse(res.meta) : res.meta
activeCalendarView.value = calMeta?.active_view
if (!activeCalendarView.value) activeCalendarView.value = 'month'
calendarRange.value = res?.calendar_range.map((range: any) => {
calendarRange.value = res?.calendar_range!.map((range: any) => {
return {
fk_from_col: meta.value?.columns.find((col) => col.id === range.fk_from_column_id),
fk_to_col: range.fk_to_column_id ? meta.value?.columns.find((col) => col.id === range.fk_to_column_id) : null,
fk_from_col: meta.value?.columns!.find((col) => col.id === range.fk_from_column_id),
fk_to_col: range.fk_to_column_id ? meta.value?.columns!.find((col) => col.id === range.fk_to_column_id) : null,
}
})
displayField.value = meta.value.columns.find((col) => col.pv)

5
packages/nc-gui/lib/types.ts

@ -63,6 +63,11 @@ interface Row {
saving?: boolean
// use in datetime picker component
isUpdatedFromCopyNPaste?: Record<string, boolean>
// Used in Calendar view
range?: {
fk_from_col: ColumnType
fk_to_col: ColumnType | null
}
}
}

Loading…
Cancel
Save