25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
feat(grid): display column comments and types in transpose view by default (#13641) (#13705)
lxk9558cfc83de867f
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vueindex 6193f0a40a..636bce6b4b 100644--- a/apps/desktop/src/components/grid/DataGrid.vue+++ b/apps/desktop/src/components/grid/DataGrid.vue@@ -12431,11 +12431,17 @@ function transposeScrollElement(): HTMLElement | undefined {function transposeFieldTitle(item: { column: string; type: string; comment?: string }): string {const details = [item.column];- if (showTransposeFieldMetadata.value && showColumnTypesInHeader.value && item.type) details.push(`${t("grid.columnType")}: ${item.type}`);- if (showTransposeFieldMetadata.value && showTransposeColumnComments.value && item.comment) details.push(`${t("grid.columnComment")}: ${item.comment}`);+ if (showColumnTypesInHeader.value && item.type) details.push(`${t("grid.columnType")}: ${item.type}`);+ if (showTransposeColumnComments.value && item.comment) details.push(`${t("grid.columnComment")}: ${item.comment}`);return details.join("\n");}+function toggleTransposeFieldMetadata() {+ settingsStore.updateEditorSettings({+ dataGridShowTransposeFieldMetadata: !settingsStore.editorSettings.dataGridShowTransposeFieldMetadata,+ });+}+function toggleTransposeColumnSort() {if (transposeColumnSortDirection.value === null) {transposeColumnSortDirection.value = "asc";@@ -15608,6 +15614,19 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val{{ multiRowTranspose ? t("grid.transposeMultiRow") : t("grid.transposeSingleRow") }}</span><span class="flex-1" />+ <Button+ data-grid-transpose-toggle-metadata+ variant="ghost"+ size="icon"+ class="h-5 w-5"+ :class="{ 'bg-muted text-foreground': showTransposeFieldMetadata }"+ :disabled="transposeMetadataInInfoColumn"+ :title="t('settings.dataGridShowTransposeFieldMetadata')"+ :aria-label="t('settings.dataGridShowTransposeFieldMetadata')"+ @click="toggleTransposeFieldMetadata"+ >+ <TableProperties class="w-3 h-3" />+ </Button><Button variant="ghost" size="icon" class="h-5 w-5" :disabled="transposeActivePosition <= 0" @click="transposeNav(-1)"><ChevronLeft class="w-3 h-3" /></Button>@@ -15706,7 +15725,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val<span class="flex w-full min-w-0 items-center gap-1 overflow-hidden pr-5"><KeyRound v-if="transposeColumnIndexKind(item.column) === 'primary'" data-grid-transpose-index-indicator class="h-3 w-3 shrink-0" :class="columnIndexColorClass('primary')" :title="transposeColumnIndexText('primary')" /><Hash v-else-if="transposeColumnIndexKind(item.column)" data-grid-transpose-index-indicator class="h-3 w-3 shrink-0" :class="columnIndexColorClass(transposeColumnIndexKind(item.column)!)" :title="transposeColumnIndexText(transposeColumnIndexKind(item.column)!)" />- <span class="min-w-0 flex-1 truncate font-medium leading-4">{{ item.column }}</span>+ <span data-grid-transpose-field-name class="min-w-0 flex-1 truncate font-medium leading-4">{{ item.column }}</span></span><template v-if="showTransposeFieldMetadata && showColumnTypesInHeader && item.type"><span data-grid-transpose-type-line class="h-3 min-w-0 truncate text-[10px] font-normal leading-3 select-none" :class="typeColorClass(item.type)" :title="item.type">@@ -15726,11 +15745,11 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val><span class="text-muted-foreground">{{ t("grid.columnName") }}</span><span class="min-w-0 break-all font-mono select-text">{{ item.column }}</span>- <template v-if="showTransposeFieldMetadata && showColumnTypesInHeader && item.type">+ <template v-if="showColumnTypesInHeader && item.type"><span class="text-muted-foreground">{{ t("grid.columnType") }}</span><span class="min-w-0 break-all font-mono select-text" :class="typeColorClass(item.type)">{{ item.type }}</span></template>- <template v-if="showTransposeFieldMetadata && showTransposeColumnComments && item.comment">+ <template v-if="showTransposeColumnComments && item.comment"><span class="text-muted-foreground">{{ t("grid.columnComment") }}</span><span class="min-w-0 whitespace-pre-wrap break-words select-text">{{ item.comment }}</span></template>diff --git a/apps/desktop/src/components/grid/__tests__/DataGridTransposeSort.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridTransposeSort.spec.tsindex ad476fec3b..9b847ab7c8 100644--- a/apps/desktop/src/components/grid/__tests__/DataGridTransposeSort.spec.ts+++ b/apps/desktop/src/components/grid/__tests__/DataGridTransposeSort.spec.ts@@ -53,7 +53,7 @@ async function settle() {}function transposeFieldNames(host: HTMLElement): string[] {- return [...host.querySelectorAll<HTMLElement>("[data-grid-transpose-column-index]")].map((field) => field.textContent?.trim().split("\n")[0] ?? "");+ return [...host.querySelectorAll<HTMLElement>("[data-grid-transpose-column-index]")].map((field) => field.querySelector<HTMLElement>("[data-grid-transpose-field-name]")?.textContent?.trim() ?? field.textContent?.trim().split("\n")[0] ?? "");}function mountGrid(context: "table-data" | "results" = "table-data") {@@ -279,4 +279,33 @@ describe("DataGrid transpose sorting", () => {expect(autoFittedWidth).toBeGreaterThan(120);expect(rowInfoCell?.style.width).toBe(`${autoFittedWidth}px`);});++ it("displays column comments and types in transpose view by default and allows toolbar toggling", async () => {+ const { host, settingsStore } = mountGrid();+ await settle();+ await openTranspose(host);++ // Displayed by default without manual configuration+ expect(host.querySelectorAll("[data-grid-transpose-comment-line]")).toHaveLength(2);+ expect(host.querySelectorAll("[data-grid-transpose-type-line]")).toHaveLength(2);+ expect(host.querySelector("[data-grid-transpose-comment-line]")?.textContent).toContain("Display name with a long comment");+ expect(host.querySelector("[data-grid-transpose-type-line]")?.textContent).toContain("varchar");++ // Toggle via toolbar button+ const toggleBtn = host.querySelector<HTMLButtonElement>("[data-grid-transpose-toggle-metadata]");+ expect(toggleBtn).not.toBeNull();+ toggleBtn!.click();+ await settle();++ expect(settingsStore.editorSettings.dataGridShowTransposeFieldMetadata).toBe(false);+ expect(host.querySelectorAll("[data-grid-transpose-comment-line]")).toHaveLength(0);+ expect(host.querySelectorAll("[data-grid-transpose-type-line]")).toHaveLength(0);++ // Toggle back on via toolbar button+ toggleBtn!.click();+ await settle();+ expect(settingsStore.editorSettings.dataGridShowTransposeFieldMetadata).toBe(true);+ expect(host.querySelectorAll("[data-grid-transpose-comment-line]")).toHaveLength(2);+ expect(host.querySelectorAll("[data-grid-transpose-type-line]")).toHaveLength(2);+ });});diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.tsindex a51459a9ce..7ed3254c6d 100644--- a/apps/desktop/src/stores/settingsStore.ts+++ b/apps/desktop/src/stores/settingsStore.ts@@ -1488,7 +1488,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {oracleOciTnsAdmin: "",resultTabNamingMode: "source",resultTabPreferComments: true,- dataGridShowTransposeFieldMetadata: false,+ dataGridShowTransposeFieldMetadata: true,dataGridTransposeMetadataInInfoColumn: false,colorizeDataGridCellTypes: false,dataGridTypeColorSchemes: [],@@ -2193,7 +2193,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, existdamengClientBinDir: typeof settings.damengClientBinDir === "string" ? settings.damengClientBinDir.trim() : "",resultTabNamingMode: normalizeResultTabNamingMode(settings.resultTabNamingMode),resultTabPreferComments: settings.resultTabPreferComments !== false,- dataGridShowTransposeFieldMetadata: settings.dataGridShowTransposeFieldMetadata === true,+ dataGridShowTransposeFieldMetadata: settings.dataGridShowTransposeFieldMetadata ?? DEFAULT_EDITOR_SETTINGS.dataGridShowTransposeFieldMetadata,dataGridTransposeMetadataInInfoColumn: settings.dataGridTransposeMetadataInInfoColumn === true,colorizeDataGridCellTypes: settings.colorizeDataGridCellTypes ?? DEFAULT_EDITOR_SETTINGS.colorizeDataGridCellTypes,dataGridTypeColorSchemes,diff --git a/packages/app-tests/settingsStore.test.ts b/packages/app-tests/settingsStore.test.tsindex 6f3181cf2a..0bf6ba779a 100644--- a/packages/app-tests/settingsStore.test.ts+++ b/packages/app-tests/settingsStore.test.ts@@ -671,10 +671,10 @@ test("defaults data grid header display settings", () => {assert.equal(DEFAULT_EDITOR_SETTINGS.dataGridColumnCommentsInInfoArea, false);assert.equal(normalizeEditorSettings({}).dataGridColumnCommentsInInfoArea, false);assert.equal(DEFAULT_EDITOR_SETTINGS.showColumnCommentsInHeader, true);- assert.equal(DEFAULT_EDITOR_SETTINGS.dataGridShowTransposeFieldMetadata, false);+ assert.equal(DEFAULT_EDITOR_SETTINGS.dataGridShowTransposeFieldMetadata, true);assert.equal(DEFAULT_EDITOR_SETTINGS.compactColumnHeaderActions, true);assert.equal(normalizeEditorSettings({}).showColumnCommentsInHeader, true);- assert.equal(normalizeEditorSettings({}).dataGridShowTransposeFieldMetadata, false);+ assert.equal(normalizeEditorSettings({}).dataGridShowTransposeFieldMetadata, true);assert.equal(normalizeEditorSettings({}).compactColumnHeaderActions, true);});@@ -683,14 +683,14 @@ test("keeps saved data grid header display settings", () => {dataGridTransposeMetadataInInfoColumn: true,dataGridColumnCommentsInInfoArea: true,showColumnCommentsInHeader: true,- dataGridShowTransposeFieldMetadata: true,+ dataGridShowTransposeFieldMetadata: false,compactColumnHeaderActions: false,} as any);assert.equal(settings.showColumnCommentsInHeader, true);assert.equal(settings.dataGridTransposeMetadataInInfoColumn, true);assert.equal(settings.dataGridColumnCommentsInInfoArea, true);- assert.equal(settings.dataGridShowTransposeFieldMetadata, true);+ assert.equal(settings.dataGridShowTransposeFieldMetadata, false);assert.equal(settings.compactColumnHeaderActions, false);});