Browse Source

fix: ignore view and table for different base

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/5807/head
Pranav C 1 year ago
parent
commit
9a16e56ccb
  1. 6
      packages/nc-gui/components/dashboard/TreeView.vue
  2. 6
      packages/nc-gui/components/tabs/Smartsheet.vue

6
packages/nc-gui/components/dashboard/TreeView.vue

@ -192,6 +192,8 @@ const initSortable = (el: Element) => {
JSON.stringify({
id: dragEl.dataset.id,
title: dragEl.dataset.title,
type: dragEl.dataset.type,
baseId: dragEl.dataset.baseId,
}),
)
},
@ -711,6 +713,8 @@ const duplicateTable = async (table: TableType) => {
class="nc-tree-item text-sm cursor-pointer group"
:data-order="table.order"
:data-id="table.id"
:data-base-id="bases[0].id"
:data-type="table.type"
:data-title="table.title"
:data-testid="`tree-view-table-${table.title}`"
@click="addTableTab(table)"
@ -1037,6 +1041,8 @@ const duplicateTable = async (table: TableType) => {
:data-order="table.order"
:data-id="table.id"
:data-title="table.title"
:data-base-id="base.id"
:data-type="table.type"
:data-testid="`tree-view-table-${table.title}`"
@click="addTableTab(table)"
>

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

@ -75,6 +75,12 @@ const onDrop = async (event: DragEvent) => {
const data = JSON.parse(event.dataTransfer?.getData('text/json')!)
// Do something with the received data
// if dragged item is not from the same base, return
if (data.baseId !== meta.value?.base_id) return
// if dragged item or opened view is not a table, return
if (data.type !== 'table' || meta.value?.type !== 'table') return
const childMeta = await getMeta(data.id)
const parentMeta = metas.value[meta.value.id!]

Loading…
Cancel
Save