feat(sidebar): extend table grouping to all object containers
This commit is contained in:
1 parent
e1a512fd59
commit
591e8f4909
20 files changed
+607
-169
No files matched your search
@@ -1,7 +1,7 @@
|
||||
import { shallowRef } from "vue";
|
||||
import type { TreeNode } from "@/types/database";
|
||||
import { findTreeNodeById } from "@/lib/sql/newQueryContext";
|
||||
import { isTableVGroupContainerNode } from "@/lib/table/tableVGroup";
|
||||
import { isTableVGroupContainerNode, tableVGroupDropAcceptsRow } from "@/lib/table/tableVGroup";
|
||||
|
||||
/**
|
||||
* Shared drop feedback for dragging a table row onto a virtual group row.
|
||||
@@ -26,7 +26,7 @@ export interface TableVGroupDropTarget {
|
||||
* above the row, so a single elementFromPoint hit often misses it. Cross-scope
|
||||
* drops are rejected so a table name never lands in another database's layout.
|
||||
*/
|
||||
export function resolveTableVGroupDropTarget(x: number, y: number, treeNodes: TreeNode[], source: { connectionId?: string; database?: string; schema?: string }): TableVGroupDropTarget | null {
|
||||
export function resolveTableVGroupDropTarget(x: number, y: number, treeNodes: TreeNode[], source: { connectionId?: string; database?: string; schema?: string; objectType?: TreeNode["type"] }): TableVGroupDropTarget | null {
|
||||
// Some environments (and component-test DOMs) do not implement hit testing.
|
||||
const elements = typeof document.elementsFromPoint === "function" ? document.elementsFromPoint(x, y) : [];
|
||||
for (const element of elements) {
|
||||
@@ -37,6 +37,9 @@ export function resolveTableVGroupDropTarget(x: number, y: number, treeNodes: Tr
|
||||
if (!node || node.connectionId !== source.connectionId || (node.database ?? "") !== (source.database ?? "")) continue;
|
||||
// 跨 schema:双方都声明且不同 → 拒绝(任一方未知则容忍,交给 database 校验兜底)。
|
||||
if (node.schema && source.schema && node.schema !== source.schema) continue;
|
||||
// 跨类别:视图/过程/触发器行不得落入其他类别的分组或容器,否则会写幻影成员、
|
||||
// 同名时还会误移真实成员。objectType 缺省(表引用拖拽)保持既有行为。
|
||||
if (source.objectType && !tableVGroupDropAcceptsRow(treeNodes, node, source.objectType)) continue;
|
||||
if (node.type === "table-vgroup" && node.vgroupId) return { node, groupId: node.vgroupId };
|
||||
if (isTableVGroupContainerNode(node)) return { node, groupId: null };
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user