From 12ba5ef91ed84eb2e1891818c032f1cbbef36d63 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 31 Oct 2023 14:34:32 +0000
Subject: [PATCH 1/3] fix: Made lookup, rollup, formula, barcode, QR code have
 gray background

---
 .../smartsheet/expanded-form/index.vue        | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 8721c1f3f8..0505d0d53e 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { TableType, ViewType } from 'nocodb-sdk'
+import type { ColumnType, TableType, ViewType } from 'nocodb-sdk'
 import { ViewTypes, isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 import MdiChevronDown from '~icons/mdi/chevron-down'
@@ -432,6 +432,10 @@ const onIsExpandedUpdate = (v: boolean) => {
     isExpanded.value = v
   }
 }
+
+const isReadOnlyVirtualCell = (column: ColumnType) => {
+  return isRollup(column) || isFormula(column) || isBarcode(column) || isLookup(column) || isQrCode(column)
+}
 </script>
 
 <script lang="ts">
@@ -633,9 +637,20 @@ export default {
                   <SmartsheetDivDataCell
                     v-if="col.title"
                     :ref="i ? null : (el: any) => (cellWrapperEl = el)"
-                    class="!bg-white rounded-lg !w-[20rem] !xs:w-full border-1 border-gray-200 overflow-hidden px-1 sm:min-h-[35px] xs:min-h-13 flex items-center relative"
+                    class="bg-white rounded-lg !w-[20rem] !xs:w-full border-1 border-gray-200 overflow-hidden px-1 sm:min-h-[35px] xs:min-h-13 flex items-center relative"
+                    :class="{
+                      '!bg-gray-50 !px-0 !select-text': isReadOnlyVirtualCell(col),
+                    }"
                   >
-                    <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="_row.row[col.title]" :row="_row" :column="col" />
+                    <LazySmartsheetVirtualCell
+                      v-if="isVirtualCol(col)"
+                      v-model="_row.row[col.title]"
+                      :row="_row"
+                      :column="col"
+                      :class="{
+                        'px-1': isReadOnlyVirtualCell(col),
+                      }"
+                    />
 
                     <LazySmartsheetCell
                       v-else

From 2428b868b54c6602f6e41cadb6b446c6cd3ba18f Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 31 Oct 2023 14:34:32 +0000
Subject: [PATCH 2/3] fix: Added border to default value in Edit/Add column
 modal

---
 .../components/smartsheet/column/DefaultValue.vue   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 320d9dea0b..384ba1b6bf 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -24,6 +24,8 @@ useProvideSmartsheetRowStore(meta, rowRef)
 
 const cdfValue = ref<string | null>(null)
 
+const editEnabled = ref(true)
+
 const updateCdfValue = (cdf: string | null) => {
   vModel.value.cdf = cdf
   cdfValue.value = vModel.value.cdf
@@ -37,13 +39,20 @@ onMounted(() => {
 <template>
   <div class="!my-3 text-xs">{{ $t('placeholder.defaultValue') }}</div>
   <div class="flex flex-row gap-2">
-    <div class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md">
+    <div
+      class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md"
+      :class="{
+        '!border-brand-500': editEnabled,
+      }"
+    >
       <LazySmartsheetCell
+        :edit-enabled="true"
         :model-value="cdfValue"
         :column="vModel"
-        :edit-enabled="true"
         class="!border-none"
         @update:cdf="updateCdfValue"
+        @update:edit-enabled="editEnabled = $event"
+        @click="editEnabled = true"
       />
       <component
         :is="iconMap.close"

From 8b5537adec031e69dfd32effb0d3b12f0938db2b Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Tue, 31 Oct 2023 14:34:32 +0000
Subject: [PATCH 3/3] fix: Added border to default value in Edit/Add column
 modal

---
 packages/nc-gui/components/smartsheet/column/DefaultValue.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 384ba1b6bf..5fdf44c7eb 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -24,7 +24,7 @@ useProvideSmartsheetRowStore(meta, rowRef)
 
 const cdfValue = ref<string | null>(null)
 
-const editEnabled = ref(true)
+const editEnabled = ref(false)
 
 const updateCdfValue = (cdf: string | null) => {
   vModel.value.cdf = cdf