From 8d16556495f1145f3fa93bffd75952dff406ff73 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 19 Aug 2022 19:00:28 +0800 Subject: [PATCH 1/3] fix(gui-v2): remove loadAggCommentsCount as it is included in loadData already --- packages/nc-gui-v2/components/smartsheet/Grid.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/nc-gui-v2/components/smartsheet/Grid.vue b/packages/nc-gui-v2/components/smartsheet/Grid.vue index 1fc574dafb..36d7f4bcff 100644 --- a/packages/nc-gui-v2/components/smartsheet/Grid.vue +++ b/packages/nc-gui-v2/components/smartsheet/Grid.vue @@ -87,7 +87,6 @@ const { deleteRow, deleteSelectedRows, selectedAllRecords, - loadAggCommentsCount, removeLastEmptyRow, } = useViewData(meta, view as any, xWhere) @@ -106,7 +105,6 @@ provide(ReadonlyInj, !isUIAllowed('xcDatatableEditable')) reloadViewDataHook?.on(async () => { await loadData() - loadAggCommentsCount() }) const expandForm = (row: Row, state?: Record) => { @@ -128,7 +126,7 @@ const selectCell = (row: number, col: number) => { watch( () => (view?.value as any)?.id, async (n?: string, o?: string) => { - if (n && n !== o) { + if (n && o && n !== o) { await loadData() } }, From 500a710309626e851a5c5af91545d18680a8c108 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 19 Aug 2022 19:00:41 +0800 Subject: [PATCH 2/3] fix(gui-v2): skip undefined ids --- packages/nc-gui-v2/composables/useViewData.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui-v2/composables/useViewData.ts b/packages/nc-gui-v2/composables/useViewData.ts index 85768d91eb..d50e14366c 100644 --- a/packages/nc-gui-v2/composables/useViewData.ts +++ b/packages/nc-gui-v2/composables/useViewData.ts @@ -92,7 +92,7 @@ export function useViewData( return extractPkFromRow(row, meta?.value?.columns as ColumnType[]) }) - if (!ids?.length) return + if (!ids?.length || ids?.some((id) => !id)) return aggCommentCount.value = await $api.utils.commentCount({ ids, From 564add7eb726416a3743c69dc2cd1afc82cded2a Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 19 Aug 2022 19:01:07 +0800 Subject: [PATCH 3/3] fix(gui-v2): Failed to execute 'insertBefore' on 'Node' --- .../pages/[projectType]/[projectId]/index.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue index 5d7fbe927d..068025d96a 100644 --- a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue +++ b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index.vue @@ -326,12 +326,11 @@ definePageMeta({ - - - - - - +
+ + + +