From 53239d91fb6d9e34e5ed10712032c594a715e2e6 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Tue, 2 Jun 2026 18:13:13 +0800 Subject: [PATCH] fix(sidebar): use filtered order for range selection --- .../src/components/sidebar/ConnectionTree.vue | 3 ++ .../src/components/sidebar/TreeItem.vue | 19 +++++----- apps/desktop/src/lib/sidebarTreeSelection.ts | 22 ++++++++++++ .../app-tests/sidebarTreeSelection.test.ts | 35 +++++++++++++++++++ 4 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 apps/desktop/src/lib/sidebarTreeSelection.ts create mode 100644 packages/app-tests/sidebarTreeSelection.test.ts diff --git a/apps/desktop/src/components/sidebar/ConnectionTree.vue b/apps/desktop/src/components/sidebar/ConnectionTree.vue index 3fda46931d..7375294447 100644 --- a/apps/desktop/src/components/sidebar/ConnectionTree.vue +++ b/apps/desktop/src/components/sidebar/ConnectionTree.vue @@ -160,6 +160,7 @@ const filteredNodes = computed(() => { }); const flatNodes = computed(() => flattenTree(filteredNodes.value)); +const visibleNodes = computed(() => flatNodes.value.map((item) => item.node)); const useVirtualTree = computed(() => shouldVirtualizeFlatTree(flatNodes.value.length)); const activeTab = computed(() => queryStore.tabs.find((tab) => tab.id === queryStore.activeTabId)); const sidebarTreeOverflowClass = computed(() => @@ -507,6 +508,7 @@ defineExpose({ focusSearch, createNewGroup }); :drag-disabled="isFiltering" :pending-rename="pendingRenameGroupId === item.node.id" :highlighted="highlightedNodeId === item.node.id" + :visible-nodes="visibleNodes" @node-toggled="onNodeToggled" @search-toggle="onSearchToggle" @rename-started="pendingRenameGroupId = null" @@ -527,6 +529,7 @@ defineExpose({ focusSearch, createNewGroup }); :drag-disabled="isFiltering" :pending-rename="pendingRenameGroupId === item.node.id" :highlighted="highlightedNodeId === item.id" + :visible-nodes="visibleNodes" @node-toggled="onNodeToggled" @search-toggle="onSearchToggle" @rename-started="pendingRenameGroupId = null" diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue index d826d82e39..9aa7b50a7b 100644 --- a/apps/desktop/src/components/sidebar/TreeItem.vue +++ b/apps/desktop/src/components/sidebar/TreeItem.vue @@ -120,6 +120,10 @@ import { hexToRgba } from "@/lib/color"; import { focusSidebarRenameInput } from "@/lib/sidebarRenameFocus"; import { hasTreeNodeDatabaseContext } from "@/lib/treeNodeContext"; import { sidebarDisplayTableName } from "@/lib/sidebarTableNameDisplay"; +import { + selectedTreeNodesInVisibleOrder as orderSelectedTreeNodes, + treeSelectionRangeIds, +} from "@/lib/sidebarTreeSelection"; import DangerConfirmDialog from "@/components/editor/DangerConfirmDialog.vue"; import ProcedureExecutionDialog from "@/components/objects/ProcedureExecutionDialog.vue"; import { isTauriRuntime } from "@/lib/tauriRuntime"; @@ -163,6 +167,7 @@ const props = defineProps<{ dragDisabled?: boolean; pendingRename?: boolean; highlighted?: boolean; + visibleNodes?: TreeNode[]; }>(); const emit = defineEmits<{ @@ -435,13 +440,12 @@ function runRowClickAction() { } function visibleTreeNodes(): TreeNode[] { + if (props.visibleNodes) return props.visibleNodes; return flattenTree(connectionStore.treeNodes).map((item) => item.node); } function selectedTreeNodesInVisibleOrder(): TreeNode[] { - const selectedIds = new Set(connectionStore.selectedTreeNodeIds); - if (!selectedIds.size) return []; - return visibleTreeNodes().filter((node) => selectedIds.has(node.id)); + return orderSelectedTreeNodes(visibleTreeNodes(), connectionStore.selectedTreeNodeIds); } function selectSingleTreeNode(node: TreeNode) { @@ -462,15 +466,12 @@ function toggleTreeNodeSelection(node: TreeNode) { function selectTreeNodeRange(node: TreeNode) { const visible = visibleTreeNodes(); const anchorId = connectionStore.treeSelectionAnchorId || connectionStore.selectedTreeNodeId || node.id; - const anchorIndex = visible.findIndex((item) => item.id === anchorId); - const currentIndex = visible.findIndex((item) => item.id === node.id); - if (anchorIndex < 0 || currentIndex < 0) { + if (!visible.some((item) => item.id === anchorId) || !visible.some((item) => item.id === node.id)) { selectSingleTreeNode(node); return; } - const start = Math.min(anchorIndex, currentIndex); - const end = Math.max(anchorIndex, currentIndex); - connectionStore.selectedTreeNodeIds = visible.slice(start, end + 1).map((item) => item.id); + const rangeIds = treeSelectionRangeIds(visible, node.id, anchorId, connectionStore.selectedTreeNodeId); + connectionStore.selectedTreeNodeIds = rangeIds; connectionStore.selectedTreeNodeId = node.id; } diff --git a/apps/desktop/src/lib/sidebarTreeSelection.ts b/apps/desktop/src/lib/sidebarTreeSelection.ts new file mode 100644 index 0000000000..d8c8d6fcc8 --- /dev/null +++ b/apps/desktop/src/lib/sidebarTreeSelection.ts @@ -0,0 +1,22 @@ +import type { TreeNode } from "@/types/database"; + +export function selectedTreeNodesInVisibleOrder(visibleNodes: TreeNode[], selectedIds: Iterable): TreeNode[] { + const ids = new Set(selectedIds); + if (!ids.size) return []; + return visibleNodes.filter((node) => ids.has(node.id)); +} + +export function treeSelectionRangeIds( + visibleNodes: TreeNode[], + currentId: string, + anchorId?: string | null, + selectedId?: string | null, +): string[] { + const anchor = anchorId || selectedId || currentId; + const anchorIndex = visibleNodes.findIndex((node) => node.id === anchor); + const currentIndex = visibleNodes.findIndex((node) => node.id === currentId); + if (anchorIndex < 0 || currentIndex < 0) return [currentId]; + const start = Math.min(anchorIndex, currentIndex); + const end = Math.max(anchorIndex, currentIndex); + return visibleNodes.slice(start, end + 1).map((node) => node.id); +} diff --git a/packages/app-tests/sidebarTreeSelection.test.ts b/packages/app-tests/sidebarTreeSelection.test.ts new file mode 100644 index 0000000000..5907363dcc --- /dev/null +++ b/packages/app-tests/sidebarTreeSelection.test.ts @@ -0,0 +1,35 @@ +import { strict as assert } from "node:assert"; +import test from "node:test"; +import { + selectedTreeNodesInVisibleOrder, + treeSelectionRangeIds, +} from "../../apps/desktop/src/lib/sidebarTreeSelection.ts"; +import type { TreeNode } from "../../apps/desktop/src/types/database.ts"; + +const nodes: TreeNode[] = [ + { id: "orders", label: "orders", type: "table" }, + { id: "order_lines", label: "order_lines", type: "table" }, + { id: "products", label: "products", type: "table" }, + { id: "customers", label: "customers", type: "table" }, +]; + +test("tree range selection uses the current visible node order", () => { + const filtered = [nodes[0], nodes[1], nodes[3]]; + + assert.deepEqual(treeSelectionRangeIds(filtered, "customers", "orders"), ["orders", "order_lines", "customers"]); +}); + +test("tree range selection falls back to the current node when the anchor is filtered out", () => { + const filtered = [nodes[1], nodes[3]]; + + assert.deepEqual(treeSelectionRangeIds(filtered, "customers", "orders"), ["customers"]); +}); + +test("selected tree nodes are ordered and limited by visible nodes", () => { + const filtered = [nodes[1], nodes[3]]; + + assert.deepEqual( + selectedTreeNodesInVisibleOrder(filtered, ["products", "customers", "order_lines"]).map((node) => node.id), + ["order_lines", "customers"], + ); +});