diff --git a/packages/nc-gui-v2/composables/useViewData.ts b/packages/nc-gui-v2/composables/useViewData.ts index f932380602..e41590b6f5 100644 --- a/packages/nc-gui-v2/composables/useViewData.ts +++ b/packages/nc-gui-v2/composables/useViewData.ts @@ -26,7 +26,8 @@ export function useViewData( ) { const formattedData = ref([]) const paginationData = ref({ page: 1, pageSize: 25 }) - const formData = ref(undefined) + const formColumnData = ref(undefined) + const formViewData = ref(undefined) const { project } = useProject() const { $api } = useNuxtApp() @@ -224,10 +225,10 @@ export function useViewData( } } - const loadFormData = async () => { + const loadFormView = async () => { if (!viewMeta?.value?.id) return try { - const { columns } = (await $api.dbView.formRead(viewMeta.value.id)) as Record + const { columns, ...view } = (await $api.dbView.formRead(viewMeta.value.id)) as Record const fieldById = columns.reduce( (o: Record, f: Record) => ({ @@ -239,7 +240,9 @@ export function useViewData( let order = 1 - formData.value = meta?.value?.columns + formViewData.value = view + + formColumnData.value = meta?.value?.columns ?.map((c: Record) => ({ ...c, fk_column_id: c.id, @@ -269,7 +272,8 @@ export function useViewData( deleteSelectedRows, updateOrSaveRow, selectedAllRecords, - loadFormData, - formData, + loadFormView, + formColumnData, + formViewData, } }