feat: 增加防止backspace误删除节点的设置项、引用块能够右键跳转

Author: Littlefean

app/src/components/context-menu-content.tsx

@@ -77,6 +77,7 @@ import {
   Ellipsis,
   SquareDashedBottomCode,
   RefreshCcwDot,
+  CornerUpRight,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
@@ -655,6 +656,20 @@ export default function MyContextMenuContent() {
             <RefreshCcwDot />
             刷新引用块
           </Item>
+          <Item
+            onClick={() => {
+              p.stageManager
+                .getSelectedEntities()
+                .filter((it) => it instanceof ReferenceBlockNode)
+                .filter((it) => it.isSelected)
+                .forEach((it) => {
+                  it.goToSource();
+                });
+            }}
+          >
+            <CornerUpRight />
+            进入该引用块所在的文件
+          </Item>
         </>
       )}
       {/* 存在选中的 Edge */}

app/src/core/render/domElement/inputElement.tsx

@@ -235,11 +235,16 @@ export class InputElement {
         } else if (event.code === "Backspace") {
           // event.preventDefault();  // 不能这样否则就删除不了了。
           if (textareaElement.value === "") {
-            // 已经要删空了。
-            resolve("");
-            onChange("", textareaElement);
-            removeElement();
-            this.project.stageManager.deleteSelectedStageObjects();
+            if (Settings.textNodeBackspaceDeleteWhenEmpty) {
+              // 已经要删空了。
+              resolve("");
+              onChange("", textareaElement);
+              removeElement();
+              this.project.stageManager.deleteSelectedStageObjects();
+            } else {
+              // 整一个特效
+              this.addFailEffect(false);
+            }
           }
         } else if (event.key === "Tab") {
           // 防止tab切换到其他按钮
@@ -322,12 +327,14 @@ export class InputElement {
     }
   }
 
-  private addFailEffect() {
+  private addFailEffect(withToast = true) {
     const textNodes = this.project.stageManager.getTextNodes().filter((textNode) => textNode.isEditing);
     for (const textNode of textNodes) {
       this.project.effects.addEffect(EntityShakeEffect.fromEntity(textNode));
     }
-    toast("您可能记错了退出或换行的控制设置");
+    if (withToast) {
+      toast("您可能记错了退出或换行的控制设置");
+    }
   }
 
   constructor(private readonly project: Project) {}

app/src/core/service/Settings.tsx

@@ -93,7 +93,7 @@ export const settingsSchema = z.object({
     .union([z.literal("trackpadIntAndWheelFloat"), z.literal("tarckpadFloatAndWheelInt")])
     .default("trackpadIntAndWheelFloat"),
   macTrackpadScaleSensitivity: z.number().min(0).max(1).multipleOf(0.001).default(0.5),
-  macEnableControlToCut: z.boolean().default(true),
+  macEnableControlToCut: z.boolean().default(false),
   allowMoveCameraByWSAD: z.boolean().default(false),
   allowGlobalHotKeys: z.boolean().default(true),
   cameraFollowsSelectedNodeOnArrowKeys: z.boolean().default(false),
@@ -124,6 +124,7 @@ export const settingsSchema = z.object({
     .default("enter"),
   textNodeSelectAllWhenStartEditByMouseClick: z.boolean().default(true),
   textNodeSelectAllWhenStartEditByKeyboard: z.boolean().default(false),
+  textNodeBackspaceDeleteWhenEmpty: z.boolean().default(false),
   allowAddCycleEdge: z.boolean().default(false),
   autoLayoutWhenTreeGenerate: z.boolean().default(true),
   enableBackslashGenerateNodeInInput: z.boolean().default(false),

app/src/core/service/SettingsIcons.tsx

@@ -12,6 +12,7 @@ import {
   Columns4,
   Crosshair,
   Database,
+  Delete,
   FileStack,
   Fullscreen,
   Grab,
@@ -106,6 +107,7 @@ export const settingsIcons = {
   textNodeExitEditMode: ListCheck,
   textNodeSelectAllWhenStartEditByMouseClick: TextCursorInput,
   textNodeSelectAllWhenStartEditByKeyboard: TextCursorInput,
+  textNodeBackspaceDeleteWhenEmpty: Delete,
   allowAddCycleEdge: RotateCw,
   autoLayoutWhenTreeGenerate: ListTree,
   enableBackslashGenerateNodeInInput: Keyboard,

app/src/core/service/dataGenerateService/crossFileContentQuery.tsx

@@ -15,7 +15,7 @@ export namespace CrossFileContentQuery {
   const CACHE_TIME = 10000;
 
   /**
-   * 获取指定文件中的所有Section框名称
+   * 获取指定.prg 文件中的所有的 Section框名称
    * @param fileName 文件名
    * @returns Section框名称数组
    */

app/src/core/stage/stageObject/entity/ReferenceBlockNode.tsx

@@ -1,7 +1,10 @@
 import { Project } from "@/core/Project";
+import { RecentFileManager } from "@/core/service/dataFileService/RecentFileManager";
 import { GenerateSectionScreenshot } from "@/core/service/dataGenerateService/generateSectionScreenshot";
+import { onOpenFile } from "@/core/service/GlobalMenu";
 import { ConnectableEntity } from "@/core/stage/stageObject/abstract/ConnectableEntity";
 import { CollisionBox } from "@/core/stage/stageObject/collisionBox/collisionBox";
+import { PathString } from "@/utils/pathString";
 import { Vector } from "@graphif/data-structures";
 import { id, passExtraAtArg1, passObject, serializable } from "@graphif/serializer";
 import { Rectangle } from "@graphif/shapes";
@@ -156,4 +159,23 @@ export class ReferenceBlockNode extends ConnectableEntity {
   async refresh() {
     await this.generateScreenshot();
   }
+
+  /**
+   * 用户点击这个引用块，跳转到对应的跨文件的 地方
+   */
+  async goToSource() {
+    if (this.state !== "success") {
+      return;
+    }
+    const recentFiles = await RecentFileManager.getRecentFiles();
+    const file = recentFiles.find(
+      (file) =>
+        PathString.getFileNameFromPath(file.uri.path) === this.fileName ||
+        PathString.getFileNameFromPath(file.uri.fsPath) === this.fileName,
+    );
+    if (!file) {
+      return;
+    }
+    onOpenFile(file.uri, "ReferenceBlockNode跳转打开-prg文件");
+  }
 }

app/src/locales/en.yml

@@ -445,6 +445,10 @@ settings:
     title: Select All Text When Starting Edit by Keyboard
     description: |
       When enabled, all text content will be selected when you press the key to enter text node editing mode.
+  textNodeBackspaceDeleteWhenEmpty:
+    title: Delete Text Node When Backspace Pressed on Empty Content
+    description: |
+      When enabled, pressing the Backspace key on an empty text node in edit mode will delete the entire node.
   enableDragAutoAlign:
     title: Enable Automatic Alignment When Dragging Nodes
     description: |

app/src/locales/zh_CN.yml

@@ -550,6 +550,10 @@ settings:
     title: 文本节点通过键盘开始编辑时自动全选内容
     description: |
       开启后，在您按下文本节点编辑模式的按键时，会全选文本内容
+  textNodeBackspaceDeleteWhenEmpty:
+    title: 当在编辑模式下文本节点无内容时按Backspace键自动删除整个节点
+    description: |
+      开启后，在编辑文本节点且内容为空时，按下Backspace键会自动删除整个节点
   enableDragAutoAlign:
     title: 鼠标拖动自动吸附对齐节点
     description: |

app/src/sub/SettingsWindow/settings.tsx

@@ -269,6 +269,7 @@ const categories = {
       "textNodeExitEditMode",
       "textNodeSelectAllWhenStartEditByMouseClick",
       "textNodeSelectAllWhenStartEditByKeyboard",
+      "textNodeBackspaceDeleteWhenEmpty",
     ],
     edge: ["allowAddCycleEdge", "autoAdjustLineEndpointsByMouseTrack", "enableRightClickConnect"],
     generateNode: ["autoLayoutWhenTreeGenerate", "enableBackslashGenerateNodeInInput"],

app/src/utils/externalOpen.tsx

@@ -77,6 +77,7 @@ function splitDoubleQuote(str: string) {
 /**
  * 调用tauri框架的open方法
  * @param url
+ * @param project 之所以需要project参数，是因为需要根据project的uri来转换相对路径
  */
 function myOpen(url: string, project: Project) {
   const isValidURL = PathString.isValidURL(url);