From 3d6bb72f175b7d6b4e99e5e8c868905486f83718 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 19 Aug 2022 12:10:03 +0800 Subject: [PATCH] fix(gui-v2): fields for share base --- packages/nc-gui-v2/composables/useViewColumns.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts index 45e7df3f53..81851548c7 100644 --- a/packages/nc-gui-v2/composables/useViewColumns.ts +++ b/packages/nc-gui-v2/composables/useViewColumns.ts @@ -8,6 +8,7 @@ import type { Field } from '~/lib' export function useViewColumns(view: Ref | undefined, meta: ComputedRef, reloadData?: () => void) { const isPublic = inject(IsPublicInj, ref(false)) + const fields = ref() const filterQuery = ref('') @@ -16,10 +17,13 @@ export function useViewColumns(view: Ref | undefined, meta: ComputedRe const { isUIAllowed } = useUIPermission() + const { isSharedBase } = useProject() + const loadViewColumns = async () => { if (!meta || !view) return let order = 1 + if (view.value?.id) { const data = (isPublic.value ? meta.value?.columns : await $api.dbViewColumn.list(view.value.id)) as any[] @@ -48,7 +52,7 @@ export function useViewColumns(view: Ref | undefined, meta: ComputedRe } const showAll = async (ignoreIds?: any) => { - if (isPublic.value) { + if (isPublic.value || isSharedBase) { fields.value = fields.value?.map((field: Field) => ({ ...field, show: true, @@ -71,7 +75,7 @@ export function useViewColumns(view: Ref | undefined, meta: ComputedRe reloadData?.() } const hideAll = async (ignoreIds?: any) => { - if (isPublic.value) { + if (isPublic.value || isSharedBase) { fields.value = fields.value?.map((field: Field) => ({ ...field, show: false, @@ -94,7 +98,7 @@ export function useViewColumns(view: Ref | undefined, meta: ComputedRe } const saveOrUpdate = async (field: any, index: number) => { - if (isPublic.value && fields.value) { + if ((isPublic.value || isSharedBase) && fields.value) { fields.value[index] = field meta.value.columns = meta.value?.columns?.map((column: ColumnType) => { if (column.id === field.fk_column_id) { @@ -140,7 +144,7 @@ export function useViewColumns(view: Ref | undefined, meta: ComputedRe }, set(v: boolean) { if (view?.value?.id) { - if (!isPublic.value) { + if (!isPublic.value && !isSharedBase) { $api.dbView .update(view.value.id, { show_system_fields: v,