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): drop internal helper columns from copy-all names

zipg3e681fe61b4d
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 31a383a1b4..92d42ab5a0 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -10391,7 +10391,7 @@ function openCopyColumnNamesDialog(names: string[]) {
}
function openCopyAllColumnNamesDialog() {
- openCopyColumnNamesDialog(columnNamesForCopy(props.result.columns, visibleColumns.value, "all"));
+ openCopyColumnNamesDialog(columnNamesForCopy({ allColumnNames: props.result.columns, displayableIndexes: displayableColumnIndexes.value, visibleColumnNames: visibleColumns.value, scope: "all" }));
}
function copyHeaderColumnOrSelected() {
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridColumnNameCopy.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridColumnNameCopy.spec.ts
index 2003aecee6..0ad41c86d4 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridColumnNameCopy.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridColumnNameCopy.spec.ts
@@ -48,11 +48,18 @@ describe("dataGridColumnNameCopy", () => {
expect(supportsColumnNameQuoting(undefined)).toBe(false);
});
- it("keeps hidden columns when copying all column names", () => {
+ it("keeps user-hidden columns when copying all column names", () => {
const allColumns = ["id", "hidden_value", "created_at"];
const visibleColumns = ["id", "created_at"];
- expect(columnNamesForCopy(allColumns, visibleColumns, "all")).toEqual(allColumns);
- expect(columnNamesForCopy(allColumns, visibleColumns, "visible")).toEqual(visibleColumns);
+ expect(columnNamesForCopy({ allColumnNames: allColumns, displayableIndexes: [0, 1, 2], visibleColumnNames: visibleColumns, scope: "all" })).toEqual(allColumns);
+ expect(columnNamesForCopy({ allColumnNames: allColumns, displayableIndexes: [0, 1, 2], visibleColumnNames: visibleColumns, scope: "visible" })).toEqual(visibleColumns);
+ });
+
+ it("leaves grid-internal columns out of the copyable names (#10464)", () => {
+ // 可编辑行定位用的 `__DBX_PK_*` 别名只存在于结果集里,网格把它藏起来,
+ // 「复制列名」也必须一样:用户看到的是一列,复制出来就该是一列。
+ const columns = ["rep_def_sql", "__DBX_PK_0"];
+ expect(columnNamesForCopy({ allColumnNames: columns, displayableIndexes: [0], visibleColumnNames: ["rep_def_sql"], scope: "all" })).toEqual(["rep_def_sql"]);
});
it("validates separator values", () => {
diff --git a/apps/desktop/src/lib/dataGrid/dataGridColumnNameCopy.ts b/apps/desktop/src/lib/dataGrid/dataGridColumnNameCopy.ts
index 850a2c6741..b2177ce052 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridColumnNameCopy.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridColumnNameCopy.ts
@@ -33,8 +33,26 @@ export function supportsColumnNameQuoting(databaseType?: DatabaseType): boolean
return !!databaseType && !NON_SQL_DATABASE_TYPES.has(databaseType) && !UNQUOTABLE_DATABASE_TYPES.has(databaseType);
}
-export function columnNamesForCopy(allColumnNames: readonly string[], visibleColumnNames: readonly string[], scope: "all" | "visible"): string[] {
- return [...(scope === "all" ? allColumnNames : visibleColumnNames)];
+export interface ColumnNamesForCopyOptions {
+ /** 结果集的全部列名,可能包含网格内部的辅助列。 */
+ allColumnNames: readonly string[];
+ /**
+ * 网格实际展示的列索引(`displayableColumnIndexes`)。
+ *
+ * 「全部列名」按这份索引取,而不是直接铺开结果集:结果集里可能夹着网格内部
+ * 辅助列——可编辑行定位用的 `__DBX_PK_*` 别名(#10464)、Neo4j 元素 id、补充的
+ * 行号列——它们不在界面上,也不该出现在用户复制的列名里。用户自己隐藏的列仍在
+ * 「全部列名」范围内,只是不出现在「选中/可见列名」里。
+ */
+ displayableIndexes: readonly number[];
+ /** 当前可见(未被用户隐藏)的列名。 */
+ visibleColumnNames: readonly string[];
+ scope: "all" | "visible";
+}
+
+export function columnNamesForCopy(options: ColumnNamesForCopyOptions): string[] {
+ if (options.scope === "visible") return [...options.visibleColumnNames];
+ return options.displayableIndexes.map((index) => options.allColumnNames[index]).filter((name): name is string => name !== undefined);
}
export function formatColumnNamesForCopy(names: readonly string[], options: { separator: ColumnNameCopySeparator; quote?: boolean; databaseType?: DatabaseType; showByComment?: boolean; commentByColumn?: Map<string, string> }): string {