✨ 一切舞台对象均可以添加到标签了

Author: Littlefean

app/src/core/stage/stageManager/StageManager.tsx

@@ -104,6 +104,17 @@ export namespace StageManager {
   export function getEntities(): Entity[] {
     return entities.valuesToArray();
   }
+  export function getStageObjectByUUID(uuid: string): StageObject | null {
+    const entity = entities.getById(uuid);
+    if (entity) {
+      return entity;
+    }
+    const association = associations.getById(uuid);
+    if (association) {
+      return association;
+    }
+    return null;
+  }
   export function getEntitiesByUUIDs(uuids: string[]): Entity[] {
     const result = [];
     for (const uuid of uuids) {
@@ -426,6 +437,15 @@ export namespace StageManager {
   export function getSelectedEntities(): Entity[] {
     return entities.valuesToArray().filter((entity) => entity.isSelected);
   }
+  export function getSelectedAssociations(): Association[] {
+    return associations.valuesToArray().filter((association) => association.isSelected);
+  }
+  export function getSelectedStageObjects(): StageObject[] {
+    const result: StageObject[] = [];
+    result.push(...getSelectedEntities());
+    result.push(...getSelectedAssociations());
+    return result;
+  }
 
   /**
    * 判断某一点是否有实体存在（排除实体的被Section折叠）
@@ -826,7 +846,7 @@ export namespace StageManager {
   }
 
   export function moveToTag(tag: string) {
-    StageTagManager.moveToTag(tag);
+    StageTagManager.moveCameraToTag(tag);
   }
   export function connectEntityByCrEdge(fromNode: ConnectableEntity, toNode: ConnectableEntity) {
     return StageNodeConnector.addCrEdge(fromNode, toNode);

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

@@ -1,7 +1,11 @@
 import { Camera } from "../../Camera";
-import { Entity } from "../../stageObject/abstract/StageEntity";
+import { StageObject } from "../../stageObject/abstract/StageObject";
+import { Edge } from "../../stageObject/association/Edge";
+import { ConnectPoint } from "../../stageObject/entity/ConnectPoint";
+import { ImageNode } from "../../stageObject/entity/ImageNode";
 import { Section } from "../../stageObject/entity/Section";
 import { TextNode } from "../../stageObject/entity/TextNode";
+import { UrlNode } from "../../stageObject/entity/UrlNode";
 import { StageManager } from "../StageManager";
 
 export namespace StageTagManager {
@@ -11,7 +15,8 @@ export namespace StageTagManager {
    * 目前先仅支持TextNode
    */
   export function changeTagBySelected() {
-    for (const selectedEntities of StageManager.getSelectedEntities().filter((entity) => entity instanceof TextNode)) {
+    for (const selectedEntities of StageManager.getSelectedStageObjects()) {
+      // 若有则删，若无则加
       if (StageManager.TagOptions.hasTag(selectedEntities.uuid)) {
         StageManager.TagOptions.removeTag(selectedEntities.uuid);
       } else {
@@ -27,9 +32,12 @@ export namespace StageTagManager {
   export function refreshTagNames() {
     const res: { tagName: string; uuid: string }[] = [];
     const tagUUIDs = StageManager.TagOptions.getTagUUIDs();
-    const tagObjectList: Entity[] = [];
+    const tagObjectList: StageObject[] = [];
     for (const tagUUID of tagUUIDs) {
-      tagObjectList.push(StageManager.getEntitiesByUUIDs([tagUUID])[0]);
+      const stageObject = StageManager.getStageObjectByUUID(tagUUID);
+      if (stageObject) {
+        tagObjectList.push(stageObject);
+      }
     }
     // 排序，从上到下，从左到右
     tagObjectList.sort((a, b) => {
@@ -41,19 +49,35 @@ export namespace StageTagManager {
     });
 
     for (const tagObject of tagObjectList) {
+      let title = "";
       if (tagObject instanceof TextNode) {
-        res.push({ tagName: tagObject.text, uuid: tagObject.uuid });
+        title = tagObject.text;
       } else if (tagObject instanceof Section) {
-        res.push({ tagName: tagObject.text, uuid: tagObject.uuid });
+        title = tagObject.text;
+      } else if (tagObject instanceof UrlNode) {
+        title = tagObject.title;
+      } else if (tagObject instanceof ImageNode) {
+        title = "Image: " + tagObject.uuid.slice(0, 4);
+      } else if (tagObject instanceof Edge) {
+        title = tagObject.text.slice(0, 20).trim();
+        if (title.length === 0) {
+          title = "未命名连线";
+        }
+      } else if (tagObject instanceof ConnectPoint) {
+        title = tagObject.details.slice(0, 20).trim();
+        if (title.length === 0) {
+          title = "Connect Point: " + tagObject.uuid.slice(0, 4);
+        }
       } else {
-        res.push({ tagName: tagObject.uuid, uuid: tagObject.uuid });
+        title = "Unknown: " + tagObject.uuid.slice(0, 4);
       }
+      res.push({ tagName: title, uuid: tagObject.uuid });
     }
     return res;
   }
 
-  export function moveToTag(tagUUID: string) {
-    const tagObject = StageManager.getEntitiesByUUIDs([tagUUID])[0];
+  export function moveCameraToTag(tagUUID: string) {
+    const tagObject = StageManager.getStageObjectByUUID(tagUUID);
     if (!tagObject) {
       return;
     }

app/src/pages/_tag_panel.tsx

@@ -1,6 +1,5 @@
 import { Plus, RefreshCcw } from "lucide-react";
 import React from "react";
-import { Dialog } from "../components/dialog";
 import IconButton from "../components/IconButton";
 import { StageManager } from "../core/stage/stageManager/StageManager";
 import { cn } from "../utils/cn";
@@ -28,16 +27,9 @@ export default function TagPanel({ open = false, className = "" }: { open: boole
   };
 
   const handleClickAddTag = () => {
-    if (StageManager.selectedNodeCount === 0) {
-      Dialog.show({
-        title: "没选择节点",
-        content: "请先在舞台上选中一个或多个节点",
-        type: "error",
-      });
-    } else {
-      StageManager.addTagBySelected();
-      refreshTagNameList();
-    }
+    // TODO: 这里可能缺少一个是否有选中的实体的检测
+    StageManager.addTagBySelected();
+    refreshTagNameList();
   };
 
   return (