From 39c1a3169ecefd82b98db300dc9332ce430b4478 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Mon, 2 Oct 2023 11:28:36 +0000
Subject: [PATCH] fix: update after reorder in fields tab

---
 .../components/smartsheet/details/Fields.vue    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/details/Fields.vue b/packages/nc-gui/components/smartsheet/details/Fields.vue
index 04ba142882..f3ffd49105 100644
--- a/packages/nc-gui/components/smartsheet/details/Fields.vue
+++ b/packages/nc-gui/components/smartsheet/details/Fields.vue
@@ -258,13 +258,25 @@ const onFieldUpdate = (state: TableExplorerColumn) => {
     ops.value = ops.value.filter((op) => op.op === 'add' || !compareCols(op.column, state))
   } else {
     const field = ops.value.find((op) => compareCols(op.column, state))
-    if (field) {
+    const movField = moveOps.value.find((op) => compareCols(op.column, state))
+    if (field && !movField) {
       field.column = state
-    } else {
+    } else if (!field && movField) {
       ops.value.push({
         op: 'update',
         column: state,
       })
+    } else {
+      ops.value.push({
+        op: 'update',
+        column: {
+          ...state,
+          column_order: {
+            order: movField?.order || getFieldOrder(state),
+            view_id: view.value?.id as string,
+          },
+        },
+      })
     }
   }
 }
@@ -371,6 +383,7 @@ const recoverField = (state: TableExplorerColumn) => {
       ops.value = ops.value.filter((op) => !compareCols(op.column, state))
     } else if (field.op === 'update') {
       ops.value = ops.value.filter((op) => !compareCols(op.column, state))
+      moveOps.value = moveOps.value.filter((op) => !compareCols(op.column, state))
     }
     activeField.value = null
     changeField(fields.value.filter((fiel) => fiel.id === state.id)[0])