diff --git a/packages/nc-gui-v2/components/virtual-cell/components/ListChildItems.vue b/packages/nc-gui-v2/components/virtual-cell/components/ListChildItems.vue index 187d536aef..a8e9fba8b6 100644 --- a/packages/nc-gui-v2/components/virtual-cell/components/ListChildItems.vue +++ b/packages/nc-gui-v2/components/virtual-cell/components/ListChildItems.vue @@ -59,6 +59,12 @@ const unlinkRow = async (row: Record) => { } } +const unlinkIfNewRow = async (row: Record) => { + if (isNew.value) { + removeLTARRef(row, column?.value as ColumnType) + } +} + const container = computed(() => isForm?.value ? h('div', { @@ -112,7 +118,7 @@ const expandedFormRow = ref() /> diff --git a/packages/nc-gui-v2/components/virtual-cell/components/ListItems.vue b/packages/nc-gui-v2/components/virtual-cell/components/ListItems.vue index 241ad11770..00c8680f09 100644 --- a/packages/nc-gui-v2/components/virtual-cell/components/ListItems.vue +++ b/packages/nc-gui-v2/components/virtual-cell/components/ListItems.vue @@ -47,8 +47,10 @@ const linkRow = async (row: Record) => { vModel.value = false } +/** reload list on modal open */ watch(vModel, (nextVal, prevVal) => { if (nextVal && !prevVal) { + /** reset query and limit */ childrenExcludedListPagination.query = '' childrenExcludedListPagination.page = 1 loadChildrenExcludedList() diff --git a/packages/nc-gui-v2/composables/useLTARStore.ts b/packages/nc-gui-v2/composables/useLTARStore.ts index b89ab6896b..6904f9f43f 100644 --- a/packages/nc-gui-v2/composables/useLTARStore.ts +++ b/packages/nc-gui-v2/composables/useLTARStore.ts @@ -139,7 +139,7 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState( } } - const deleteRelatedRow = async (row: Record) => { + const deleteRelatedRow = async (row: Record, onSuccess?: (row: Record) => void) => { Modal.confirm({ title: 'Do you want to delete the record?', type: 'warning', @@ -148,7 +148,12 @@ const [useProvideLTARStore, useLTARStore] = useInjectionState( try { $api.dbTableRow.delete(NOCO, project.value.id as string, relatedTableMeta.value.id as string, id as string) reloadData?.() - await loadChildrenList() + + /** reload child list if not a new row */ + if (!isNewRow?.value) { + await loadChildrenList() + } + onSuccess?.(row) } catch (e: any) { message.error(`Delete failed: ${await extractSdkResponseErrorMsg(e)}`) }