From 279853b209aea607809cb4f3addedeffadb56f15 Mon Sep 17 00:00:00 2001
From: ChenX <maple6@vip.qq.com>
Date: Mon, 23 Mar 2020 15:20:09 +0800
Subject: [PATCH] =?UTF-8?q?!854=20=E4=BF=AE=E5=A4=8D:=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=90=8E,=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DatabaseServices/Template/TempateUtils.ts    | 13 +++++++++----
 src/UI/Components/Template/TemplateComponent.tsx |  9 +++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/DatabaseServices/Template/TempateUtils.ts b/src/DatabaseServices/Template/TempateUtils.ts
index 95e8d9f66..cd6901688 100644
--- a/src/DatabaseServices/Template/TempateUtils.ts
+++ b/src/DatabaseServices/Template/TempateUtils.ts
@@ -1072,11 +1072,16 @@ let replaceJig = new Jig();
 export async function ReplaceTemplate(oldTemp: TemplateRecord, newTemp: TemplateRecord, reSelectSpace = true)
 {
     //拷贝所有共有参数
-    for (let par of oldTemp.Params)
+    for (let index = 0; index < oldTemp.Params.length; index++)
     {
-        let newPar = newTemp.GetParam(par.name);
-        if (newPar)
-            newPar.expr = par.expr === "" ? par.value : par.expr;
+        let oldParam = oldTemp.Params[index];
+        let newExpr = oldParam.expr === "" ? oldParam.value : oldParam.expr;
+        if (index < 9)
+        {
+            newTemp.Params[index].expr = newExpr;
+            continue;
+        }
+        newTemp.SetParamExpr(oldParam.name, newExpr);
     }
 
     newTemp.Positioning = oldTemp.Positioning;
diff --git a/src/UI/Components/Template/TemplateComponent.tsx b/src/UI/Components/Template/TemplateComponent.tsx
index 3da19f73f..ffbe79686 100644
--- a/src/UI/Components/Template/TemplateComponent.tsx
+++ b/src/UI/Components/Template/TemplateComponent.tsx
@@ -336,11 +336,12 @@ export class TemplateManage extends React.Component<{ store?: TempalteEditorStor
             await ReplaceTemplate(oldTemp, template, isKeepChildren);
 
             //应用用户输入的参数
-            for (let par of this.currentProps)
+            for (let index = 0; index < this.currentProps.length; index++)
             {
-                let p = template.GetParam(par.name);
-                if (p && par.expr)
-                    p.expr = par.expr;
+                if (index < 9) continue;
+                let par = this.currentProps[index];
+                if (!par.expr) continue;
+                template.SetParamExpr(par.name, par.expr);
             }
 
             if (isKeepChildren)