feat(editor): drag columns into SQL editor
This commit is contained in:
1 parent
b94f0e1590
commit
c77948b3c0
3 files changed
+93
-4
No files matched your search
@@ -2773,7 +2773,11 @@ const showDropInside = computed(() => dragState.active && dragState.targetId ===
|
||||
const isDragging = computed(() => dragState.active && dragState.draggedId === props.node.id);
|
||||
const TABLE_REFERENCE_DRAG_THRESHOLD = 5;
|
||||
const TABLE_REFERENCE_DRAGGING_CLASS = "dbx-table-reference-dragging";
|
||||
const canDragTableReference = computed(() => !props.dragDisabled && (props.node.type === "table" || props.node.type === "view") && !!props.node.connectionId && props.node.database != null);
|
||||
const canDragTableReference = computed(() => {
|
||||
if (props.dragDisabled || !props.node.connectionId || props.node.database == null) return false;
|
||||
if (props.node.type === "table" || props.node.type === "view") return true;
|
||||
return props.node.type === "column" && !!props.node.tableName;
|
||||
});
|
||||
|
||||
let pendingTableReferenceDrag: {
|
||||
payload: QueryEditorTableReferencePayload;
|
||||
@@ -2785,6 +2789,18 @@ let suppressNextTableReferenceClick = false;
|
||||
|
||||
function tableReferenceDragPayload(): QueryEditorTableReferencePayload | null {
|
||||
if (!canDragTableReference.value) return null;
|
||||
if (props.node.type === "column") {
|
||||
const columnName = columnNameForDrag(props.node);
|
||||
if (!props.node.tableName || !columnName) return null;
|
||||
return createTableReferencePayload({
|
||||
connectionId: props.node.connectionId,
|
||||
database: props.node.database,
|
||||
schema: props.node.schema,
|
||||
tableName: props.node.tableName,
|
||||
columnName,
|
||||
databaseType: currentDatabaseType(),
|
||||
});
|
||||
}
|
||||
const payload = createTableReferencePayload({
|
||||
connectionId: props.node.connectionId,
|
||||
database: props.node.database,
|
||||
@@ -2795,6 +2811,12 @@ function tableReferenceDragPayload(): QueryEditorTableReferencePayload | null {
|
||||
return payload;
|
||||
}
|
||||
|
||||
function columnNameForDrag(node: TreeNode): string {
|
||||
const column = node.meta as Partial<ColumnInfo> | undefined;
|
||||
if (typeof column?.name === "string" && column.name) return column.name;
|
||||
return node.label.replace(/\s+\([^()]*\)$/, "");
|
||||
}
|
||||
|
||||
function startTableReferenceDrag(payload: QueryEditorTableReferencePayload) {
|
||||
draggingTableReferencePayload = payload;
|
||||
setActiveTableReferencePayload(payload);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { DatabaseType } from "@/types/database";
|
||||
import { qualifiedTableName } from "@/lib/tableSelectSql";
|
||||
import { qualifiedTableName, quoteTableIdentifier } from "@/lib/tableSelectSql";
|
||||
|
||||
export const DBX_TABLE_REFERENCE_MIME = "application/x-dbx-table-reference";
|
||||
export const DBX_TABLE_REFERENCE_DROP_EVENT = "dbx-table-reference-drop";
|
||||
@@ -10,6 +10,8 @@ export interface QueryEditorTableReferencePayload {
|
||||
database: string;
|
||||
schema?: string;
|
||||
tableName: string;
|
||||
columnName?: string;
|
||||
referenceType?: "table" | "column";
|
||||
databaseType?: DatabaseType;
|
||||
}
|
||||
|
||||
@@ -21,7 +23,7 @@ export interface QueryEditorTableReferenceDropDetail {
|
||||
|
||||
let activeTableReferencePayload: QueryEditorTableReferencePayload | null = null;
|
||||
|
||||
export function createTableReferencePayload(options: { connectionId?: string; database?: string; schema?: string; tableName?: string; databaseType?: DatabaseType }): QueryEditorTableReferencePayload | null {
|
||||
export function createTableReferencePayload(options: { connectionId?: string; database?: string; schema?: string; tableName?: string; columnName?: string; databaseType?: DatabaseType }): QueryEditorTableReferencePayload | null {
|
||||
if (!options.connectionId || options.database == null || !options.tableName) return null;
|
||||
const payload: QueryEditorTableReferencePayload = {
|
||||
kind: "dbx-table-reference",
|
||||
@@ -29,6 +31,10 @@ export function createTableReferencePayload(options: { connectionId?: string; da
|
||||
database: options.database,
|
||||
tableName: options.tableName,
|
||||
};
|
||||
if (options.columnName) {
|
||||
payload.columnName = options.columnName;
|
||||
payload.referenceType = "column";
|
||||
}
|
||||
if (options.schema) payload.schema = options.schema;
|
||||
if (options.databaseType) payload.databaseType = options.databaseType;
|
||||
return payload;
|
||||
@@ -45,12 +51,19 @@ export function parseTableReferencePayload(value: string | undefined | null): Qu
|
||||
if (parsed.kind !== "dbx-table-reference" || typeof parsed.connectionId !== "string" || typeof parsed.database !== "string" || typeof parsed.tableName !== "string" || !parsed.connectionId || !parsed.tableName) {
|
||||
return null;
|
||||
}
|
||||
const columnName = typeof parsed.columnName === "string" && parsed.columnName ? parsed.columnName : undefined;
|
||||
const referenceType = parsed.referenceType === "column" || columnName ? "column" : "table";
|
||||
if (referenceType === "column" && !columnName) return null;
|
||||
const payload: QueryEditorTableReferencePayload = {
|
||||
kind: "dbx-table-reference",
|
||||
connectionId: parsed.connectionId,
|
||||
database: parsed.database,
|
||||
tableName: parsed.tableName,
|
||||
};
|
||||
if (referenceType === "column" && columnName) {
|
||||
payload.columnName = columnName;
|
||||
payload.referenceType = "column";
|
||||
}
|
||||
if (typeof parsed.schema === "string" && parsed.schema) payload.schema = parsed.schema;
|
||||
if (parsed.databaseType) payload.databaseType = parsed.databaseType;
|
||||
return payload;
|
||||
@@ -86,8 +99,12 @@ export function createTableReferenceDropEvent(detail: QueryEditorTableReferenceD
|
||||
}
|
||||
|
||||
export function tableReferenceInsertText(payload: QueryEditorTableReferencePayload, fallbackDatabaseType?: DatabaseType): string {
|
||||
const databaseType = payload.databaseType ?? fallbackDatabaseType;
|
||||
if (payload.referenceType === "column" && payload.columnName) {
|
||||
return quoteTableIdentifier(databaseType, payload.columnName);
|
||||
}
|
||||
return qualifiedTableName({
|
||||
databaseType: payload.databaseType ?? fallbackDatabaseType,
|
||||
databaseType,
|
||||
schema: payload.schema,
|
||||
tableName: payload.tableName,
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user