From 785e6b9cb0898a1edcdd2178e359d6308e85c865 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 5 Sep 2022 14:52:06 +0800 Subject: [PATCH 1/3] fix(gui-v2): add reloadEventHook.trigger() to get the latest localColumn value --- packages/nc-gui-v2/components/smartsheet/Form.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/nc-gui-v2/components/smartsheet/Form.vue b/packages/nc-gui-v2/components/smartsheet/Form.vue index ab773c203c..0efaa72ff0 100644 --- a/packages/nc-gui-v2/components/smartsheet/Form.vue +++ b/packages/nc-gui-v2/components/smartsheet/Form.vue @@ -204,6 +204,8 @@ function hideColumn(idx: number) { ) ;(localColumns.value[idx] as any).show = false + reloadEventHook.trigger() + $e('a:form-view:hide-columns') } From 3be5c0ae73a5828e804687ef05e22a9a58e01963 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 5 Sep 2022 16:49:12 +0800 Subject: [PATCH 2/3] refactor(gui-v2): remove (localColumns.value[idx] as any).show --- packages/nc-gui-v2/components/smartsheet/Form.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/nc-gui-v2/components/smartsheet/Form.vue b/packages/nc-gui-v2/components/smartsheet/Form.vue index 0efaa72ff0..d924b7a29f 100644 --- a/packages/nc-gui-v2/components/smartsheet/Form.vue +++ b/packages/nc-gui-v2/components/smartsheet/Form.vue @@ -202,7 +202,6 @@ function hideColumn(idx: number) { }, idx, ) - ;(localColumns.value[idx] as any).show = false reloadEventHook.trigger() From 5a8568efcd21e705c9d9d2728d72fd13999e0a1b Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 5 Sep 2022 16:50:32 +0800 Subject: [PATCH 3/3] fix(gui-v2): add loadViewColumns before reloadData --- packages/nc-gui-v2/composables/useViewColumns.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts index 472b8af703..c99246b3d0 100644 --- a/packages/nc-gui-v2/composables/useViewColumns.ts +++ b/packages/nc-gui-v2/composables/useViewColumns.ts @@ -127,8 +127,8 @@ export function useViewColumns(view: Ref | undefined, meta: ComputedRe return column }) + await loadViewColumns() reloadData?.() - return } if (isUIAllowed('fieldsSync')) { @@ -143,7 +143,7 @@ export function useViewColumns(view: Ref | undefined, meta: ComputedRe return insertedField } } - + await loadViewColumns() reloadData?.() }