From 709704f71a75a68e81e352fa6d3a2a6ebcd8252d Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Sat, 30 Sep 2023 14:03:57 +0530
Subject: [PATCH] fix: input border

---
 packages/nc-gui/components/smartsheet/Cell.vue        | 11 +++++++++--
 .../components/smartsheet/column/DefaultValue.vue     |  2 +-
 .../index/[typeOrId]/form/[viewId]/index/survey.vue   |  9 ++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index dd3840469e..7cd3ac2e75 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -72,7 +72,9 @@ const readOnly = toRef(props, 'readOnly', false)
 
 provide(ColumnInj, column)
 
-provide(EditModeInj, useVModel(props, 'editEnabled', emit))
+const editEnabled = useVModel(props, 'editEnabled', emit)
+
+provide(EditModeInj, editEnabled)
 
 provide(ActiveCellInj, active)
 
@@ -187,6 +189,11 @@ onMounted(() => {
   intersectionObserver.value?.observe(elementToObserve.value!)
 })
 
+// remove border of element when clicked outside
+onClickOutside(elementToObserve as any, () => {
+  editEnabled.value = false
+})
+
 // disconnect the observer when the cell is unmounted
 onUnmounted(() => {
   intersectionObserver.value?.disconnect()
@@ -205,7 +212,7 @@ onUnmounted(() => {
         'h-10': isForm && !isSurveyForm && !isAttachment(column) && !props.virtual,
         'nc-grid-numeric-cell-left': (isForm && isNumericField && isExpandedFormOpen) || isEditColumnMenu,
         '!min-h-40': isTextArea(column) && props.editEnabled,
-        '!border-2': props.editEnabled,
+        '!border-2': props.editEnabled && (isSurveyForm || isForm),
       },
     ]"
     @keydown.enter.exact="navigate(NavigateDir.NEXT, $event)"
diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index cc266a4063..b78a3e1842 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -49,7 +49,7 @@ useProvideSmartsheetRowStore(vModel, rowRef)
   <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">
-      <LazySmartsheetCell :column="vModel" :model-value="cdfValue" :edit-enabled="true" />
+      <LazySmartsheetCell :column="vModel" :model-value="cdfValue" :edit-enabled="true" class="!border-none" />
       <component
         :is="iconMap.close"
         v-if="vModel.uidt !== UITypes.Year"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index 727ef4abd5..44a5fac20d 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -405,14 +405,9 @@ onMounted(() => {
                 </p>
 
                 <div v-if="sharedFormView?.submit_another_form" class="text-center">
-                  <button
-                    type="button"
-                    class="scaling-btn bg-opacity-100"
-                    data-testid="nc-survey-form__btn-submit-another-form"
-                    @click="resetForm"
-                  >
+                  <NcButton type="primary" data-testid="nc-survey-form__btn-submit-another-form" @click="resetForm">
                     Submit Another Form
-                  </button>
+                  </NcButton>
                 </div>
               </div>
             </div>