From 3d77966f526def743d2d9e9eab6f178210d1ae30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Thu, 27 Aug 2026 08:39:15 +0800 Subject: [PATCH] feat(structure-editor): add quick field add and duplicate shortcuts --- .../TableStructureEditor.primaryKey.spec.ts | 60 ++++++ .../structure/TableStructureEditor.vue | 172 ++++++++++++------ 2 files changed, 178 insertions(+), 54 deletions(-) diff --git a/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts b/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts index 9004c148d1..7958eba078 100644 --- a/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts +++ b/apps/desktop/src/components/structure/TableStructureEditor.primaryKey.spec.ts @@ -40,6 +40,7 @@ vi.mock("@lucide/vue", async () => { Copy: Icon, Database: Icon, Info: Icon, + Keyboard: Icon, KeyRound: Icon, ListChevronsUpDown: Icon, Loader2: Icon, @@ -629,6 +630,65 @@ describe("TableStructureEditor data type options", () => { }); }); +describe("TableStructureEditor action column", () => { + it("shows the field shortcut hints in the toolbar", async () => { + const root = await mountEditor("dameng"); + + expect(root.textContent).toContain("settings.shortcutsTab"); + expect(root.textContent).toContain("Shift+Enter"); + expect(root.textContent).toContain("⌘/Ctrl+D"); + expect(root.querySelector("[data-field-shortcut-hints]")?.className).toContain("flex-col"); + expect(root.querySelector("[data-field-shortcut-hints]")?.className).toContain("w-56"); + expect(root.querySelector("[data-field-shortcut-hints]")?.className).toContain("!bg-secondary"); + expect(root.querySelector("[data-field-shortcut-hints] kbd")?.className).toContain("text-primary"); + }); + + it("adds a field below the focused input on Shift+Enter", async () => { + const root = await mountEditor("dameng"); + const sourceInput = root.querySelector('[data-column-row-index="0"] [data-column-name-input]'); + if (!sourceInput) throw new Error("Missing source column name input"); + + sourceInput.focus(); + sourceInput.dispatchEvent(new KeyboardEvent("keydown", { bubbles: true, key: "Enter", shiftKey: true })); + + await vi.waitFor(() => expect(root.querySelector('[data-column-row-index="1"]')).not.toBeNull()); + const addedInput = root.querySelector('[data-column-row-index="1"] [data-column-name-input]'); + expect(addedInput?.value).toBe(""); + expect(document.activeElement).toBe(addedInput); + }); + + it("copies the field below the focused input on Mod+D", async () => { + const root = await mountEditor("dameng"); + const sourceInput = root.querySelector('[data-column-row-index="0"] [data-column-name-input]'); + if (!sourceInput) throw new Error("Missing source column name input"); + + sourceInput.focus(); + sourceInput.dispatchEvent(new KeyboardEvent("keydown", { bubbles: true, key: "d", ctrlKey: true })); + + await vi.waitFor(() => expect(root.querySelector('[data-column-row-index="1"]')).not.toBeNull()); + const copiedInput = root.querySelector('[data-column-row-index="1"] [data-column-name-input]'); + expect(copiedInput?.value).toBe(sourceInput.value); + expect(document.activeElement).toBe(copiedInput); + }); + + it("widens the ordinal indicator for a two-digit primary-key row", async () => { + const root = await mountEditor("dameng"); + const addColumn = buttonWithText(root, "structureEditor.addColumn"); + for (let index = 0; index < 9; index += 1) { + addColumn.click(); + await nextTick(); + } + + const primaryKey = columnCheckbox(root, "structureEditor.primaryKey", 9); + primaryKey.checked = true; + primaryKey.dispatchEvent(new Event("change", { bubbles: true })); + await nextTick(); + + const actionIndicator = root.querySelector('[data-column-row-index="9"] td:first-child > div > div:first-child'); + expect(Number.parseFloat(actionIndicator?.style.width ?? "0")).toBeGreaterThan(28); + }); +}); + describe("TableStructureEditor local column order notice", () => { it.each(["sqlserver", "postgres", "sqlite", "oracle", "dameng", "duckdb", "informix"] as const)("does not show the reorder notice when adding a %s column", async (databaseType) => { const root = await mountEditor(databaseType); diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue index 9b96580722..f0347cfcfd 100644 --- a/apps/desktop/src/components/structure/TableStructureEditor.vue +++ b/apps/desktop/src/components/structure/TableStructureEditor.vue @@ -7,7 +7,7 @@ import { Input } from "@/components/ui/input"; import { Badge } from "@/components/ui/badge"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; -import { AlertTriangle, Check, ChevronDown, ChevronLeft, ChevronRight, ChevronUp, Copy, Database, Info, KeyRound, ListChevronsUpDown, Loader2, Maximize2, Plus, RefreshCw, Save, Search, Settings, SlidersHorizontal, Trash2, UserRound, X } from "@lucide/vue"; +import { AlertTriangle, Check, ChevronDown, ChevronLeft, ChevronRight, ChevronUp, Copy, Database, Info, Keyboard, KeyRound, ListChevronsUpDown, Loader2, Maximize2, Plus, RefreshCw, Save, Search, Settings, SlidersHorizontal, Trash2, UserRound, X } from "@lucide/vue"; import { DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"; import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"; @@ -531,8 +531,8 @@ const structureToolbarButtonClass = "h-[var(--structure-control-height)] gap-1 p const structureIconButtonClass = "h-[var(--structure-control-height)] w-[var(--structure-control-height)]"; const structureIconClass = "h-[var(--structure-icon-size)] w-[var(--structure-icon-size)]"; const structureCheckboxClass = "h-[var(--structure-checkbox-size)] w-[var(--structure-checkbox-size)]"; -const structureHeaderCellClass = "relative min-w-0 overflow-hidden border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-header-py)] text-left"; -const structureCellClass = "min-w-0 overflow-hidden border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-cell-py)]"; +const structureHeaderCellClass = "relative min-w-0 overflow-hidden border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-header-py)] text-left last:border-r-0"; +const structureCellClass = "min-w-0 overflow-hidden border-b border-r px-[var(--structure-cell-px)] py-[var(--structure-cell-py)] last:border-r-0"; const structureLastCellClass = "min-w-0 overflow-hidden border-b px-[var(--structure-cell-px)] py-[var(--structure-cell-py)]"; const structurePropertyListClass = "flex min-w-0 items-center gap-0 overflow-hidden"; const structurePropertyLabelClass = "flex min-w-0 items-center gap-1 whitespace-nowrap"; @@ -831,11 +831,22 @@ function columnCollation(column: EditableStructureColumn): string { const extendedPropertiesColumnIndex = 10; const actionButtonGap = 2; -const columnActionButtonCount = computed(() => (canShowColumnDragControls.value ? 2 : 1)); +const columnOrdinalIndicatorGap = 4; +const columnOrdinalIndicatorTrailingChrome = 3; +const columnActionButtonCount = computed(() => (canShowColumnDragControls.value ? 3 : 2)); +const columnOrdinalIndicatorWidth = computed(() => { + const metric = structureDensityMetric.value; + const digitCount = String(Math.max(1, columns.value.length)).length; + // Reserve a full em per digit plus the primary-key icon, its gap, padding, + // and divider. The indicator is shared by every row, so it must fit the + // largest ordinal even when that row is a primary-key column. + const requiredWidth = metric.fontSize * digitCount + metric.iconSize + columnOrdinalIndicatorGap + columnOrdinalIndicatorTrailingChrome; + return Math.max(metric.columns[0], requiredWidth); +}); const columnActionsWidth = computed(() => { const metric = structureDensityMetric.value; const count = columnActionButtonCount.value; - return metric.actionButtonWidth * count + actionButtonGap * Math.max(0, count - 1) + metric.cellPaddingX * 2; + return columnOrdinalIndicatorWidth.value + metric.actionButtonWidth * count + actionButtonGap * count + metric.cellPaddingX * 2; }); const visibleColumnIndexes = computed(() => colLabels.value.map((column) => column.widthIndex)); const visibleColWidths = computed(() => @@ -852,7 +863,7 @@ function columnWidthIndex(visibleIndex: number) { const colLabels = computed(() => { const labels = [ - { key: "ordinal", label: "#", widthIndex: 0 }, + { key: "actions", label: t("structureEditor.actions"), widthIndex: 11 }, { key: "name", label: t("structureEditor.columnName"), widthIndex: 1 }, { key: "type", label: t("structureEditor.dataType"), widthIndex: 2 }, ]; @@ -866,7 +877,6 @@ const colLabels = computed(() => { if (showExtendedProperties.value) { labels.push({ key: "extendedProperties", label: t("structureEditor.extendedProperties"), widthIndex: extendedPropertiesColumnIndex }); } - labels.push({ key: "actions", label: t("structureEditor.actions"), widthIndex: 11 }); return labels; }); const indexColLabels = computed(() => [ @@ -2169,7 +2179,7 @@ async function copyColumn(column: EditableStructureColumn) { await focusColumnNameInput(copiedColumn.id); } -async function addColumn() { +async function addColumn(afterColumn?: EditableStructureColumn) { if (!canAddColumn.value) return; activeTab.value = "columns"; const dataType = defaultNewColumnDataType(databaseType.value, dataTypeOptions.value); @@ -2187,7 +2197,8 @@ async function addColumn() { extra: {}, markedForDrop: false, }; - const insertAt = resolveInsertColumnIndex(columns.value, selectedColumnId.value); + const sourceIndex = afterColumn ? columns.value.findIndex((item) => item.id === afterColumn.id) : -1; + const insertAt = sourceIndex >= 0 ? sourceIndex + 1 : resolveInsertColumnIndex(columns.value, selectedColumnId.value); columns.value.splice(insertAt, 0, column); selectSingleColumn(column); if (usesLocalTableColumnOrder.value) persistLocalColumnOrder(false); @@ -3360,7 +3371,32 @@ function addItemForActiveTab(): boolean { return false; } +function focusedEditableColumn(eventTarget: EventTarget | null): EditableStructureColumn | undefined { + if (!(eventTarget instanceof HTMLInputElement || eventTarget instanceof HTMLTextAreaElement) || eventTarget.disabled || eventTarget.readOnly) return; + const row = eventTarget.closest("[data-column-id]"); + const columnId = row?.dataset.columnId; + if (!columnId) return; + return columns.value.find((column) => column.id === columnId && !column.markedForDrop); +} + +function isShiftEnterShortcut(event: KeyboardEvent): boolean { + return !event.isComposing && event.key === "Enter" && event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey; +} + function onStructureEditorKeydown(event: KeyboardEvent) { + const focusedColumn = activeTab.value === "columns" ? focusedEditableColumn(event.target) : undefined; + if (focusedColumn && isShiftEnterShortcut(event) && canAddColumn.value) { + event.preventDefault(); + event.stopPropagation(); + void addColumn(focusedColumn); + return; + } + if (focusedColumn && isPlainModShortcut(event, "d") && canAddColumn.value) { + event.preventDefault(); + event.stopPropagation(); + void copyColumn(focusedColumn); + return; + } if (isPlainModShortcut(event, "f")) { event.preventDefault(); event.stopPropagation(); @@ -3842,6 +3878,28 @@ watch([activeTab, ddlLoading], ([tab, loading]) => { {{ t("structureEditor.addColumn") }} + + + + + +
+ ↓ {{ t("structureEditor.addColumn") }} + Shift+Enter +
+
+ ↓ {{ t("structureEditor.copyColumn") }} + ⌘/Ctrl+D +
+
+
+ + + + @@ -4221,45 +4324,6 @@ watch([activeTab, ddlLoading], ([tab, loading]) => { - -
- - - - -
-