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(sql-file): add drag sorting for external SQL files
二丫讲梵6d6e0a1e805e
diff --git a/apps/desktop/src/components/layout/SqlFilePanel.vue b/apps/desktop/src/components/layout/SqlFilePanel.vueindex 370e2cade3..596cf09eb6 100644--- a/apps/desktop/src/components/layout/SqlFilePanel.vue+++ b/apps/desktop/src/components/layout/SqlFilePanel.vue@@ -1,8 +1,9 @@<script setup lang="ts">import { ref, computed, nextTick, onMounted, onUnmounted, watch, useId } from "vue";import { useI18n } from "vue-i18n";-import { FolderOpen, FolderClosed, FileCode, FolderPlus, ChevronRight, ChevronDown, X, Trash2, RefreshCw, FolderSearch, Copy, Play, ChevronsUpDown, ChevronsDownUp, Settings, FilePlus, Pencil, Search, ArrowDownAZ, ArrowUpAZ, Loader2 } from "@lucide/vue";+import { FolderOpen, FolderClosed, FileCode, FolderPlus, ChevronRight, ChevronDown, X, Trash2, RefreshCw, FolderSearch, Copy, Play, ChevronsUpDown, ChevronsDownUp, Settings, FilePlus, Pencil, Search, ArrowDownAZ, ArrowUpAZ, Loader2, GripVertical, Check } from "@lucide/vue";import { Button } from "@/components/ui/button";+import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem } from "@/components/ui/dropdown-menu";import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";@@ -28,6 +29,8 @@ import { contentMatchPathSet, searchSqlFileContents, SQL_FILE_CONTENT_SEARCH_DEBimport SqlSearchMatchSnippet from "@/components/layout/SqlSearchMatchSnippet.vue";import { orderedListSelectionIntent, type OrderedListSelectionItem } from "@/lib/selection/orderedListSelection";import { getSqlFileOpenMode, saveSqlFileOpenMode, type SqlFileOpenMode } from "@/lib/sqlFile/sqlFileInteraction";+import { getSqlFileOrder, saveSqlFileOrder, reorderSqlFiles, remapSqlFileOrder, sqlFileParentPath, type SqlFileOrder } from "@/lib/sqlFile/sqlFileOrder";+import { useSqlFileReorder } from "@/composables/useSqlFileReorder";const emit = defineEmits<{close: [];@@ -69,6 +72,13 @@ const fileFilterRegexExample = "(?i)[.](sql|ddl|sh|py)$";const searchText = ref("");const searchQuery = computed(() => searchText.value.trim().toLowerCase());const sortOrder = ref<SqlFileSortOrder>(getSqlFileSortOrder ? getSqlFileSortOrder() : "asc");+const manualOrder = ref<SqlFileOrder>(getSqlFileOrder());+const sortOptions = computed(() => [+ { order: "manual" as const, label: t("sqlFileTree.sortManual"), icon: GripVertical },+ { order: "asc" as const, label: t("sqlLibrary.sortNameAsc"), icon: ArrowDownAZ },+ { order: "desc" as const, label: t("sqlLibrary.sortNameDesc"), icon: ArrowUpAZ },+]);+const currentSortOption = computed(() => sortOptions.value.find((option) => option.order === sortOrder.value)!);const userCollapsedDuringSearch = ref<Set<string>>(new Set());// ---- content search ------------------------------------------------------@@ -246,15 +256,30 @@ function contentGroupFor(path: string): SqlFileContentMatchGroup | undefined {return group;}-function toggleSortOrder() {- const next = sortOrder.value === "asc" ? "desc" : "asc";- sortOrder.value = next;- saveSqlFileSortOrder?.(next);-}-function setSortOrder(order: SqlFileSortOrder) {+ if (!saveSqlFileSortOrder(order)) {+ toast(t("sqlFileTree.sortSaveFailed"), 5000);+ return;+ }+ cancelFileDrag();sortOrder.value = order;- saveSqlFileSortOrder?.(order);+}++function persistManualOrder(next: SqlFileOrder): boolean {+ if (!saveSqlFileOrder(next)) {+ toast(t("sqlFileTree.sortSaveFailed"), 5000);+ return false;+ }+ manualOrder.value = next;+ return true;+}++function remapManualOrder(previousPath: string, nextPath?: string, directory = false) {+ const next = remapSqlFileOrder(manualOrder.value, previousPath, nextPath, directory);+ if (next === manualOrder.value) return;+ // The filesystem mutation has already succeeded: keep this session consistent+ // even if persisting the updated preference fails.+ if (!persistManualOrder(next)) manualOrder.value = next;}// Right-click target. `kind` discriminates between a folder header, a tree@@ -444,6 +469,7 @@ async function locateCurrentFile() {// (#13038). A folder that already has entries stays rendered and is swapped in// place, so the scroll offset survives; `refreshing` only drives the spinner.async function loadFolderEntries(folderPath: string): Promise<string | null> {+ cancelFileDrag();const idx = folders.value.findIndex((f) => f.path === folderPath);if (idx === -1) return null;folders.value[idx].loading = folders.value[idx].entries.length === 0;@@ -536,6 +562,7 @@ async function reloadFolderAfterMutation(folderPath: string) {}async function removeFolder(index: number) {+ cancelFileDrag();folders.value.splice(index, 1);saveFolders();foldersRevision.value++;@@ -571,7 +598,7 @@ interface ProcessedFolder {const folderProcessedMap = computed<Map<string, ProcessedFolder>>(() => {const map = new Map<string, ProcessedFolder>();for (const folder of folders.value) {- const res = filterAndSortSqlFileEntries(folder.entries, searchQuery.value, sortOrder.value, contentMatchPaths.value);+ const res = filterAndSortSqlFileEntries(folder.entries, searchQuery.value, sortOrder.value, contentMatchPaths.value, manualOrder.value);map.set(folder.path, {entries: res.entries,autoExpanded: res.autoExpanded,@@ -756,6 +783,59 @@ const visibleItems = computed<VisibleItem[]>(() => {return items;});+const {+ source: draggedFile,+ target: fileDropTarget,+ start: startFileDrag,+ cancel: cancelFileDrag,+} = useSqlFileReorder({+ tree: fileTree,+ enabled: () =>+ !searchQuery.value &&+ selectedKeys.value.size === 0 &&+ !folders.value.some((folder) => folder.loading || folder.refreshing) &&+ !folderMutationPending.value &&+ !contextTarget.value &&+ !filterSettingsOpen.value &&+ !showCreateDialog.value &&+ !showCreateFolderDialog.value &&+ !showRenameDialog.value &&+ !showRenameFolderDialog.value &&+ !showDeleteDialog.value &&+ !showDeleteFolderDialog.value,+ files: () => visibleItems.value.filter((item) => item.type === "file").map((item) => ({ root: item.folder.path, path: item.path, name: item.entry!.name })),+ drop: (source, target) => {+ // Re-check the current tree; a refresh or mutation may have removed a node.+ const siblings = visibleItems.value.filter((item) => item.type === "file" && item.folder.path === source.root && sqlFileParentPath(item.path) === sqlFileParentPath(source.path));+ const next = reorderSqlFiles(+ manualOrder.value,+ siblings.map((item) => item.path),+ source.path,+ target.path,+ target.position,+ );+ if (!next) return;+ if (!saveSqlFileOrder(next)) {+ toast(t("sqlFileTree.sortSaveFailed"), 5000);+ return;+ }+ // A completed drag selects manual ordering; a click or cancelled drag must+ // leave the current name sort and saved manual order untouched.+ if (sortOrder.value !== "manual" && !saveSqlFileSortOrder("manual")) {+ saveSqlFileOrder(manualOrder.value);+ toast(t("sqlFileTree.sortSaveFailed"), 5000);+ return;+ }+ manualOrder.value = next;+ sortOrder.value = "manual";+ activeKey.value = nodeKey(source.root, "file", source.path);+ selectionAnchorKey.value = activeKey.value;+ focusTree();+ },+});++watch(visibleItems, () => cancelFileDrag());+const visibleRowIds = computed(() => {const ids = new Map<FolderState, Map<string, string>>();visibleItems.value.forEach((item, index) => {@@ -1020,6 +1100,7 @@ async function renameSqlFolder() {const nextPath = await api.renameSqlFolderInFolder(target.folderPath, target.entry.path, fileNameInput.value.trim());queryStore.relocateExternalSqlFolderPath(target.entry.path, nextPath);moveExternalSqlFolderTargets(target.entry.path, nextPath);+ remapManualOrder(target.entry.path, nextPath, true);updateFolderPaths(target.entry.path, nextPath);showRenameFolderDialog.value = false;await refreshMutationFolders();@@ -1040,6 +1121,7 @@ async function renameSqlFile() {// successful rename appear to fail for files too large for the editor.queryStore.relocateExternalSqlFilePath(target.entry.path, nextPath);moveExternalSqlFileTarget(target.entry.path, nextPath);+ remapManualOrder(target.entry.path, nextPath);remapSelectionPaths((path) => (normalizeExternalSqlPath(path) === normalizeExternalSqlPath(target.entry.path) ? nextPath : path));showRenameDialog.value = false;await reloadFolderAfterMutation(target.folderPath);@@ -1068,6 +1150,7 @@ async function deleteSqlFolder() {await api.deleteSqlFolderInFolder(target.folderPath, target.entry.path);queryStore.markExternalSqlFolderMissingForPath(target.entry.path);forgetExternalSqlFolderTargets(target.entry.path);+ remapManualOrder(target.entry.path, undefined, true);updateFolderPaths(target.entry.path);showDeleteFolderDialog.value = false;await refreshMutationFolders();@@ -1105,6 +1188,7 @@ async function deleteSqlFile() {if (!target) return;try {await api.deleteSqlFileInFolder(target.folderPath, target.entry.path);+ remapManualOrder(target.entry.path);queryStore.markExternalSqlFileMissingForPath(target.entry.path);forgetExternalSqlFileTarget(target.entry.path);showDeleteDialog.value = false;@@ -1128,6 +1212,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {label: t("sqlLibrary.sortFiles"),icon: ArrowDownAZ,children: [+ { label: t("sqlFileTree.sortManual"), action: () => setSortOrder("manual"), icon: GripVertical },{ label: t("sqlLibrary.sortNameAsc"), action: () => setSortOrder("asc"), icon: ArrowDownAZ },{ label: t("sqlLibrary.sortNameDesc"), action: () => setSortOrder("desc"), icon: ArrowUpAZ },],@@ -1155,6 +1240,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {label: t("sqlLibrary.sortFiles"),icon: ArrowDownAZ,children: [+ { label: t("sqlFileTree.sortManual"), action: () => setSortOrder("manual"), icon: GripVertical },{ label: t("sqlLibrary.sortNameAsc"), action: () => setSortOrder("asc"), icon: ArrowDownAZ },{ label: t("sqlLibrary.sortNameDesc"), action: () => setSortOrder("desc"), icon: ArrowUpAZ },],@@ -1181,6 +1267,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => {label: t("sqlLibrary.sortFiles"),icon: ArrowDownAZ,children: [+ { label: t("sqlFileTree.sortManual"), action: () => setSortOrder("manual"), icon: GripVertical },{ label: t("sqlLibrary.sortNameAsc"), action: () => setSortOrder("asc"), icon: ArrowDownAZ },{ label: t("sqlLibrary.sortNameDesc"), action: () => setSortOrder("desc"), icon: ArrowUpAZ },],@@ -1260,12 +1347,22 @@ function clearContextTarget() {<Settings class="h-3 w-3" /></Button></LightTooltip>- <LightTooltip :text="sortOrder === 'asc' ? t('sqlLibrary.sortNameAsc') : t('sqlLibrary.sortNameDesc')" side="bottom" :delay="0" :close-delay="0" nowrap>- <Button data-sql-file-sort-btn variant="ghost" size="icon" class="h-5 w-5" @click="toggleSortOrder">- <ArrowDownAZ v-if="sortOrder === 'asc'" class="h-3 w-3" />- <ArrowUpAZ v-else class="h-3 w-3" />- </Button>- </LightTooltip>+ <DropdownMenu>+ <LightTooltip :text="sortOrder === 'manual' ? t('sqlFileTree.sortManualHint') : currentSortOption.label" side="bottom" :delay="0" :close-delay="0" nowrap>+ <DropdownMenuTrigger as-child>+ <Button data-sql-file-sort-btn variant="ghost" size="icon" class="h-5 w-5" :aria-label="currentSortOption.label">+ <component :is="currentSortOption.icon" class="h-3 w-3" />+ </Button>+ </DropdownMenuTrigger>+ </LightTooltip>+ <DropdownMenuContent align="end" @close-auto-focus="restoreTreeFocus">+ <DropdownMenuItem v-for="option in sortOptions" :key="option.order" class="gap-2" @select="setSortOrder(option.order)">+ <component :is="option.icon" class="h-3.5 w-3.5" />+ {{ option.label }}+ <Check v-if="sortOrder === option.order" class="ml-auto h-3.5 w-3.5" />+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu><LightTooltip v-if="folders.length > 0" :text="t('sqlFileTree.refreshAll')" side="bottom" :delay="0" :close-delay="0" nowrap><Button variant="ghost" size="icon" class="h-5 w-5" @click="refreshAll"><RefreshCw class="h-3 w-3" />@@ -1387,15 +1484,22 @@ function clearContextTarget() {<divdata-sql-file-row="true":data-sql-file-path="entry.path"+ :data-sql-file-root="folder.path":aria-current="activeKey === nodeKey(folder.path, entry.is_dir ? 'dir' : 'file', entry.path) ? 'true' : undefined"- class="flex cursor-default select-none items-center gap-1 px-2 py-1 text-sm"- :class="[entry.is_dir ? 'rounded-sm' : 'rounded-none', isPathHighlighted(folder.path, entry.is_dir ? 'dir' : 'file', entry.path) ? 'bg-accent text-accent-foreground' : 'hover:bg-accent/40']"+ class="relative flex cursor-default select-none items-center gap-1 px-2 py-1 text-sm"+ :class="[+ draggedFile?.root === folder.path && draggedFile.path === entry.path ? 'opacity-50' : '',+ entry.is_dir ? 'rounded-sm' : 'rounded-none',+ isPathHighlighted(folder.path, entry.is_dir ? 'dir' : 'file', entry.path) ? 'bg-accent text-accent-foreground' : 'hover:bg-accent/40',+ ]":style="{ paddingLeft: depth * 16 + 8 + 'px' }"role="treeitem":id="visibleRowIds.get(folder)?.get(entry.path)":aria-level="depth + 2":aria-selected="isPathHighlighted(folder.path, entry.is_dir ? 'dir' : 'file', entry.path)":aria-expanded="entry.is_dir ? getEffectiveExpanded(folder).has(entry.path) : undefined"+ @mousedown="startFileDrag($event, folder.path, entry.path)"+ @dragstart.prevent@click.stop="handlePathClick(folder.path, entry.path, entry.is_dir ? 'dir' : 'file', $event)"@dblclick.stop="handlePathDoubleClick(folder.path, entry.path, entry.is_dir ? 'dir' : 'file', $event)"@contextmenu.capture="@@ -1408,6 +1512,7 @@ function clearContextTarget() {onContextMenu($event);">+ <div v-if="fileDropTarget?.root === folder.path && fileDropTarget.path === entry.path" class="pointer-events-none absolute left-2 right-2 border-primary" :class="fileDropTarget.position === 'before' ? 'top-0 border-t-2' : 'bottom-0 border-b-2'" /><template v-if="entry.is_dir"><ChevronRight v-if="!getEffectiveExpanded(folder).has(entry.path)" class="h-3.5 w-3.5 shrink-0 text-muted-foreground" /><ChevronDown v-else class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />diff --git a/apps/desktop/src/components/layout/__tests__/SqlFilePanel.reorder.spec.ts b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.reorder.spec.tsnew file mode 100644index 0000000000..7d06c782cf--- /dev/null+++ b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.reorder.spec.ts@@ -0,0 +1,204 @@+// @vitest-environment happy-dom++import { createApp, nextTick, type App } from "vue";+import { createI18n } from "vue-i18n";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import type { SqlFileEntry } from "@/lib/backend/api";+import { getSqlFileSortOrder, saveSqlFileSortOrder } from "@/lib/sql/sqlFileTreeFilter";+import { saveSqlFileFolderPaths } from "@/lib/sqlFile/sqlFileFolders";+import { getSqlFileOrder, saveSqlFileOrder } from "@/lib/sqlFile/sqlFileOrder";++const mocks = vi.hoisted(() => ({+ list: vi.fn(),+ read: vi.fn(),+ open: vi.fn(),+ toast: vi.fn(),+}));++vi.mock("@/stores/queryStore", () => ({ useQueryStore: () => ({ tabs: [], activeTabId: "", openExternalSqlFile: mocks.open }) }));+vi.mock("@/stores/connectionStore", () => ({ useConnectionStore: () => ({ getConfig: () => undefined }) }));+vi.mock("@/stores/settingsStore", () => ({ useSettingsStore: () => ({ editorSettings: {} }) }));+vi.mock("@/lib/backend/api", () => ({ listSqlFilesInFolder: mocks.list, readExternalSqlFileSnapshot: mocks.read }));+vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => true }));+vi.mock("@/composables/useToast", () => ({ useToast: () => ({ toast: mocks.toast }) }));++import SqlFilePanel from "../SqlFilePanel.vue";++function entry(path: string, children?: SqlFileEntry[]): SqlFileEntry {+ return { path, name: path.split("/").pop()!, is_dir: children !== undefined, children: children ?? [] };+}++const mounted: Array<{ app: App; host: HTMLElement }> = [];++async function mountPanel() {+ const host = document.createElement("div");+ document.body.append(host);+ const app = createApp(SqlFilePanel);+ app.use(createI18n({ legacy: false, locale: "en", messages: { en: {} }, missingWarn: false, fallbackWarn: false }));+ app.mount(host);+ mounted.push({ app, host });+ await vi.waitFor(() => expect(rootFileNames(host)).toHaveLength(3));+ return host;+}++function unmountPanels() {+ for (const { app, host } of mounted.splice(0)) {+ app.unmount();+ host.remove();+ }+}++function row(host: HTMLElement, path: string) {+ const result = host.querySelector<HTMLElement>(`[data-sql-file-path="${path}"]`);+ expect(result).not.toBeNull();+ return result!;+}++function rootFileNames(host: HTMLElement) {+ return Array.from(host.querySelectorAll<HTMLElement>("[data-sql-file-path]"))+ .map((item) => item.dataset.sqlFilePath!)+ .filter((path) => /^\/sql\/[^/]+\.sql$/.test(path))+ .map((path) => path.slice("/sql/".length));+}++async function beginDrag(host: HTMLElement, sourcePath: string, targetPath: string, position: "before" | "after" = "before") {+ const source = row(host, sourcePath);+ const target = row(host, targetPath);+ vi.spyOn(target, "getBoundingClientRect").mockReturnValue({ x: 0, y: 100, top: 100, bottom: 124, left: 0, right: 200, width: 200, height: 24, toJSON: () => ({}) });+ vi.spyOn(document, "elementFromPoint").mockReturnValue(target.querySelector(".truncate"));+ source.querySelector(".truncate")!.dispatchEvent(new MouseEvent("mousedown", { bubbles: true, button: 0, buttons: 1, clientX: 40, clientY: 20 }));+ const point = { clientX: 40, clientY: position === "before" ? 102 : 122 };+ document.dispatchEvent(new MouseEvent("mousemove", { bubbles: true, buttons: 1, ...point }));+ await nextTick();+ return { source, target, point };+}++function releaseDrag(point: { clientX: number; clientY: number }) {+ document.dispatchEvent(new MouseEvent("mouseup", { bubbles: true, button: 0, ...point }));+}++beforeEach(() => {+ const storage = new Map<string, string>();+ vi.stubGlobal("localStorage", {+ getItem: (key: string) => storage.get(key) ?? null,+ setItem: (key: string, value: string) => {+ storage.set(key, value);+ },+ removeItem: (key: string) => {+ storage.delete(key);+ },+ });+ vi.clearAllMocks();+ mocks.list.mockResolvedValue([entry("/sql/sub", [entry("/sql/sub/child.sql")]), entry("/sql/c.sql"), entry("/sql/a.sql"), entry("/sql/b.sql")]);+ mocks.read.mockResolvedValue({ content: "SELECT 1", version: {} });+ saveSqlFileFolderPaths(["/sql"]);+});++afterEach(() => {+ unmountPanels();+ vi.restoreAllMocks();+ vi.unstubAllGlobals();+});++describe("SqlFilePanel drag sorting", () => {+ it.each([+ { mode: "default", source: "c.sql", initial: ["a.sql", "b.sql", "c.sql"], expected: ["a.sql", "c.sql", "b.sql"] },+ { mode: "desc", source: "a.sql", initial: ["c.sql", "b.sql", "a.sql"], expected: ["c.sql", "a.sql", "b.sql"] },+ { mode: "manual", source: "a.sql", initial: ["c.sql", "b.sql", "a.sql"], expected: ["c.sql", "a.sql", "b.sql"] },+ ] as const)("drags directly from $mode sorting and restores the result after reopening", async ({ mode, source, initial, expected }) => {+ if (mode !== "default") saveSqlFileSortOrder(mode);+ saveSqlFileOrder({ "/sql": ["/sql/c.sql", "/sql/hidden.txt", "/sql/b.sql", "/sql/a.sql"], "/other": ["/other/saved.sql"] });+ const host = await mountPanel();+ expect(rootFileNames(host)).toEqual(initial);++ const drag = await beginDrag(host, `/sql/${source}`, "/sql/b.sql");+ expect(drag.source.classList.contains("opacity-50")).toBe(true);+ expect(drag.target.querySelector(".border-t-2")).not.toBeNull();+ releaseDrag(drag.point);+ // Browsers can generate a click after the release; it must not open a file.+ drag.target.click();+ await nextTick();++ expect(rootFileNames(host)).toEqual(expected);+ expect(getSqlFileSortOrder()).toBe("manual");+ expect(host.querySelector("[data-sql-file-sort-btn]")?.getAttribute("aria-label")).toBe("sqlFileTree.sortManual");+ expect(getSqlFileOrder()["/sql"].filter((path) => path.endsWith(".sql"))).toEqual(expected.map((name) => `/sql/${name}`));+ expect(getSqlFileOrder()["/sql"]).toContain("/sql/hidden.txt");+ expect(getSqlFileOrder()["/other"]).toEqual(["/other/saved.sql"]);+ expect(mocks.read).not.toHaveBeenCalled();++ unmountPanels();+ expect(rootFileNames(await mountPanel())).toEqual(expected);+ });++ it("places a file after the target's lower half", async () => {+ const host = await mountPanel();+ const drag = await beginDrag(host, "/sql/a.sql", "/sql/c.sql", "after");+ expect(drag.target.querySelector(".border-b-2")).not.toBeNull();+ releaseDrag(drag.point);+ await nextTick();+ expect(rootFileNames(host)).toEqual(["b.sql", "c.sql", "a.sql"]);+ });++ it("keeps name sorting and ordinary file clicks when movement stays below the drag threshold", async () => {+ const host = await mountPanel();+ const source = row(host, "/sql/a.sql");+ source.dispatchEvent(new MouseEvent("mousedown", { bubbles: true, button: 0, buttons: 1, clientX: 40, clientY: 20 }));+ document.dispatchEvent(new MouseEvent("mousemove", { bubbles: true, buttons: 1, clientX: 42, clientY: 22 }));+ releaseDrag({ clientX: 42, clientY: 22 });+ source.click();+ await nextTick();+ expect(mocks.read).toHaveBeenCalledOnce();+ expect(rootFileNames(host)).toEqual(["a.sql", "b.sql", "c.sql"]);+ expect(getSqlFileSortOrder()).toBe("asc");+ expect(getSqlFileOrder()).toEqual({});+ });++ it("cancels without changing sort preferences or opening a file on release", async () => {+ const host = await mountPanel();+ const drag = await beginDrag(host, "/sql/c.sql", "/sql/a.sql");+ document.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));+ await nextTick();+ expect(drag.source.classList.contains("opacity-50")).toBe(false);+ expect(drag.target.querySelector(".border-t-2")).toBeNull();+ releaseDrag(drag.point);+ drag.target.click();+ await nextTick();+ expect(rootFileNames(host)).toEqual(["a.sql", "b.sql", "c.sql"]);+ expect(getSqlFileSortOrder()).toBe("asc");+ expect(getSqlFileOrder()).toEqual({});+ expect(mocks.read).not.toHaveBeenCalled();+ });++ it("rejects a drop onto a file in another directory", async () => {+ const host = await mountPanel();+ row(host, "/sql/sub").click();+ await nextTick();+ const drag = await beginDrag(host, "/sql/c.sql", "/sql/sub/child.sql");+ expect(drag.target.querySelector(".border-t-2")).toBeNull();+ releaseDrag(drag.point);+ await nextTick();+ expect(rootFileNames(host)).toEqual(["a.sql", "b.sql", "c.sql"]);+ expect(getSqlFileSortOrder()).toBe("asc");+ expect(getSqlFileOrder()).toEqual({});+ });++ it.each(["dbx-sql-file-manual-order", "dbx-sql-file-sort-order"])("keeps the previous order and reports a failure when saving %s fails", async (failedKey) => {+ const previous = { "/sql": ["/sql/c.sql", "/sql/b.sql", "/sql/a.sql"] };+ saveSqlFileOrder(previous);+ const host = await mountPanel();+ const setItem = localStorage.setItem.bind(localStorage);+ vi.spyOn(localStorage, "setItem").mockImplementation((key, value) => {+ if (key === failedKey) throw new Error("storage unavailable");+ setItem(key, value);+ });+ vi.spyOn(console, "warn").mockImplementation(() => {});+ const drag = await beginDrag(host, "/sql/c.sql", "/sql/a.sql");+ releaseDrag(drag.point);+ await nextTick();+ expect(rootFileNames(host)).toEqual(["a.sql", "b.sql", "c.sql"]);+ expect(getSqlFileSortOrder()).toBe("asc");+ expect(getSqlFileOrder()).toEqual(previous);+ expect(mocks.toast).toHaveBeenCalledWith("sqlFileTree.sortSaveFailed", 5000);+ });+});diff --git a/apps/desktop/src/components/layout/__tests__/SqlFilePanel.searchAndSort.spec.ts b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.searchAndSort.spec.tsindex 2498a36852..fd250118d6 100644--- a/apps/desktop/src/components/layout/__tests__/SqlFilePanel.searchAndSort.spec.ts+++ b/apps/desktop/src/components/layout/__tests__/SqlFilePanel.searchAndSort.spec.ts@@ -10,6 +10,7 @@ const mocks = vi.hoisted(() => ({savedSortOrder: "asc",saveSqlFileSortOrder: vi.fn((order: string) => {mocks.savedSortOrder = order;+ return true;}),}));@@ -108,26 +109,39 @@ describe("SqlFilePanel search and sort", () => {expect(renderedNames).toEqual(["migrations", "queries", "alpha.sql", "zebra.sql"]);});- it("toggles sort order between asc and desc, updating rendered order and persisting", async () => {+ it("selects asc and desc from the sort menu, updating rendered order and persisting", async () => {const { host } = await mountPanel();const sortBtn = host.querySelector<HTMLButtonElement>("button[data-sql-file-sort-btn]")!;- // Toggle to descending- sortBtn.click();- await nextTick();-- expect(mocks.saveSqlFileSortOrder).toHaveBeenCalledWith("desc");+ async function selectSortOrder(order: "asc" | "desc") {+ sortBtn.click();+ const label = i18n.global.t(order === "asc" ? "sqlLibrary.sortNameAsc" : "sqlLibrary.sortNameDesc");+ // Dropdown content is teleported outside the mounted panel.+ const item = await vi.waitFor(() => {+ const menuId = sortBtn.getAttribute("aria-controls");+ const menu = menuId ? document.getElementById(menuId) : null;+ const option = Array.from(menu?.querySelectorAll<HTMLElement>('[role="menuitem"]') ?? []).find((entry) => entry.textContent?.trim() === label);+ expect(option).toBeDefined();+ return option!;+ });+ item.click();+ await vi.waitFor(() => expect(sortBtn.getAttribute("aria-expanded")).toBe("false"));+ }++ await selectSortOrder("desc");++ expect(mocks.saveSqlFileSortOrder).toHaveBeenLastCalledWith("desc");+ expect(mocks.savedSortOrder).toBe("desc");// Order should now be: queries, migrations, zebra.sql, alpha.sqllet rows = Array.from(host.querySelectorAll<HTMLElement>("[data-sql-file-path]"));let renderedNames = rows.map((r) => r.querySelector(".truncate")?.textContent?.trim());expect(renderedNames).toEqual(["queries", "migrations", "zebra.sql", "alpha.sql"]);- // Toggle back to ascending- sortBtn.click();- await nextTick();+ await selectSortOrder("asc");- expect(mocks.saveSqlFileSortOrder).toHaveBeenCalledWith("asc");+ expect(mocks.saveSqlFileSortOrder).toHaveBeenLastCalledWith("asc");+ expect(mocks.savedSortOrder).toBe("asc");rows = Array.from(host.querySelectorAll<HTMLElement>("[data-sql-file-path]"));renderedNames = rows.map((r) => r.querySelector(".truncate")?.textContent?.trim());expect(renderedNames).toEqual(["migrations", "queries", "alpha.sql", "zebra.sql"]);diff --git a/apps/desktop/src/composables/useSqlFileReorder.ts b/apps/desktop/src/composables/useSqlFileReorder.tsnew file mode 100644index 0000000000..3457e7d405--- /dev/null+++ b/apps/desktop/src/composables/useSqlFileReorder.ts@@ -0,0 +1,149 @@+import { onBeforeUnmount, ref, watch, type Ref } from "vue";+import { sqlFileParentPath } from "@/lib/sqlFile/sqlFileOrder";++interface FileRow {+ root: string;+ path: string;+ name: string;+}++interface DropTarget extends FileRow {+ position: "before" | "after";+}++export function useSqlFileReorder(options: { tree: Ref<HTMLElement | null>; enabled: () => boolean; files: () => FileRow[]; drop: (source: FileRow, target: DropTarget) => void }) {+ const source = ref<FileRow | null>(null);+ const target = ref<DropTarget | null>(null);+ let pending: (FileRow & { x: number; y: number }) | null = null;+ let ghost: HTMLElement | null = null;+ let previousCursor = "";+ let previousUserSelect = "";+ let suppressClick = false;+ let suppressTimer: ReturnType<typeof setTimeout> | undefined;++ function suppressDragClick(event: MouseEvent) {+ if (!suppressClick || !(event.target instanceof Node) || !options.tree.value?.contains(event.target)) return;+ event.preventDefault();+ event.stopImmediatePropagation();+ }++ function clearClickSuppression() {+ clearTimeout(suppressTimer);+ suppressClick = false;+ document.removeEventListener("click", suppressDragClick, true);+ document.removeEventListener("dblclick", suppressDragClick, true);+ document.removeEventListener("mouseup", releaseClickSuppression, true);+ document.removeEventListener("mousedown", clearClickSuppression, true);+ }++ function releaseClickSuppression(event?: MouseEvent) {+ if (event && event.button !== 0) return;+ clearTimeout(suppressTimer);+ suppressTimer = setTimeout(clearClickSuppression, 0);+ }++ function cancel() {+ if (source.value) {+ // Escape/refresh can cancel while the mouse is still held. Suppress the+ // eventual release click, but allow the next independent mouse gesture.+ suppressClick = true;+ document.addEventListener("mouseup", releaseClickSuppression, true);+ document.addEventListener("mousedown", clearClickSuppression, true);+ document.body.style.cursor = previousCursor;+ document.body.style.userSelect = previousUserSelect;+ }+ if (!suppressClick) {+ document.removeEventListener("click", suppressDragClick, true);+ document.removeEventListener("dblclick", suppressDragClick, true);+ }+ source.value = null;+ target.value = null;+ pending = null;+ ghost?.remove();+ ghost = null;+ document.removeEventListener("mousemove", move, true);+ document.removeEventListener("mouseup", end, true);+ document.removeEventListener("keydown", keydown, true);+ window.removeEventListener("blur", cancel);+ }++ function resolveTarget(x: number, y: number): DropTarget | null {+ const row = document.elementFromPoint(x, y)?.closest<HTMLElement>("[data-sql-file-row]");+ if (!row || !options.tree.value?.contains(row) || !source.value) return null;+ const file = options.files().find((item) => item.root === row.dataset.sqlFileRoot && item.path === row.dataset.sqlFilePath);+ if (!file || file.root !== source.value.root || file.path === source.value.path || sqlFileParentPath(file.path) !== sqlFileParentPath(source.value.path)) return null;+ const rect = row.getBoundingClientRect();+ return { ...file, position: y < rect.top + rect.height / 2 ? "before" : "after" };+ }++ function move(event: MouseEvent) {+ if (!pending || !options.enabled() || (event.buttons & 1) === 0) {+ cancel();+ return;+ }+ if (!source.value) {+ if (Math.abs(event.clientX - pending.x) < 5 && Math.abs(event.clientY - pending.y) < 5) return;+ source.value = { root: pending.root, path: pending.path, name: pending.name };+ previousCursor = document.body.style.cursor;+ previousUserSelect = document.body.style.userSelect;+ document.body.style.cursor = "grabbing";+ document.body.style.userSelect = "none";+ ghost = document.createElement("div");+ ghost.textContent = pending.name;+ ghost.className = "pointer-events-none fixed z-[9999] max-w-[220px] truncate rounded border bg-background px-2 py-1 text-sm shadow-md opacity-90";+ document.body.appendChild(ghost);+ }+ event.preventDefault();+ if (ghost) {+ ghost.style.left = `${event.clientX + 8}px`;+ ghost.style.top = `${event.clientY - 12}px`;+ }+ target.value = resolveTarget(event.clientX, event.clientY);+ }++ function end(event: MouseEvent) {+ if (event.button !== 0) return;+ const dragged = source.value;+ const destination = options.enabled() ? resolveTarget(event.clientX, event.clientY) : null;+ cancel();+ if (suppressClick) releaseClickSuppression();+ if (dragged && destination) options.drop(dragged, destination);+ }++ function keydown(event: KeyboardEvent) {+ if (event.key !== "Escape") return;+ event.preventDefault();+ event.stopImmediatePropagation();+ cancel();+ }++ function start(event: MouseEvent, root: string, path: string) {+ if (!options.enabled() || event.button !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return;+ if ((event.target as HTMLElement | null)?.closest("button, input, select, textarea, [contenteditable='true']")) return;+ const file = options.files().find((item) => item.root === root && item.path === path);+ if (!file) return;+ cancel();+ pending = { ...file, x: event.clientX, y: event.clientY };+ document.addEventListener("mousemove", move, true);+ document.addEventListener("mouseup", end, true);+ document.addEventListener("keydown", keydown, true);+ document.addEventListener("click", suppressDragClick, true);+ document.addEventListener("dblclick", suppressDragClick, true);+ window.addEventListener("blur", cancel);+ }++ watch(+ options.enabled,+ (enabled) => {+ if (!enabled) cancel();+ },+ { flush: "sync" },+ );++ onBeforeUnmount(() => {+ cancel();+ clearClickSuppression();+ });++ return { source, target, start, cancel };+}diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex 84e05b2b60..e5e905aee2 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -6898,6 +6898,9 @@ export default withEnglishFallback({completedWithErrors: "İcra tamamlandı: {succeeded} uğurlu, {failed} uğursuz",},sqlFileTree: {+ sortManual: "Əl ilə sıralama",+ sortManualHint: "Sıralamaq üçün eyni qovluqdakı faylları sürükləyin. Axtarış zamanı sürükləmə deaktivdir.",+ sortSaveFailed: "Fayl sıralama seçimini saxlamaq mümkün olmadı.",folderNameInvalid: "Yol deyil, tək qovluq adı daxil edin.",folderNameExcluded: "Bu qovluq adı SQL fayl brauzerindən istisna edilib.",folderDepthExceeded: "Maksimum qovluq dərinliyinə çatılıb.",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex bbea9e19cc..04d8396c7e 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -8718,6 +8718,9 @@ export default {completedWithErrors: "Execution completed: {succeeded} succeeded, {failed} failed",},sqlFileTree: {+ sortManual: "Manual order",+ sortManualHint: "Drag files within the same folder to reorder. Dragging is disabled while searching.",+ sortSaveFailed: "Could not save the file sorting preference.",folderNameInvalid: "Enter a single folder name, not a path.",folderNameExcluded: "This folder name is excluded from the SQL file browser.",folderDepthExceeded: "The maximum folder depth has been reached.",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex 29b9836a04..d0c3037ff4 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -10621,6 +10621,9 @@ export default withEnglishFallback({actionSuccess: '{action} completado para "{name}".',},sqlFileTree: {+ sortManual: "Orden manual",+ sortManualHint: "Arrastra archivos dentro de la misma carpeta para reordenarlos. No se puede arrastrar durante la búsqueda.",+ sortSaveFailed: "No se pudo guardar la preferencia de orden de los archivos.",folderNameInvalid: "Introduzca un solo nombre de carpeta, no una ruta.",folderNameExcluded: "Este nombre de carpeta está excluido del explorador de archivos SQL.",folderDepthExceeded: "Se alcanzó la profundidad máxima de carpetas.",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex a238d3ea82..9bbaf826fa 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -7599,6 +7599,9 @@ export default withEnglishFallback({completedWithErrors: "Eksekusi selesai: {succeeded} berhasil, {failed} gagal",},sqlFileTree: {+ sortManual: "Urutan manual",+ sortManualHint: "Seret file dalam folder yang sama untuk mengubah urutan. Penyeretan dinonaktifkan saat mencari.",+ sortSaveFailed: "Tidak dapat menyimpan preferensi urutan file.",folderNameInvalid: "Masukkan satu nama folder, bukan jalur.",folderNameExcluded: "Nama folder ini dikecualikan dari penjelajah file SQL.",folderDepthExceeded: "Kedalaman folder maksimum telah tercapai.",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex bb8d7fba9e..5646afcbc8 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -10369,6 +10369,9 @@ export default withEnglishFallback({actionSuccess: '{action} completato per "{name}".',},sqlFileTree: {+ sortManual: "Ordine manuale",+ sortManualHint: "Trascina i file nella stessa cartella per riordinarli. Il trascinamento è disabilitato durante la ricerca.",+ sortSaveFailed: "Impossibile salvare la preferenza di ordinamento dei file.",folderNameInvalid: "Inserisci un solo nome di cartella, non un percorso.",folderNameExcluded: "Questo nome di cartella è escluso dal browser di file SQL.",folderDepthExceeded: "È stata raggiunta la profondità massima delle cartelle.",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex 7bef761ac9..e3568f7428 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -10405,6 +10405,9 @@ export default withEnglishFallback({actionSuccess: "「{name}」の{action}が完了しました。",},sqlFileTree: {+ sortManual: "手動並べ替え",+ sortManualHint: "同じフォルダー内のファイルをドラッグして並べ替えます。検索中はドラッグできません。",+ sortSaveFailed: "ファイルの並べ替え設定を保存できませんでした。",folderNameInvalid: "パスではなく単一のフォルダー名を入力してください。",folderNameExcluded: "このフォルダー名は SQL ファイルパネルの表示対象外です。",folderDepthExceeded: "フォルダーの最大階層に達しました。",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 08b89c7d32..1caaeeac32 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -7522,6 +7522,9 @@ export default withEnglishFallback({completedWithErrors: "실행 완료: 성공 {succeeded}개, 실패 {failed}개",},sqlFileTree: {+ sortManual: "수동 정렬",+ sortManualHint: "같은 폴더의 파일을 드래그하여 순서를 변경합니다. 검색 중에는 드래그할 수 없습니다.",+ sortSaveFailed: "파일 정렬 설정을 저장할 수 없습니다.",folderNameInvalid: "경로가 아닌 폴더 이름 하나를 입력하세요.",folderNameExcluded: "이 폴더 이름은 SQL 파일 패널에서 제외됩니다.",folderDepthExceeded: "최대 폴더 깊이에 도달했습니다.",diff --git a/apps/desktop/src/i18n/locales/pl.ts b/apps/desktop/src/i18n/locales/pl.tsindex 1b2979d4ec..d0f97aa1ef 100644--- a/apps/desktop/src/i18n/locales/pl.ts+++ b/apps/desktop/src/i18n/locales/pl.ts@@ -7653,6 +7653,9 @@ export default withEnglishFallback({totalFiles: "Pliki: {count}",},sqlFileTree: {+ sortManual: "Kolejność ręczna",+ sortManualHint: "Przeciągaj pliki w tym samym folderze, aby zmienić kolejność. Przeciąganie jest wyłączone podczas wyszukiwania.",+ sortSaveFailed: "Nie udało się zapisać ustawienia sortowania plików.",title: "Aktualizacja zabezpieczeń danych",storageHelp: "Są to rzeczywiste pliki .sql na dysku otwarte przez „Otwórz folder”. Zmiany zapisywane są bezpośrednio w pliku źródłowym.",openFolder: "Otwórz folder",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex 42d2aa5644..2fc26f9499 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -10365,6 +10365,9 @@ export default withEnglishFallback({actionSuccess: '{action} concluído para "{name}".',},sqlFileTree: {+ sortManual: "Ordem manual",+ sortManualHint: "Arraste arquivos na mesma pasta para reordenar. Não é possível arrastar durante a pesquisa.",+ sortSaveFailed: "Não foi possível salvar a preferência de ordenação dos arquivos.",folderNameInvalid: "Digite um único nome de pasta, não um caminho.",folderNameExcluded: "Este nome de pasta é excluído do navegador de arquivos SQL.",folderDepthExceeded: "A profundidade máxima de pastas foi atingida.",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex 78eee031c6..1c58eb4a5e 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -8964,6 +8964,9 @@ export default withEnglishFallback({completedWithErrors: "Выполнение завершено: успешно {succeeded}, с ошибкой {failed}",},sqlFileTree: {+ sortManual: "Ручной порядок",+ sortManualHint: "Перетаскивайте файлы в одной папке для изменения порядка. Во время поиска перетаскивание отключено.",+ sortSaveFailed: "Не удалось сохранить настройку сортировки файлов.",folderNameInvalid: "Введите одно имя папки, а не путь.",folderNameExcluded: "Это имя папки исключено из обозревателя SQL-файлов.",folderDepthExceeded: "Достигнута максимальная глубина папок.",diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.tsindex fec95f42e0..a3bd02e874 100644--- a/apps/desktop/src/i18n/locales/th.ts+++ b/apps/desktop/src/i18n/locales/th.ts@@ -9324,6 +9324,9 @@ export default withEnglishFallback({completedWithErrors: "การเรียกใช้เสร็จสิ้น: สำเร็จ {succeeded}, ล้มเหลว {failed}",},sqlFileTree: {+ sortManual: "เรียงลำดับด้วยตนเอง",+ sortManualHint: "ลากไฟล์ในโฟลเดอร์เดียวกันเพื่อจัดลำดับใหม่ ไม่สามารถลากขณะค้นหาได้",+ sortSaveFailed: "ไม่สามารถบันทึกการตั้งค่าการเรียงลำดับไฟล์ได้",locateActiveFile: "ค้นหาตำแหน่งไฟล์ปัจจุบัน",activeFileNotFound: "ไม่พบไฟล์ปัจจุบัน ตรวจสอบว่าไฟล์มีอยู่หรือถูกซ่อนโดยตัวกรองไฟล์หรือไม่",title: "ไฟล์ SQL",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex 9243cc2ba7..dd9b1cdfe7 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -6778,6 +6778,9 @@ export default withEnglishFallback({completedWithErrors: "Çalıştırma tamamlandı: {succeeded} başarılı, {failed} başarısız",},sqlFileTree: {+ sortManual: "Elle sıralama",+ sortManualHint: "Sıralamayı değiştirmek için aynı klasördeki dosyaları sürükleyin. Arama sırasında sürükleme devre dışıdır.",+ sortSaveFailed: "Dosya sıralama tercihi kaydedilemedi.",folderNameInvalid: "Yol yerine tek bir klasör adı girin.",folderNameExcluded: "Bu klasör adı SQL dosya tarayıcısından hariç tutulur.",folderDepthExceeded: "Maksimum klasör derinliğine ulaşıldı.",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 607f459cbf..97888461af 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -8686,6 +8686,9 @@ export default withEnglishFallback({completedWithErrors: "执行完成:成功 {succeeded} 条,失败 {failed} 条",},sqlFileTree: {+ sortManual: "手动排序",+ sortManualHint: "拖拽同一目录中的文件调整顺序;搜索期间不可拖拽。",+ sortSaveFailed: "无法保存文件排序偏好。",folderNameInvalid: "请输入单个文件夹名称,不能包含路径。",folderNameExcluded: "此文件夹名称被 SQL 文件面板排除。",folderDepthExceeded: "已达到文件夹最大层级。",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 2ecb66f640..e8e3636408 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -10375,6 +10375,9 @@ export default withEnglishFallback({actionSuccess: "已完成對「{name}」的{action}。",},sqlFileTree: {+ sortManual: "手動排序",+ sortManualHint: "拖曳同一目錄中的檔案調整順序;搜尋期間無法拖曳。",+ sortSaveFailed: "無法儲存檔案排序偏好。",folderNameInvalid: "請輸入單一資料夾名稱,不能包含路徑。",folderNameExcluded: "此資料夾名稱被 SQL 檔案面板排除。",folderDepthExceeded: "已達到資料夾最大層級。",diff --git a/apps/desktop/src/lib/sql/__tests__/sqlFileTreeFilter.spec.ts b/apps/desktop/src/lib/sql/__tests__/sqlFileTreeFilter.spec.tsindex 6f95c4a767..0eac710b16 100644--- a/apps/desktop/src/lib/sql/__tests__/sqlFileTreeFilter.spec.ts+++ b/apps/desktop/src/lib/sql/__tests__/sqlFileTreeFilter.spec.ts@@ -147,6 +147,16 @@ describe("sqlFileTreeFilter", () => {expect(result.matchCount).toBeGreaterThan(0);});+ it("preserves manual order for content-only matches", () => {+ const manualOrder = { "/sql/queries": ["/sql/queries/select_user.sql", "/sql/queries/get_orders.sql"] };+ const result = filterAndSortSqlFileEntries(sampleEntries, "needle", "manual", new Set(["/sql/queries/get_orders.sql", "/sql/queries/select_user.sql"]), manualOrder);++ expect(result.entries.map((entry) => entry.name)).toEqual(["queries"]);+ expect(result.entries[0].children.map((entry) => entry.name)).toEqual(["select_user.sql", "get_orders.sql"]);+ expect(result.autoExpanded.has("/sql/queries")).toBe(true);+ expect(result.matchCount).toBe(2);+ });+it("normalizes entry paths before comparing them with the content-match set", () => {// Scanned entries keep native separators on Windows while content-search// paths are normalized, so the comparison has to normalize the entry side.diff --git a/apps/desktop/src/lib/sql/sqlFileTreeFilter.ts b/apps/desktop/src/lib/sql/sqlFileTreeFilter.tsindex 4fc96164a4..a2683f1f32 100644--- a/apps/desktop/src/lib/sql/sqlFileTreeFilter.ts+++ b/apps/desktop/src/lib/sql/sqlFileTreeFilter.ts@@ -1,20 +1,21 @@import type { SqlFileEntry } from "@/lib/backend/api";import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";import { normalizeExternalSqlPath } from "@/lib/sql/sqlFileOpen";+import type { SqlFileOrder } from "@/lib/sqlFile/sqlFileOrder";const SORT_ORDER_STORAGE_KEY = "dbx-sql-file-sort-order";-export type SqlFileSortOrder = "asc" | "desc";+export type SqlFileSortOrder = "asc" | "desc" | "manual";export const DEFAULT_SQL_FILE_SORT_ORDER: SqlFileSortOrder = "asc";-/** Read the sort order ("asc" or "desc") for external SQL files. */+/** Read the name or manual sort order for external SQL files. */export function getSqlFileSortOrder(): SqlFileSortOrder {const order = safeLocalStorageGet(SORT_ORDER_STORAGE_KEY)?.trim();- return order === "desc" ? "desc" : DEFAULT_SQL_FILE_SORT_ORDER;+ return order === "desc" || order === "manual" ? order : DEFAULT_SQL_FILE_SORT_ORDER;}/** Persist the sort order for external SQL files. */-export function saveSqlFileSortOrder(order: SqlFileSortOrder): void {- safeLocalStorageSet(SORT_ORDER_STORAGE_KEY, order === "desc" ? "desc" : "asc");+export function saveSqlFileSortOrder(order: SqlFileSortOrder): boolean {+ return safeLocalStorageSet(SORT_ORDER_STORAGE_KEY, order);}export interface SqlFileFilterResult {@@ -26,12 +27,17 @@ export interface SqlFileFilterResult {/*** Compare two SqlFileEntry nodes for ordering.* Folders/directories always appear before files.- * Within the same kind, names are compared naturally (e.g. file2 < file10).+ * Manual file ranks take precedence; otherwise compare names naturally (file2 < file10).*/-export function compareSqlFileEntries(a: SqlFileEntry, b: SqlFileEntry, order: SqlFileSortOrder = "asc"): number {+export function compareSqlFileEntries(a: SqlFileEntry, b: SqlFileEntry, order: SqlFileSortOrder = "asc", ranks: ReadonlyMap<string, number> = new Map()): number {if (a.is_dir !== b.is_dir) {return a.is_dir ? -1 : 1;}+ if (order === "manual" && !a.is_dir) {+ const aRank = ranks.get(normalizeExternalSqlPath(a.path));+ const bRank = ranks.get(normalizeExternalSqlPath(b.path));+ if (aRank !== undefined || bRank !== undefined) return (aRank ?? Number.MAX_SAFE_INTEGER) - (bRank ?? Number.MAX_SAFE_INTEGER);+ }let cmp = a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: "base" });if (cmp === 0) {cmp = a.name.localeCompare(b.name);@@ -40,16 +46,16 @@ export function compareSqlFileEntries(a: SqlFileEntry, b: SqlFileEntry, order: S}/**- * Recursively sorts SQL file entries by name (folders first) in ascending or descending order.+ * Recursively sorts SQL file entries, preserving directories first in every mode.* Returns a new array and new entry objects for modified directories (immutable).*/-export function recursivelySortSqlFileEntries(entries: SqlFileEntry[], order: SqlFileSortOrder = "asc"): SqlFileEntry[] {- const sorted = [...entries].sort((a, b) => compareSqlFileEntries(a, b, order));+export function recursivelySortSqlFileEntries(entries: SqlFileEntry[], order: SqlFileSortOrder = "asc", ranks: ReadonlyMap<string, number> = new Map()): SqlFileEntry[] {+ const sorted = [...entries].sort((a, b) => compareSqlFileEntries(a, b, order, ranks));return sorted.map((entry) => {if (entry.is_dir && entry.children && entry.children.length > 0) {return {...entry,- children: recursivelySortSqlFileEntries(entry.children, order),+ children: recursivelySortSqlFileEntries(entry.children, order, ranks),};}return entry;@@ -82,10 +88,14 @@ function collectMatchingDescendantDirPaths(items: SqlFileEntry[], q: string, aut* the tree consistent with the snippets rendered under the file row, and makes* ancestor directories auto-expand so the hit is actually visible.*/-export function filterAndSortSqlFileEntries(entries: SqlFileEntry[], query: string, order: SqlFileSortOrder = "asc", contentMatchPaths?: ReadonlySet<string>): SqlFileFilterResult {+export function filterAndSortSqlFileEntries(entries: SqlFileEntry[], query: string, order: SqlFileSortOrder = "asc", contentMatchPaths?: ReadonlySet<string>, manualOrder: SqlFileOrder = {}): SqlFileFilterResult {+ const ranks = new Map<string, number>();+ if (order === "manual") {+ for (const paths of Object.values(manualOrder)) paths.forEach((path, index) => ranks.set(path, index));+ }const trimmed = query.trim();if (!trimmed) {- const sorted = recursivelySortSqlFileEntries(entries, order);+ const sorted = recursivelySortSqlFileEntries(entries, order, ranks);let count = 0;const countNodes = (items: SqlFileEntry[]) => {for (const item of items) {@@ -129,7 +139,7 @@ export function filterAndSortSqlFileEntries(entries: SqlFileEntry[], query: stricollectMatchingDescendantDirPaths(item.children, q, autoExpanded);result.push({...item,- children: recursivelySortSqlFileEntries(item.children, order),+ children: recursivelySortSqlFileEntries(item.children, order, ranks),});} else {result.push(item);@@ -147,7 +157,7 @@ export function filterAndSortSqlFileEntries(entries: SqlFileEntry[], query: stri}}- result.sort((a, b) => compareSqlFileEntries(a, b, order));+ result.sort((a, b) => compareSqlFileEntries(a, b, order, ranks));return result;}diff --git a/apps/desktop/src/lib/sqlFile/sqlFileOrder.ts b/apps/desktop/src/lib/sqlFile/sqlFileOrder.tsnew file mode 100644index 0000000000..9fa14a2aa6--- /dev/null+++ b/apps/desktop/src/lib/sqlFile/sqlFileOrder.ts@@ -0,0 +1,75 @@+import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";+import { normalizeExternalSqlPath, relocateExternalSqlPathWithinFolder } from "@/lib/sql/sqlFileOpen";++const STORAGE_KEY = "dbx-sql-file-manual-order";+export type SqlFileOrder = Record<string, string[]>;++export function sqlFileParentPath(path: string): string {+ const normalized = normalizeExternalSqlPath(path);+ const separator = normalized.lastIndexOf("/");+ return separator === 0 ? "/" : normalized.slice(0, separator);+}++export function getSqlFileOrder(): SqlFileOrder {+ const result: SqlFileOrder = Object.create(null);+ try {+ const stored = JSON.parse(safeLocalStorageGet(STORAGE_KEY) || "null");+ if (stored?.version !== 1 || !stored.directories || typeof stored.directories !== "object" || Array.isArray(stored.directories)) return result;+ for (const [directory, paths] of Object.entries(stored.directories)) {+ if (!Array.isArray(paths)) continue;+ const parent = normalizeExternalSqlPath(directory);+ const files = paths+ .filter((path): path is string => typeof path === "string" && !!path.trim())+ .map(normalizeExternalSqlPath)+ .filter((path) => sqlFileParentPath(path) === parent);+ if (files.length) result[parent] = [...new Set(files)];+ }+ } catch {+ // An invalid preference must not prevent the file tree from opening.+ }+ return result;+}++export function saveSqlFileOrder(order: SqlFileOrder): boolean {+ return safeLocalStorageSet(STORAGE_KEY, JSON.stringify({ version: 1, directories: order }));+}++/** Keep filtered-out paths: a scanner result is not a complete directory inventory. */+export function reorderSqlFiles(order: SqlFileOrder, siblings: readonly string[], sourcePath: string, targetPath: string, position: "before" | "after"): SqlFileOrder | null {+ const source = normalizeExternalSqlPath(sourcePath);+ const target = normalizeExternalSqlPath(targetPath);+ const parent = sqlFileParentPath(source);+ const visible = [...new Set(siblings.map(normalizeExternalSqlPath))];+ if (source === target || parent !== sqlFileParentPath(target) || !visible.includes(source) || !visible.includes(target)) return null;+ if (visible.some((path) => sqlFileParentPath(path) !== parent)) return null;+ // Start from the displayed order, including when dragging out of a name sort.+ // Replace only visible slots so filtered-out files keep their relative order.+ const visiblePaths = new Set(visible);+ let visibleIndex = 0;+ const merged = [...new Set(order[parent] ?? [])].map((path) => (visiblePaths.has(path) ? visible[visibleIndex++] : path));+ merged.push(...visible.slice(visibleIndex));+ const reordered = merged.filter((path) => path !== source);+ const index = reordered.indexOf(target);+ reordered.splice(index + (position === "after" ? 1 : 0), 0, source);+ return { ...order, [parent]: reordered };+}++/** Only explicit successful mutations can remove paths or migrate their identities. */+export function remapSqlFileOrder(order: SqlFileOrder, previousPath: string, nextPath?: string, directory = false): SqlFileOrder {+ const previous = normalizeExternalSqlPath(previousPath);+ let changed = false;+ const mapPath = (path: string): string | null => {+ if (path !== previous && !(directory && path.startsWith(`${previous}/`))) return path;+ changed = true;+ if (!nextPath) return null;+ return directory ? normalizeExternalSqlPath(relocateExternalSqlPathWithinFolder(path, previous, nextPath) ?? path) : normalizeExternalSqlPath(nextPath);+ };+ const result: SqlFileOrder = Object.create(null);+ for (const [parent, paths] of Object.entries(order)) {+ const nextParent = directory ? mapPath(parent) : parent;+ if (nextParent === null) continue;+ const nextPaths = paths.map(mapPath).filter((path): path is string => path !== null);+ if (nextPaths.length) result[nextParent] = [...new Set([...(result[nextParent] ?? []), ...nextPaths])];+ }+ return changed ? result : order;+}