From 7629363050eae5f4d2299e8cddd8fb8e25f3fc0a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 22 May 2023 17:48:55 +0800
Subject: [PATCH] fix(nc-gui): incorrect shared form logic

---
 .../nc-gui/composables/useSharedFormViewStore.ts | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/composables/useSharedFormViewStore.ts b/packages/nc-gui/composables/useSharedFormViewStore.ts
index fd8151c437..db93cf4b39 100644
--- a/packages/nc-gui/composables/useSharedFormViewStore.ts
+++ b/packages/nc-gui/composables/useSharedFormViewStore.ts
@@ -101,18 +101,10 @@ const [useProvideSharedFormStore, useSharedFormStore] = useInjectionState((share
         {} as Record<string, FormColumnType>,
       )
 
-      let order = 1
-
-      columns.value = meta?.value?.columns
-        ?.map((c: Record<string, any>) => ({
-          ...c,
-          fk_column_id: c.id,
-          fk_view_id: viewMeta.id,
-          ...(fieldById[c.id] ? fieldById[c.id] : {}),
-          order: (fieldById[c.id] && fieldById[c.id].order) || order++,
-          id: fieldById[c.id] && fieldById[c.id].id,
-        }))
-        .sort((a: Record<string, any>, b: Record<string, any>) => a.order - b.order) as Record<string, any>[]
+      columns.value = viewMeta.model?.columns?.map((c) => ({
+        ...c,
+        description: fieldById[c.id].description,
+      }))
 
       const _sharedViewMeta = (viewMeta as any).meta
       sharedViewMeta.value = isString(_sharedViewMeta) ? JSON.parse(_sharedViewMeta) : _sharedViewMeta