From cb51832d7b20b5c28226885314c035ba65b69d72 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Sat, 11 Jul 2026 13:45:49 +0800 Subject: [PATCH] fix(structure): default editor to columns --- .../src/components/structure/TableStructureEditor.vue | 2 +- apps/desktop/src/lib/table/tableMetadataCapabilities.ts | 4 +++- packages/app-tests/tableStructureEditorState.test.ts | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue index a8d6fe7096..5064044813 100644 --- a/apps/desktop/src/components/structure/TableStructureEditor.vue +++ b/apps/desktop/src/components/structure/TableStructureEditor.vue @@ -109,7 +109,7 @@ const emit = defineEmits<{ openSettings: [initialTab?: string, initialSection?: string]; }>(); -const activeTab = ref("ddl"); +const activeTab = ref("columns"); const loading = ref(false); const saving = ref(false); const postSaveRefreshing = ref(false); diff --git a/apps/desktop/src/lib/table/tableMetadataCapabilities.ts b/apps/desktop/src/lib/table/tableMetadataCapabilities.ts index 4c7e43f89a..109e86b147 100644 --- a/apps/desktop/src/lib/table/tableMetadataCapabilities.ts +++ b/apps/desktop/src/lib/table/tableMetadataCapabilities.ts @@ -73,11 +73,13 @@ export function getTableMetadataCapabilities(dbType?: DatabaseType): TableMetada } export function firstStructureMetadataTab(capabilities: TableMetadataCapabilities, isCreateMode: boolean): TableInfoTab { - if (!isCreateMode && capabilities.ddl) return "ddl"; + // Structure editing should open on an editable metadata page; DDL remains a + // read-only fallback for databases that do not expose editable metadata. if (capabilities.columns) return "columns"; if (capabilities.indexes) return "indexes"; if (capabilities.foreignKeys) return "foreignKeys"; if (capabilities.triggers) return "triggers"; + if (!isCreateMode && capabilities.ddl) return "ddl"; return "columns"; } diff --git a/packages/app-tests/tableStructureEditorState.test.ts b/packages/app-tests/tableStructureEditorState.test.ts index 20fc9da9ff..6f3200a408 100644 --- a/packages/app-tests/tableStructureEditorState.test.ts +++ b/packages/app-tests/tableStructureEditorState.test.ts @@ -458,9 +458,10 @@ test("allows Manticore Search column properties only before the column exists", const fullCapabilities = { columns: true, indexes: true, foreignKeys: true, triggers: true, ddl: true }; const noDdlCapabilities = { columns: true, indexes: true, foreignKeys: true, triggers: true, ddl: false }; +const ddlOnlyCapabilities = { columns: false, indexes: false, foreignKeys: false, triggers: false, ddl: true }; -test("defaults to DDL tab for edit mode with full capabilities", () => { - assert.equal(firstStructureMetadataTab(fullCapabilities, false), "ddl"); +test("defaults to columns tab for edit mode with full capabilities", () => { + assert.equal(firstStructureMetadataTab(fullCapabilities, false), "columns"); }); test("defaults to columns tab for create mode", () => { @@ -471,6 +472,10 @@ test("falls back to columns tab when DDL is not available in edit mode", () => { assert.equal(firstStructureMetadataTab(noDdlCapabilities, false), "columns"); }); +test("falls back to DDL when no editable metadata tab is available", () => { + assert.equal(firstStructureMetadataTab(ddlOnlyCapabilities, false), "ddl"); +}); + test("preserves a restored structure draft tab without an explicit initial tab", () => { const source = readFileSync("apps/desktop/src/components/structure/TableStructureEditor.vue", "utf8"); const restoredDraftBlock = source.match(/if \(props\.draft\?\.initialized\) \{[\s\S]*?\n \} else if/);