From db8efbceb84da2722d550b83c982e15bfb47653c Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 8 Aug 2022 13:24:01 +0800
Subject: [PATCH] feat(gui-v2): merge form input label

---
 packages/nc-gui-v2/components/smartsheet/Form.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/Form.vue b/packages/nc-gui-v2/components/smartsheet/Form.vue
index b4ee015b9c..6ac06c81ac 100644
--- a/packages/nc-gui-v2/components/smartsheet/Form.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Form.vue
@@ -269,8 +269,11 @@ watch(
           <a-card size="small" class="ma-0 pa-0 cursor-pointer item mb-2">
             <div class="flex">
               <div class="flex flex-row flex-1">
-                <SmartsheetHeaderVirtualCell v-if="isVirtualCol(element)" :column="element" />
-                <SmartsheetHeaderCell v-else class="w-full" :column="element" />
+                <SmartsheetHeaderVirtualCell
+                  v-if="isVirtualCol(element)"
+                  :column="{ ...element, title: element.label || element.title }"
+                />
+                <SmartsheetHeaderCell v-else class="w-full" :column="{ ...element, title: element.label || element.title }" />
               </div>
               <div class="flex flex-row">
                 <MdiDragIcon class="flex flex-1" />
@@ -342,8 +345,11 @@ watch(
             <div class="nc-editable item cursor-pointer hover:bg-primary/10 pa-3" @click="activeRow = element.title">
               <div class="flex">
                 <div class="flex flex-1">
-                  <SmartsheetHeaderVirtualCell v-if="isVirtualCol(element)" :column="element" />
-                  <SmartsheetHeaderCell v-else :column="element" />
+                  <SmartsheetHeaderVirtualCell
+                    v-if="isVirtualCol(element)"
+                    :column="{ ...element, title: element.label || element.title }"
+                  />
+                  <SmartsheetHeaderCell v-else :column="{ ...element, title: element.label || element.title }" />
                 </div>
                 <div v-if="isUIAllowed('editFormView')" class="flex">
                   <MdiHideIcon class="opacity-0 nc-field-remove-icon" @click.stop="hideColumn(index)" />