From 4661d72c8dfcfc95320904d910ce26a8a97f0aad Mon Sep 17 00:00:00 2001
From: ChenX <maple6@vip.qq.com>
Date: Fri, 6 Sep 2024 17:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E7=A7=BB=E5=8A=A8=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=8F=98=E9=87=8F=E5=80=BC=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Common/eval.ts                                   | 4 ----
 src/DatabaseServices/Template/Param/TemplateParam.ts | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Common/eval.ts b/src/Common/eval.ts
index 576be0e9d..f29f85145 100644
--- a/src/Common/eval.ts
+++ b/src/Common/eval.ts
@@ -88,10 +88,6 @@ export function eval2(expr: string, params?: {}, defaultParam?: string): number
 
     if (typeof result === "bigint")
         result = Number(result);//防止bigint乱入
-
-    if (typeof result !== "number")
-        throw "计算结果不是实数!";
-
     return result;
 }
 
diff --git a/src/DatabaseServices/Template/Param/TemplateParam.ts b/src/DatabaseServices/Template/Param/TemplateParam.ts
index 3d4e0a9a1..da162ee42 100644
--- a/src/DatabaseServices/Template/Param/TemplateParam.ts
+++ b/src/DatabaseServices/Template/Param/TemplateParam.ts
@@ -173,6 +173,8 @@ export class TemplateParam
             try
             {
                 value = eval2(this.expr as string, vardefines);
+                if (typeof value !== "number")
+                    throw "计算结果不是实数!";
             }
             catch (error)
             {