Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(grid): list go-to-column targets in the local column order (#11862)

HARRISON5b6fbebe9024
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 6a03d5f6ab..c266d241ac 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -2433,12 +2433,14 @@ const {
onHideNullColumnsChange: (value) => settingsStore.updateEditorSettings({ dataGridHideNullColumns: value }),
onRefreshMetrics: scheduleColumnLayoutRefresh,
});
+// The go-to-column list mirrors the column filter panel, so both follow the
+// user's local column order instead of the database order.
const goToColumnItems = computed(() =>
buildDataGridColumnLookupItems({
columns: props.result.columns,
sourceColumns: props.sourceColumns,
columnComments: props.resultColumnComments,
- displayableIndexes: displayableColumnIndexes.value,
+ displayableIndexes: orderedDisplayableColumnIndexes.value,
commentByColumn: columnCommentMap.value,
}),
);
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridGoToColumnShortcut.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridGoToColumnShortcut.spec.ts
index fdedc5c4f6..34465f342f 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridGoToColumnShortcut.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridGoToColumnShortcut.spec.ts
@@ -84,7 +84,11 @@ function mountGrid(
hidden_column_indexes: options.displayableColumns === false ? [0] : undefined,
});
- const grid = ref<{ tableInfoToolbarCapability: DataGridToolbarActionCapability; goToColumnToolbarCapability: DataGridToolbarActionCapability }>();
+ const grid = ref<{
+ tableInfoToolbarCapability: DataGridToolbarActionCapability;
+ goToColumnToolbarCapability: DataGridToolbarActionCapability;
+ moveDisplayableColumn: (fromDisplayableIndex: number, toDisplayableIndex: number) => void;
+ }>();
const host = document.createElement("div");
document.body.append(host);
const Root = defineComponent({
@@ -199,6 +203,10 @@ function goToColumnItem(name: string, position: number): HTMLButtonElement {
return button;
}
+function goToColumnOrder(): string[] {
+ return [...document.querySelectorAll<HTMLButtonElement>("[data-column-lookup-panel] button")].map((button) => button.textContent?.replaceAll(/\s/g, "") ?? "").filter((text) => text.includes("#"));
+}
+
function goToColumnEvent(target: HTMLElement): KeyboardEvent {
const event = new KeyboardEvent("keydown", { bubbles: true, cancelable: true, ctrlKey: true, key: "g" });
target.dispatchEvent(event);
@@ -460,6 +468,21 @@ describe("DataGrid go-to-column shortcut", () => {
expect(host.querySelector("[data-column-lookup-panel]")).not.toBeNull();
});
+ it("lists columns in the local column order after the user reorders them", async () => {
+ const { host, grid } = mountGrid({ columns: ["id", "name"] });
+ await settle();
+
+ grid.value!.moveDisplayableColumn(1, 0);
+ await settle();
+
+ const root = gridRoot(host);
+ root.focus();
+ goToColumnEvent(root);
+ await settle();
+
+ expect(goToColumnOrder()).toEqual(["name#2", "id#1"]);
+ });
+
it("does not consume the configured shortcut without a displayable column", async () => {
const { host } = mountGrid({ displayableColumns: false });
await settle();