Browse Source

fix: some issues

pull/6554/head
DarkPhoenix2704 1 year ago
parent
commit
a93a20c1e9
  1. 17
      packages/nc-gui/components/smartsheet/expanded-form/index.vue
  2. 1
      packages/nc-gui/components/tabs/Smartsheet.vue

17
packages/nc-gui/components/smartsheet/expanded-form/index.vue

@ -59,7 +59,7 @@ const { t } = useI18n()
const rowId = toRef(props, 'rowId') const rowId = toRef(props, 'rowId')
const row = useVModel(props, 'row', emits) const row = toRef(props, 'row')
const state = toRef(props, 'state') const state = toRef(props, 'state')
@ -113,6 +113,7 @@ const {
row: _row, row: _row,
syncLTARRefs, syncLTARRefs,
save: _save, save: _save,
loadCommentsAndLogs,
} = useProvideExpandedFormStore(meta, row) } = useProvideExpandedFormStore(meta, row)
const duplicatingRowInProgress = ref(false) const duplicatingRowInProgress = ref(false)
@ -338,15 +339,9 @@ const onConfirmDeleteRowClick = async () => {
showDeleteRowModal.value = false showDeleteRowModal.value = false
} }
watch(rowId, (nRow) => { watch(rowId, async (nRow) => {
console.log('Loooding', _row.value) await _loadRow(nRow)
_loadRow(nRow) await loadCommentsAndLogs()
console.log('Loooding', nRow)
})
watch(_row, (nRow) => {
console.log('Loooding', nRow)
row.value = nRow.value
}) })
const showRightSections = computed(() => { const showRightSections = computed(() => {
@ -372,7 +367,7 @@ export default {
class="nc-drawer-expanded-form" class="nc-drawer-expanded-form"
:class="{ active: isExpanded }" :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"> <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"> <template v-if="!isMobileMode">
<div class="flex gap-3 w-100"> <div class="flex gap-3 w-100">

1
packages/nc-gui/components/tabs/Smartsheet.vue

@ -190,7 +190,6 @@ watch([activeViewTitleOrId, activeTableId], () => {
</div> </div>
<SmartsheetDetails v-else /> <SmartsheetDetails v-else />
</div> </div>
<LazySmartsheetExpandedFormDetached /> <LazySmartsheetExpandedFormDetached />
</div> </div>
</template> </template>

Loading…
Cancel
Save