feat: 增加带边扩散选择的四个快捷键

Author: Littlefean

app/src/core/service/controlService/keyboardOnlyEngine/selectChangeEngine.tsx

@@ -1,6 +1,7 @@
 import { Project, service } from "@/core/Project";
 import { RectangleTransformEffect } from "@/core/service/feedbackService/effectEngine/concrete/RectangleTransformEffect";
 import { ConnectableEntity } from "@/core/stage/stageObject/abstract/ConnectableEntity";
+import { Edge } from "@/core/stage/stageObject/association/Edge";
 import { Section } from "@/core/stage/stageObject/entity/Section";
 import { Direction } from "@/types/directions";
 import { Vector } from "@graphif/data-structures";
@@ -225,6 +226,63 @@ export class SelectChangeEngine {
     }
   }
 
+  /**
+   * 扩散选择（节点和连线交替）
+   * 正向：节点 -> 出边 -> 子节点
+   * 反向：节点 -> 入边 -> 父节点
+   */
+  expandSelectWithEdge(isKeepExpand = false, reversed: boolean = false) {
+    if (!this.project.keyboardOnlyEngine.isOpenning()) {
+      return;
+    }
+
+    const selectedEntities = this.project.stageManager
+      .getSelectedEntities()
+      .filter((entity) => entity instanceof ConnectableEntity);
+    const selectedEdges = this.project.stageManager
+      .getSelectedAssociations()
+      .filter((association) => association instanceof Edge);
+
+    if (selectedEntities.length === 0 && selectedEdges.length === 0) {
+      return;
+    }
+
+    const nextEntities = new Set<ConnectableEntity>();
+    const nextEdges = new Set<Edge>();
+
+    if (reversed) {
+      for (const selectedEntity of selectedEntities) {
+        this.project.graphMethods.edgeParentArray(selectedEntity).map((edge) => nextEdges.add(edge));
+      }
+      for (const selectedEdge of selectedEdges) {
+        nextEntities.add(selectedEdge.source);
+      }
+    } else {
+      for (const selectedEntity of selectedEntities) {
+        this.project.graphMethods.edgeChildrenArray(selectedEntity).map((edge) => nextEdges.add(edge));
+      }
+      for (const selectedEdge of selectedEdges) {
+        nextEntities.add(selectedEdge.target);
+      }
+    }
+
+    if (!isKeepExpand) {
+      for (const selectedEntity of selectedEntities) {
+        selectedEntity.isSelected = false;
+      }
+      for (const selectedEdge of selectedEdges) {
+        selectedEdge.isSelected = false;
+      }
+    }
+
+    for (const nextEntity of nextEntities) {
+      nextEntity.isSelected = true;
+    }
+    for (const nextEdge of nextEdges) {
+      nextEdge.isSelected = true;
+    }
+  }
+
   private afterSelect(
     selectedNodeRect: ConnectableEntity,
     newSelectedConnectableEntity: ConnectableEntity | null,

app/src/core/service/controlService/shortcutKeysEngine/shortcutKeysRegister.tsx

@@ -1471,6 +1471,46 @@ export const allKeyBinds: KeyBindItem[] = [
       project!.selectChangeEngine.expandSelect(true, true);
     },
   },
+  {
+    id: "expandSelectEntityWithEdge",
+    defaultKey: "e C-w",
+    icon: Link,
+    when: whenKeyboardOnlyOpenWithSelectedStageObjects,
+    onPress: (project) => {
+      if (!project!.keyboardOnlyEngine.isOpenning()) return;
+      project!.selectChangeEngine.expandSelectWithEdge(false, false);
+    },
+  },
+  {
+    id: "expandSelectEntityReversedWithEdge",
+    defaultKey: "e C-S-w",
+    icon: Link,
+    when: whenKeyboardOnlyOpenWithSelectedStageObjects,
+    onPress: (project) => {
+      if (!project!.keyboardOnlyEngine.isOpenning()) return;
+      project!.selectChangeEngine.expandSelectWithEdge(false, true);
+    },
+  },
+  {
+    id: "expandSelectEntityKeepLastSelectedWithEdge",
+    defaultKey: "e C-A-w",
+    icon: Link,
+    when: whenKeyboardOnlyOpenWithSelectedStageObjects,
+    onPress: (project) => {
+      if (!project!.keyboardOnlyEngine.isOpenning()) return;
+      project!.selectChangeEngine.expandSelectWithEdge(true, false);
+    },
+  },
+  {
+    id: "expandSelectEntityReversedKeepLastSelectedWithEdge",
+    defaultKey: "e C-A-S-w",
+    icon: Link,
+    when: whenKeyboardOnlyOpenWithSelectedStageObjects,
+    onPress: (project) => {
+      if (!project!.keyboardOnlyEngine.isOpenning()) return;
+      project!.selectChangeEngine.expandSelectWithEdge(true, true);
+    },
+  },
 
   /*------- 树/图 生成 -------*/
   {

app/src/locales/en.yml

@@ -1653,6 +1653,26 @@ keyBinds:
       If the current selection is graffiti, it will select entities touched by the graffiti.
       If the current selection is an entity, it will select all graffiti that touch it.
       Pressing multiple times will alternate the diffusion selection
+  expandSelectEntityWithEdge:
+    title: Expand Selection Across Nodes and Edges
+    description: |
+      Expands the selection step by step along graph connections.
+      In forward mode, each press alternates through "node -> outgoing edge -> child node".
+  expandSelectEntityReversedWithEdge:
+    title: Reverse Expand Selection Across Nodes and Edges
+    description: |
+      Expands the selection backward step by step along graph connections.
+      In reverse mode, each press alternates through "node -> incoming edge -> parent node".
+  expandSelectEntityKeepLastSelectedWithEdge:
+    title: Expand Selection Across Nodes and Edges (Keep Current Selection)
+    description: |
+      Expands the selection step by step along graph connections.
+      In forward mode, each press alternates through "node -> outgoing edge -> child node" while keeping the current selection.
+  expandSelectEntityReversedKeepLastSelectedWithEdge:
+    title: Reverse Expand Selection Across Nodes and Edges (Keep Current Selection)
+    description: |
+      Expands the selection backward step by step along graph connections.
+      In reverse mode, each press alternates through "node -> incoming edge -> parent node" while keeping the current selection.
   clickAppMenuSettingsButton:
     title: Open settings page
     description: "When this key is pressed, the settings page opens without mouse\n"

app/src/locales/zh_CN.yml

@@ -1815,6 +1815,26 @@ keyBinds:
     title: 反向扩散选择节点（保留当前节点的选择状态）
     description: |
       按下后，实体的选择状态会转移到父级节点上，同时保留当前节点的选择状态
+  expandSelectEntityWithEdge:
+    title: 扩散选择节点与连线
+    description: |
+      按下后，选择状态会沿着连线逐步扩散。
+      正向扩散时，会在“节点 -> 出边 -> 子节点”之间交替前进。
+  expandSelectEntityReversedWithEdge:
+    title: 反向扩散选择节点与连线
+    description: |
+      按下后，选择状态会沿着连线逐步反向扩散。
+      反向扩散时，会在“节点 -> 入边 -> 父节点”之间交替前进。
+  expandSelectEntityKeepLastSelectedWithEdge:
+    title: 扩散选择节点与连线（保留当前选择）
+    description: |
+      按下后，选择状态会沿着连线逐步扩散。
+      正向扩散时，会在“节点 -> 出边 -> 子节点”之间交替前进，同时保留当前选择。
+  expandSelectEntityReversedKeepLastSelectedWithEdge:
+    title: 反向扩散选择节点与连线（保留当前选择）
+    description: |
+      按下后，选择状态会沿着连线逐步反向扩散。
+      反向扩散时，会在“节点 -> 入边 -> 父节点”之间交替前进，同时保留当前选择。
   CameraMoveUp:
     title: 向上移动视野
     description: 按下后，视野向上移动

app/src/locales/zh_TW.yml

@@ -1815,6 +1815,26 @@ keyBinds:
     title: 反向擴散選擇節點（保留當前節點的選擇狀態）
     description: |
       按下後，實體的選擇狀態會轉移到父級節點上，同時保留當前節點的選擇狀態
+  expandSelectEntityWithEdge:
+    title: 擴散選擇節點與連線
+    description: |
+      按下後，選擇狀態會沿著連線逐步擴散。
+      正向擴散時，會在“節點 -> 出邊 -> 子節點”之間交替前進。
+  expandSelectEntityReversedWithEdge:
+    title: 反向擴散選擇節點與連線
+    description: |
+      按下後，選擇狀態會沿著連線逐步反向擴散。
+      反向擴散時，會在“節點 -> 入邊 -> 父節點”之間交替前進。
+  expandSelectEntityKeepLastSelectedWithEdge:
+    title: 擴散選擇節點與連線（保留當前選擇）
+    description: |
+      按下後，選擇狀態會沿著連線逐步擴散。
+      正向擴散時，會在“節點 -> 出邊 -> 子節點”之間交替前進，同時保留當前選擇。
+  expandSelectEntityReversedKeepLastSelectedWithEdge:
+    title: 反向擴散選擇節點與連線（保留當前選擇）
+    description: |
+      按下後，選擇狀態會沿著連線逐步反向擴散。
+      反向擴散時，會在“節點 -> 入邊 -> 父節點”之間交替前進，同時保留當前選擇。
   CameraMoveUp:
     title: 向上移動視野
     description: 按下後，視野向上移動

app/src/locales/zh_TWC.yml

@@ -1739,6 +1739,18 @@ keyBinds:
   expandSelectEntityReversedKeepLastSelected:
     title: 反向擴散選擇節點（保留目前節點的選擇狀態）
     description: 按下後，實體的選取狀態會轉移到父節點上，同時保留目前節點的選取狀態
+  expandSelectEntityWithEdge:
+    title: 擴散選擇節點與連線
+    description: 按下後，選取狀態會沿著連線逐步擴散。正向擴散時，會在「節點 -> 出邊 -> 子節點」之間交替前進。
+  expandSelectEntityReversedWithEdge:
+    title: 反向擴散選擇節點與連線
+    description: 按下後，選取狀態會沿著連線逐步反向擴散。反向擴散時，會在「節點 -> 入邊 -> 父節點」之間交替前進。
+  expandSelectEntityKeepLastSelectedWithEdge:
+    title: 擴散選擇節點與連線（保留目前選擇）
+    description: 按下後，選取狀態會沿著連線逐步擴散。正向擴散時，會在「節點 -> 出邊 -> 子節點」之間交替前進，同時保留目前選擇。
+  expandSelectEntityReversedKeepLastSelectedWithEdge:
+    title: 反向擴散選擇節點與連線（保留目前選擇）
+    description: 按下後，選取狀態會沿著連線逐步反向擴散。反向擴散時，會在「節點 -> 入邊 -> 父節點」之間交替前進，同時保留目前選擇。
   CameraMoveUp:
     title: 向上移動視野
     description: 按下後，視野向上移動

app/src/sub/SettingsWindow/keybinds.tsx

@@ -673,6 +673,10 @@ export const shortcutKeysGroups: ShortcutKeysGroup[] = [
       "expandSelectEntityReversed",
       "expandSelectEntityKeepLastSelected",
       "expandSelectEntityReversedKeepLastSelected",
+      "expandSelectEntityWithEdge",
+      "expandSelectEntityReversedWithEdge",
+      "expandSelectEntityKeepLastSelectedWithEdge",
+      "expandSelectEntityReversedKeepLastSelectedWithEdge",
     ],
   },
   {