🐛 禁止外部框跳入自己内部框导致的无限循环嵌套情况

Author: Littlefean

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

@@ -7,9 +7,12 @@ import { StageEntityMoveManager } from "../../../../stage/stageManager/concreteM
 import { StageSectionInOutManager } from "../../../../stage/stageManager/concreteMethods/StageSectionInOutManager";
 import { StageSectionPackManager } from "../../../../stage/stageManager/concreteMethods/StageSectionPackManager";
 import { StageManager } from "../../../../stage/stageManager/StageManager";
+import { Section } from "../../../../stage/stageObject/entity/Section";
 import { TextNode } from "../../../../stage/stageObject/entity/TextNode";
 import { EntityJumpMoveEffect } from "../../../feedbackService/effectEngine/concrete/EntityJumpMoveEffect";
+import { EntityShakeEffect } from "../../../feedbackService/effectEngine/concrete/EntityShakeEffect";
 import { RectanglePushInEffect } from "../../../feedbackService/effectEngine/concrete/RectanglePushInEffect";
+import { TextRiseEffect } from "../../../feedbackService/effectEngine/concrete/TextRiseEffect";
 import { Controller } from "../Controller";
 import { ControllerClass } from "../ControllerClass";
 
@@ -36,27 +39,55 @@ ControllerLayerMoving.mouseup = (event: MouseEvent) => {
     return;
   }
   const mouseLocation = Renderer.transformView2World(new Vector(event.clientX, event.clientY));
+
   // 提前检查点击的位置是否有一个TextNode，如果有，则转换成Section
   const entity = StageManager.findEntityByLocation(mouseLocation);
   if (entity && entity instanceof TextNode) {
-    const newSection = StageSectionPackManager.targetTextNodeToSection(entity);
+    // 防止无限循环嵌套：当跳入的实体是选中的所有内容当中任意一个Section的内部时，禁止触发该操作
     const selectedEntities = StageManager.getSelectedEntities();
-    // 获取所有选中实体的外接矩形的中心点，以便计算移动距离
-    const centerLocation = Rectangle.getBoundingRectangle(
-      selectedEntities.map((entity) => entity.collisionBox.getRectangle()),
-    ).center;
-    // 最后让所有选中的实体移动
     for (const selectedEntity of selectedEntities) {
-      const delta = mouseLocation.subtract(centerLocation);
-      selectedEntity.move(delta);
+      if (selectedEntity instanceof Section && SectionMethods.isEntityInSection(entity, selectedEntity)) {
+        Stage.effectMachine.addEffect(EntityShakeEffect.fromEntity(entity));
+        Stage.effectMachine.addEffect(EntityShakeEffect.fromEntity(selectedEntity));
+        Stage.effectMachine.addEffect(TextRiseEffect.default("禁止将框套入自身内部"));
+        return;
+      }
+    }
+
+    const newSection = StageSectionPackManager.targetTextNodeToSection(entity);
+    if (newSection && selectedEntities.length > 0) {
+      // 获取所有选中实体的外接矩形的中心点，以便计算移动距离
+      const centerLocation = Rectangle.getBoundingRectangle(
+        selectedEntities.map((entity) => entity.collisionBox.getRectangle()),
+      ).center;
+      // 最后让所有选中的实体移动
+      for (const selectedEntity of selectedEntities) {
+        const delta = mouseLocation.subtract(centerLocation);
+        selectedEntity.move(delta);
+      }
+      StageSectionInOutManager.goInSections(StageManager.getSelectedEntities(), [newSection]);
     }
-    StageSectionInOutManager.goInSections(StageManager.getSelectedEntities(), [newSection]);
+
     return; // 这个return必须写
   }
 
   // 即将跳入的sections区域
   const targetSections = SectionMethods.getSectionsByInnerLocation(mouseLocation);
   const selectedEntities = StageManager.getSelectedEntities();
+
+  // 防止无限循环嵌套：当跳入的实体是选中的所有内容当中任意一个Section的内部时，禁止触发该操作
+  for (const selectedEntity of selectedEntities) {
+    if (selectedEntity instanceof Section) {
+      for (const targetSection of targetSections) {
+        if (SectionMethods.isEntityInSection(targetSection, selectedEntity)) {
+          Stage.effectMachine.addEffect(EntityShakeEffect.fromEntity(targetSection));
+          Stage.effectMachine.addEffect(TextRiseEffect.default("禁止将框套入自身内部"));
+          return;
+        }
+      }
+    }
+  }
+
   // 移动位置
 
   // 1 计算所有节点应该移动的 delta

app/src/core/stage/stageManager/concreteMethods/StageSectionPackManager.tsx

@@ -118,7 +118,7 @@ export namespace StageSectionPackManager {
   }
 
   /**
-   * 将指定的文本节点转换成Section
+   * 将指定的文本节点转换成Section，自动删除原来的TextNode
    * @param textNode 要转换的节点
    * @param ignoreEdges 是否忽略边的影响
    */