From 1d495268f53334aa4d7fe09ae6999152982b7006 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sun, 16 Oct 2022 16:42:51 +0300
Subject: [PATCH 1/2] fix(nc-gui): currency handle manual save

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/cell/Currency.vue  | 20 ++++++++++++++++---
 .../nc-gui/components/smartsheet/Cell.vue     |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index ee2966c27f..5cccfb7cf1 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -8,14 +8,16 @@ interface Props {
 
 const props = defineProps<Props>()
 
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'save'])
 
 const column = inject(ColumnInj)!
 
-const editEnabled = inject(EditModeInj)
+const editEnabled = inject(EditModeInj)!
 
 const vModel = useVModel(props, 'modelValue', emit)
 
+const lastSaved = ref()
+
 const currencyMeta = computed(() => {
   return {
     currency_locale: 'en-US',
@@ -38,6 +40,18 @@ const currency = computed(() => {
 })
 
 const focus: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
+
+const submitCurrency = () => {
+  if (lastSaved.value !== vModel.value) {
+    lastSaved.value = vModel.value
+    emit('save')
+  }
+  editEnabled.value = false
+}
+
+onMounted(() => {
+  lastSaved.value = vModel.value
+})
 </script>
 
 <template>
@@ -46,7 +60,7 @@ const focus: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
     :ref="focus"
     v-model="vModel"
     class="w-full h-full border-none outline-none px-2"
-    @blur="editEnabled = false"
+    @blur="submitCurrency"
   />
 
   <span v-else-if="vModel">{{ currency }}</span>
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 2e65709be5..3b53294172 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -163,7 +163,7 @@ const syncAndNavigate = (dir: NavigateDir, e: KeyboardEvent) => {
     <LazyCellUrl v-else-if="isURL" v-model="vModel" />
     <LazyCellPhoneNumber v-else-if="isPhoneNumber" v-model="vModel" />
     <LazyCellPercent v-else-if="isPercent" v-model="vModel" />
-    <LazyCellCurrency v-else-if="isCurrency" v-model="vModel" />
+    <LazyCellCurrency v-else-if="isCurrency" v-model="vModel" @save="emit('save')" />
     <LazyCellDecimal v-else-if="isDecimal" v-model="vModel" />
     <LazyCellInteger v-else-if="isInt" v-model="vModel" />
     <LazyCellFloat v-else-if="isFloat" v-model="vModel" />

From 1c2c9d320a10cfd38d9ae4933b8b8a0b1cc0ec64 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Sun, 16 Oct 2022 16:43:49 +0300
Subject: [PATCH 2/2] fix(nc-gui): use composable instead of redefining

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nc-gui/components/smartsheet/Cell.vue     | 55 ++++++-------------
 packages/nc-gui/composables/useColumn.ts      |  5 +-
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 3b53294172..2ed187af22 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -66,43 +66,6 @@ const syncValue = useDebounceFn(
   500,
   { maxWait: 2000 },
 )
-
-const isAutoSaved = $computed(() => {
-  return [
-    UITypes.SingleLineText,
-    UITypes.LongText,
-    UITypes.PhoneNumber,
-    UITypes.Email,
-    UITypes.URL,
-    UITypes.Number,
-    UITypes.Decimal,
-    UITypes.Percent,
-    UITypes.Count,
-    UITypes.AutoNumber,
-    UITypes.SpecificDBType,
-    UITypes.Geometry,
-    UITypes.Duration,
-  ].includes(column?.value?.uidt as UITypes)
-})
-
-const isManualSaved = $computed(() => [UITypes.Currency].includes(column?.value?.uidt as UITypes))
-
-const vModel = computed({
-  get: () => props.modelValue,
-  set: (val) => {
-    if (val !== props.modelValue) {
-      currentRow.value.rowMeta.changed = true
-      emit('update:modelValue', val)
-      if (isAutoSaved) {
-        syncValue()
-      } else if (!isManualSaved) {
-        emit('save')
-        currentRow.value.rowMeta.changed = true
-      }
-    }
-  },
-})
-
 const {
   isPrimary,
   isURL,
@@ -126,8 +89,26 @@ const {
   isMultiSelect,
   isPercent,
   isPhoneNumber,
+  isAutoSaved,
+  isManualSaved,
 } = useColumn(column)
 
+const vModel = computed({
+  get: () => props.modelValue,
+  set: (val) => {
+    if (val !== props.modelValue) {
+      currentRow.value.rowMeta.changed = true
+      emit('update:modelValue', val)
+      if (isAutoSaved.value) {
+        syncValue()
+      } else if (!isManualSaved.value) {
+        emit('save')
+        currentRow.value.rowMeta.changed = true
+      }
+    }
+  },
+})
+
 const syncAndNavigate = (dir: NavigateDir, e: KeyboardEvent) => {
   if (isJSON.value) return
 
diff --git a/packages/nc-gui/composables/useColumn.ts b/packages/nc-gui/composables/useColumn.ts
index 93710c3f77..a481e227a0 100644
--- a/packages/nc-gui/composables/useColumn.ts
+++ b/packages/nc-gui/composables/useColumn.ts
@@ -56,11 +56,10 @@ export function useColumn(column: Ref<ColumnType | undefined>) {
       UITypes.AutoNumber,
       UITypes.SpecificDBType,
       UITypes.Geometry,
+      UITypes.Duration,
     ].includes(uiDatatype.value),
   )
-  const isManualSaved = computed(() =>
-    [UITypes.Currency, UITypes.Year, UITypes.Time, UITypes.Duration].includes(uiDatatype.value),
-  )
+  const isManualSaved = computed(() => [UITypes.Currency].includes(uiDatatype.value))
   const isPrimary = computed(() => column.value?.pv)
 
   return {