From e4f3005a9a451940cad0940a2deb964478034a8e Mon Sep 17 00:00:00 2001
From: ChenX <maple6@vip.qq.com>
Date: Fri, 6 Sep 2024 16:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E9=81=BF=E5=85=8D=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=A1=A8=E8=BE=BE=E5=BC=8F=E6=B1=82=E5=80=BC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF(=E4=BE=8B=E5=A6=82=E7=BB=93=E6=9E=9C=E6=98=AF?=
 =?UTF-8?q?=E5=B8=83=E5=B0=94=E5=9E=8B),=E9=81=BF=E5=85=8D=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Common/eval.ts                                  | 7 +++++--
 src/UI/Components/RightPanel/TemplateParamPanel.tsx | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Common/eval.ts b/src/Common/eval.ts
index 9f08ac0ee..576be0e9d 100644
--- a/src/Common/eval.ts
+++ b/src/Common/eval.ts
@@ -84,10 +84,13 @@ export function eval2(expr: string, params?: {}, defaultParam?: string): number
     let result = eval(code);
 
     if (typeof result === "function")
-        return result();
+        result = result();
 
     if (typeof result === "bigint")
-        return Number(result);//防止bigint乱入
+        result = Number(result);//防止bigint乱入
+
+    if (typeof result !== "number")
+        throw "计算结果不是实数!";
 
     return result;
 }
diff --git a/src/UI/Components/RightPanel/TemplateParamPanel.tsx b/src/UI/Components/RightPanel/TemplateParamPanel.tsx
index a1ba3f264..c5719d626 100644
--- a/src/UI/Components/RightPanel/TemplateParamPanel.tsx
+++ b/src/UI/Components/RightPanel/TemplateParamPanel.tsx
@@ -706,7 +706,7 @@ export class TemplateParamDetail extends React.Component<{}>
                                         }}
                                         title={par.name}
                                     >{par.name}</span>
-                                    <span>{FixedNotZero(par.value, 2)}</span>
+                                    <span>{typeof par.value === "number" ? FixedNotZero(par.value, 2) : par.value}</span>
                                     <span style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis", padding: "0 2px" }} title={par.description}>{par.description}</span>
                                     {
                                         par.type === TemplateParamType.Material ?