From 421a3ad05153be19889b3cfbbf4c52acc000bb1f Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:31:04 +0000
Subject: [PATCH 1/2] fix(nc-gui): field modal field type search scroll issue

---
 .../components/smartsheet/column/UITypesOptionsWithSearch.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue b/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
index 4081dd38dc..6bf8452381 100644
--- a/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
+++ b/packages/nc-gui/components/smartsheet/column/UITypesOptionsWithSearch.vue
@@ -27,7 +27,7 @@ const onClick = (uidt: UITypes) => {
 }
 
 const handleAutoScrollOption = () => {
-  const option = document.querySelector('.nc-field-list-option-active')
+  const option = document.querySelector('.nc-column-list-option-active')
 
   if (option) {
     setTimeout(() => {

From 1e9c4b2a4e962e06b4652e0d7c46f0e27df6749f Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:31:04 +0000
Subject: [PATCH 2/2] fix(nc-gui): edit field modal field type change issue if
 we selected only name update column

---
 .../components/smartsheet/column/EditOrAdd.vue    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
index c4e462a0b1..b957a2683f 100644
--- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
+++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
@@ -23,8 +23,17 @@ const props = defineProps<{
 
 const emit = defineEmits(['submit', 'cancel', 'mounted', 'add', 'update'])
 
-const { formState, generateNewColumnMeta, addOrUpdate, onAlter, onUidtOrIdTypeChange, validateInfos, isEdit, disableSubmitBtn } =
-  useColumnCreateStoreOrThrow()
+const {
+  formState,
+  column,
+  generateNewColumnMeta,
+  addOrUpdate,
+  onAlter,
+  onUidtOrIdTypeChange,
+  validateInfos,
+  isEdit,
+  disableSubmitBtn,
+} = useColumnCreateStoreOrThrow()
 
 const { getMeta } = useMetas()
 
@@ -334,7 +343,7 @@ const submitBtnLabel = computed(() => {
             v-model:value="formState.uidt"
             show-search
             class="nc-column-type-input !rounded-lg"
-            :disabled="isKanban || readOnly || (isEdit && !!onlyNameUpdateOnEditColumns.find((col) => col === formState.uidt))"
+            :disabled="isKanban || readOnly || (isEdit && !!onlyNameUpdateOnEditColumns.find((col) => col === column?.uidt))"
             dropdown-class-name="nc-dropdown-column-type border-1 !rounded-lg border-gray-200"
             @dropdown-visible-change="onDropdownChange"
             @change="onUidtOrIdTypeChange"