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。

feat(structure): sort unpicked columns alphabetically in index column picker

弈秋7b1c29f3cff8
diff --git a/apps/desktop/src/components/structure/StructureIndexColumnPicker.vue b/apps/desktop/src/components/structure/StructureIndexColumnPicker.vue
index b1005af768..95610cb634 100644
--- a/apps/desktop/src/components/structure/StructureIndexColumnPicker.vue
+++ b/apps/desktop/src/components/structure/StructureIndexColumnPicker.vue
@@ -4,6 +4,7 @@ import { useI18n } from "vue-i18n";
import { ChevronDown, Search, X } from "@lucide/vue";
import { Button } from "@/components/ui/button";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { sortStructureIndexColumnOptions } from "@/lib/table/tableStructureEditorState";
interface ColumnOption {
name: string;
@@ -26,9 +27,10 @@ const optionInputs = ref<HTMLInputElement[]>([]);
const selectedPositions = computed(() => new Map(props.selected.map((name, position) => [name, position + 1])));
const visibleOptions = computed(() => {
const query = search.value.trim().toLowerCase();
- return props.options
- .filter((column) => !query || column.name.toLowerCase().includes(query) || column.dataType.toLowerCase().includes(query))
- .sort((left, right) => (selectedPositions.value.get(left.name) ?? Number.MAX_SAFE_INTEGER) - (selectedPositions.value.get(right.name) ?? Number.MAX_SAFE_INTEGER));
+ return sortStructureIndexColumnOptions(
+ props.options.filter((column) => !query || column.name.toLowerCase().includes(query) || column.dataType.toLowerCase().includes(query)),
+ selectedPositions.value,
+ );
});
function onOpenChange(value: boolean) {
diff --git a/apps/desktop/src/lib/table/__tests__/structureIndexColumnOptions.spec.ts b/apps/desktop/src/lib/table/__tests__/structureIndexColumnOptions.spec.ts
new file mode 100644
index 0000000000..b196606708
--- /dev/null
+++ b/apps/desktop/src/lib/table/__tests__/structureIndexColumnOptions.spec.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+import { sortStructureIndexColumnOptions } from "../tableStructureEditorState";
+
+describe("sortStructureIndexColumnOptions", () => {
+ const options = [{ name: "order_total" }, { name: "ID" }, { name: "amount2" }, { name: "amount10" }, { name: "customer" }];
+
+ it("sorts unpicked columns alphabetically, case-insensitive and numeric-aware", () => {
+ expect(sortStructureIndexColumnOptions(options, new Map()).map((option) => option.name)).toEqual(["amount2", "amount10", "customer", "ID", "order_total"]);
+ });
+
+ it("keeps picked columns first in their index order before the alphabetical tail", () => {
+ const picked = new Map([
+ ["customer", 2],
+ ["ID", 1],
+ ]);
+ expect(sortStructureIndexColumnOptions(options, picked).map((option) => option.name)).toEqual(["ID", "customer", "amount2", "amount10", "order_total"]);
+ });
+
+ it("keeps the option payloads intact", () => {
+ const picked = new Map([["ID", 1]]);
+ const [first] = sortStructureIndexColumnOptions(options, picked);
+ expect(first).toEqual({ name: "ID" });
+ });
+});
diff --git a/apps/desktop/src/lib/table/tableStructureEditorState.ts b/apps/desktop/src/lib/table/tableStructureEditorState.ts
index 4cdb660c46..2877fe8969 100644
--- a/apps/desktop/src/lib/table/tableStructureEditorState.ts
+++ b/apps/desktop/src/lib/table/tableStructureEditorState.ts
@@ -1217,6 +1217,22 @@ export function filterStructureIndexColumnOptions(availableColumns: readonly str
return query ? options.filter((column) => column.toLowerCase().includes(query)) : options;
}
+/**
+ * Order index-column picker rows: picked columns first in their index order,
+ * then unpicked columns alphabetically (case-insensitive, numeric-aware) so a
+ * long field list is scannable (#11747).
+ */
+export function sortStructureIndexColumnOptions<T extends { name: string }>(options: readonly T[], selectedPositions: ReadonlyMap<string, number>): T[] {
+ return [...options].sort((left, right) => {
+ const leftPicked = selectedPositions.get(left.name);
+ const rightPicked = selectedPositions.get(right.name);
+ if (leftPicked !== undefined || rightPicked !== undefined) {
+ return (leftPicked ?? Number.MAX_SAFE_INTEGER) - (rightPicked ?? Number.MAX_SAFE_INTEGER);
+ }
+ return left.name.localeCompare(right.name, undefined, { sensitivity: "base", numeric: true });
+ });
+}
+
export function createIndexDrafts(indexes: IndexInfo[]): EditableStructureIndex[] {
return indexes.map((index) => ({
id: `existing:${index.name}`,