From d566cf62a485421ae848082794244a512cdbb44c Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Wed, 13 Sep 2023 09:38:03 +0530
Subject: [PATCH] fix: clear icon for year field

---
 packages/nc-gui/components/cell/YearPicker.vue             | 7 ++++---
 .../nc-gui/components/smartsheet/column/DefaultValue.vue   | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
index 5ba1d252ae..9bef5d711e 100644
--- a/packages/nc-gui/components/cell/YearPicker.vue
+++ b/packages/nc-gui/components/cell/YearPicker.vue
@@ -54,7 +54,7 @@ const localState = computed({
     }
 
     if (val?.isValid()) {
-      emit('update:modelValue', Number(val.format('YYYY')))
+      emit('update:modelValue', val.format('YYYY'))
     }
   },
 })
@@ -76,7 +76,7 @@ watch(
 
 const placeholder = computed(() => {
   if (isEditColumn.value && modelValue === null) {
-    return '(Optional)'
+    return 'Select default year (Optional)'
   } else if (modelValue === null && showNull.value) {
     return 'NULL'
   } else if (isYearInvalid.value) {
@@ -110,12 +110,13 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
     class="!w-full !px-1 !border-none"
     :class="{ 'nc-null': modelValue === null && showNull }"
     :placeholder="placeholder"
-    :allow-clear="!readOnly && !localState && !isPk"
+    :allow-clear="(!readOnly && !localState && !isPk) || isEditColumn"
     :input-read-only="true"
     :open="(readOnly || (localState && isPk)) && !active && !editable ? false : open"
     :dropdown-class-name="`${randomClass} nc-picker-year ${open ? 'active' : ''}`"
     @click="open = (active || editable) && !open"
     @change="open = (active || editable) && !open"
+    @ok="open = !open"
   >
     <template #suffixIcon></template>
   </a-date-picker>
diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 2de746ac91..65dd491319 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -21,7 +21,7 @@ const rowRef = ref({
 const cdfValue = computed({
   get: () => {
     if (vModel.value.uidt === UITypes.MultiSelect || vModel.value.uidt === UITypes.SingleSelect) {
-      return (vModel.value.cdf ?? '').replace(/^'|'$/g, '')
+      return (vModel.value.cdf ?? '').replaceAll("'", '')
     } else if (
       vModel.value.uidt === UITypes.SingleLineText ||
       vModel.value.uidt === UITypes.LongText ||
@@ -33,7 +33,7 @@ const cdfValue = computed({
       vModel.value.uidt === UITypes.Year ||
       vModel.value.uidt === UITypes.Date
     ) {
-      return (vModel.value.cdf ?? '').replace(/^'|'$/g, '')
+      return (vModel.value.cdf ?? '').replace(/^'/, '').replace(/'$/, '')
     }
     return vModel.value.cdf
   },
@@ -52,6 +52,7 @@ useProvideSmartsheetRowStore(vModel, rowRef)
       <LazySmartsheetCell :column="vModel" :model-value="cdfValue" :edit-enabled="true" />
       <component
         :is="iconMap.close"
+        v-if="vModel.uidt !== UITypes.Year"
         class="w-4 h-4 cursor-pointer rounded-full !text-black-500 text-gray-500 cursor-pointer hover:bg-gray-50"
         @click="cdfValue = null"
       />