🐛 Fix some bug of logic node

Author: zty012

app/src/core/render/canvas2d/basicRenderer/textRenderer.tsx

@@ -167,6 +167,7 @@ export class TextRenderer {
     lineHeight: number = 1.2,
     limitLines: number = Infinity,
   ): void {
+    if (!text) return;
     if (text.length === 0) return;
     // 如果文本里面没有换行符就直接渲染单行文本，不要计算了
     if (!text.includes("\n")) {

app/src/core/render/canvas2d/entityRenderer/textNode/TextNodeRenderer.tsx

@@ -1,6 +1,11 @@
 import { Random } from "@/core/algorithm/random";
 import { Project, service } from "@/core/Project";
 import { Renderer } from "@/core/render/canvas2d/renderer";
+import {
+  getLogicNodeRenderName,
+  LogicNodeNameEnum,
+  LogicNodeNameToRenderNameMap,
+} from "@/core/service/dataGenerateService/autoComputeEngine/logicNodeNameEnum";
 import { Settings } from "@/core/service/Settings";
 import { TextNode } from "@/core/stage/stageObject/entity/TextNode";
 import { Color, colorInvert, Vector } from "@graphif/data-structures";

app/src/core/service/dataGenerateService/autoComputeEngine/AutoComputeUtils.tsx

@@ -199,8 +199,8 @@ export class AutoComputeUtils {
    * @returns
    */
   stringToNumber(str: string) {
-    if (ProgramFunctions.isHaveVar(str)) {
-      return parseFloat(ProgramFunctions.getVarInCore(str));
+    if (ProgramFunctions.isHaveVar(this.project, str)) {
+      return parseFloat(ProgramFunctions.getVarInCore(this.project, str));
     }
     return parseFloat(str);
   }

app/src/core/service/dataGenerateService/autoComputeEngine/mainTick.tsx

@@ -22,8 +22,10 @@ type OtherFunctionType = (
   fatherNodes: ConnectableEntity[],
   childNodes: ConnectableEntity[],
 ) => string[];
+type VariableFunctionType = (project: Project, args: string[]) => string[];
 type StringFunctionMap = Record<string, StringFunctionType>;
 type OtherFunctionMap = Record<string, OtherFunctionType>;
+type VariableFunctionMap = Record<string, VariableFunctionType>;
 
 @service("autoCompute")
 export class AutoCompute {
@@ -113,6 +115,9 @@ export class AutoCompute {
     [LogicNodeNameEnum.REPLACE]: StringFunctions.replace,
     [LogicNodeNameEnum.CONNECT]: StringFunctions.connect,
     [LogicNodeNameEnum.CHECK_REGEX_MATCH]: StringFunctions.checkRegexMatch,
+  };
+
+  MapVariableFunction: VariableFunctionMap = {
     // 编程类功能
     [LogicNodeNameEnum.SET_VAR]: ProgramFunctions.setVar,
     [LogicNodeNameEnum.GET_VAR]: ProgramFunctions.getVar,
@@ -223,17 +228,12 @@ export class AutoCompute {
   }
 
   isTextNodeLogic(node: TextNode): boolean {
-    for (const name of Object.keys(this.MapNameFunction)) {
-      if (node.text === name) {
-        return true;
-      }
-    }
-    for (const name of Object.keys(this.MapOtherFunction)) {
-      if (node.text === name) {
-        return true;
-      }
-    }
-    return false;
+    const names = [
+      ...Object.keys(this.MapNameFunction),
+      ...Object.keys(this.MapOtherFunction),
+      ...Object.keys(this.MapVariableFunction),
+    ];
+    return names.includes(node.text);
   }
 
   private isSectionLogic(section: Section): boolean {
@@ -301,6 +301,17 @@ export class AutoCompute {
         this.project.autoComputeUtils.generateMultiResult(node, result);
       }
     }
+    // 变量计算
+    for (const name of Object.keys(this.MapVariableFunction)) {
+      if (node.text === name) {
+        // 发现了一个变量节点
+        const result = this.MapVariableFunction[name](
+          this.project,
+          this.project.autoComputeUtils.getParentTextNodes(node).map((p) => p.text),
+        );
+        this.project.autoComputeUtils.generateMultiResult(node, result);
+      }
+    }
   }
 
   private computeSection(section: Section) {

app/src/sub/AutoCompleteWindow.tsx

@@ -1,6 +1,6 @@
+import { SubWindow } from "@/core/service/SubWindow";
 import { Vector } from "@graphif/data-structures";
 import { Rectangle } from "@graphif/shapes";
-import { SubWindow } from "@/core/service/SubWindow";
 
 export default function AutoCompleteWindow({
   // winId = "",
@@ -25,9 +25,10 @@ export default function AutoCompleteWindow({
 
 AutoCompleteWindow.open = (location: Vector, items: Record<string, string>, onSelect: (value: string) => void) => {
   return SubWindow.create({
-    title: "自动补全",
     children: <AutoCompleteWindow items={items} onSelect={onSelect} />,
     rect: new Rectangle(location, Vector.same(-1)),
     closeWhenClickOutside: true,
+    titleBarOverlay: true,
+    closable: false,
   });
 };