From a93a20c1e92be4dbd972870bcbc0a5c2ebf8dcb7 Mon Sep 17 00:00:00 2001
From: DarkPhoenix2704 <anbarasun123@gmail.com>
Date: Tue, 3 Oct 2023 13:21:09 +0000
Subject: [PATCH] fix: some issues

---
 .../smartsheet/expanded-form/index.vue          | 17 ++++++-----------
 packages/nc-gui/components/tabs/Smartsheet.vue  |  1 -
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 0349308df1..9a15c03868 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -59,7 +59,7 @@ const { t } = useI18n()
 
 const rowId = toRef(props, 'rowId')
 
-const row = useVModel(props, 'row', emits)
+const row = toRef(props, 'row')
 
 const state = toRef(props, 'state')
 
@@ -113,6 +113,7 @@ const {
   row: _row,
   syncLTARRefs,
   save: _save,
+  loadCommentsAndLogs,
 } = useProvideExpandedFormStore(meta, row)
 
 const duplicatingRowInProgress = ref(false)
@@ -338,15 +339,9 @@ const onConfirmDeleteRowClick = async () => {
   showDeleteRowModal.value = false
 }
 
-watch(rowId, (nRow) => {
-  console.log('Loooding', _row.value)
-  _loadRow(nRow)
-  console.log('Loooding', nRow)
-})
-
-watch(_row, (nRow) => {
-  console.log('Loooding', nRow)
-  row.value = nRow.value
+watch(rowId, async (nRow) => {
+  await _loadRow(nRow)
+  await loadCommentsAndLogs()
 })
 
 const showRightSections = computed(() => {
@@ -372,7 +367,7 @@ export default {
     class="nc-drawer-expanded-form"
     :class="{ active: isExpanded }"
   >
-    <div :key="row.row" class="h-[85vh] xs:(max-h-full) max-h-215 flex flex-col p-6">
+    <div :key="rowId" class="h-[85vh] xs:(max-h-full) max-h-215 flex flex-col p-6">
       <div class="flex h-8 flex-shrink-0 w-full items-center nc-expanded-form-header relative mb-4 justify-between">
         <template v-if="!isMobileMode">
           <div class="flex gap-3 w-100">
diff --git a/packages/nc-gui/components/tabs/Smartsheet.vue b/packages/nc-gui/components/tabs/Smartsheet.vue
index 22db7ca0d2..a1a717b82e 100644
--- a/packages/nc-gui/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui/components/tabs/Smartsheet.vue
@@ -190,7 +190,6 @@ watch([activeViewTitleOrId, activeTableId], () => {
       </div>
       <SmartsheetDetails v-else />
     </div>
-
     <LazySmartsheetExpandedFormDetached />
   </div>
 </template>