🐛 修复mac无法编辑section文字的功能

Author: Littlefean

app/src/core/render/canvas2d/entityRenderer/section/SectionRenderer.tsx

@@ -39,13 +39,16 @@ export namespace SectionRenderer {
       2 * Camera.currentScale,
       Renderer.NODE_ROUNDED_RADIUS * 1.5 * Camera.currentScale,
     );
-
-    TextRenderer.renderText(
-      section.text,
-      Renderer.transformWorld2View(section.rectangle.location.add(Vector.same(Renderer.NODE_PADDING))),
-      Renderer.FONT_SIZE * Camera.currentScale,
-      section.color.a === 1 ? colorInvert(section.color) : colorInvert(StageStyleManager.currentStyle.BackgroundColor),
-    );
+    if (!section.isEditingTitle) {
+      TextRenderer.renderText(
+        section.text,
+        Renderer.transformWorld2View(section.rectangle.location.add(Vector.same(Renderer.NODE_PADDING))),
+        Renderer.FONT_SIZE * Camera.currentScale,
+        section.color.a === 1
+          ? colorInvert(section.color)
+          : colorInvert(StageStyleManager.currentStyle.BackgroundColor),
+      );
+    }
   }
 
   // 非折叠状态
@@ -61,7 +64,7 @@ export namespace SectionRenderer {
       Camera.currentScale > 0.2 ? 2 * Camera.currentScale : 2,
       Renderer.NODE_ROUNDED_RADIUS * Camera.currentScale,
     );
-    if (Camera.currentScale > 0.2) {
+    if (Camera.currentScale > 0.2 && !section.isEditingTitle) {
       // 正常显示标题
       TextRenderer.renderText(
         section.text,

app/src/core/service/controlService/controller/concrete/ControllerSectionEdit.tsx

@@ -4,6 +4,7 @@ import { Stage } from "../../../../stage/Stage";
 import { StageManager } from "../../../../stage/stageManager/StageManager";
 
 import { ControllerClass } from "../ControllerClass";
+import { editSectionTitle } from "./utilsControl";
 
 /**
  * 包含编辑节点文字，编辑详细信息等功能的控制器
@@ -22,12 +23,7 @@ ControllerSectionEdit.mouseDoubleClick = (event: MouseEvent) => {
   }
 
   // 编辑文字
-  const user_input = prompt("请输入文字", firstHoverSection.text);
-  if (user_input) {
-    for (const section of Stage.mouseInteractionCore.hoverSections) {
-      section.rename(user_input);
-    }
-  }
+  editSectionTitle(firstHoverSection);
   return;
 };
 

app/src/core/service/controlService/controller/concrete/utilsControl.tsx

@@ -12,6 +12,7 @@ import { StageManager } from "../../../../stage/stageManager/StageManager";
 import { Entity } from "../../../../stage/stageObject/abstract/StageEntity";
 import { LineEdge } from "../../../../stage/stageObject/association/LineEdge";
 import { PortalNode } from "../../../../stage/stageObject/entity/PortalNode";
+import { Section } from "../../../../stage/stageObject/entity/Section";
 import { TextNode } from "../../../../stage/stageObject/entity/TextNode";
 import { UrlNode } from "../../../../stage/stageObject/entity/UrlNode";
 import { EntityCreateFlashEffect } from "../../../feedbackService/effectEngine/concrete/EntityCreateFlashEffect";
@@ -110,6 +111,32 @@ export function editUrlNodeTitle(clickedUrlNode: UrlNode) {
   });
 }
 
+export function editSectionTitle(section: Section) {
+  Controller.isCameraLocked = true;
+  // 编辑节点
+  section.isEditingTitle = true;
+  InputElement.input(
+    Renderer.transformWorld2View(section.rectangle.location).add(
+      Vector.same(Renderer.NODE_PADDING).multiply(Camera.currentScale),
+    ),
+    section.text,
+    (text) => {
+      section.rename(text);
+    },
+    {
+      fontSize: Renderer.FONT_SIZE * Camera.currentScale + "px",
+      backgroundColor: "transparent",
+      color: StageStyleManager.currentStyle.StageObjectBorderColor.toString(),
+      outline: "none",
+      marginTop: -8 * Camera.currentScale + "px",
+    },
+  ).then(() => {
+    section.isEditingTitle = false;
+    Controller.isCameraLocked = false;
+    StageHistoryManager.recordStep();
+  });
+}
+
 export function editPortalNodeTitle(clickedPortalNode: PortalNode) {
   Controller.isCameraLocked = true;
   // 编辑节点

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

@@ -22,7 +22,7 @@ export class Section extends ConnectableEntity {
    */
   _isSelected: boolean = false;
   public uuid: string;
-
+  public isEditingTitle: boolean = false;
   private _collisionBoxWhenCollapsed: CollisionBox;
   private _collisionBoxNormal: CollisionBox;