!854 修复:模块替换后,模块的尺寸错误

pull/854/MERGE
ChenX 5 years ago
parent 88a2f3070c
commit 279853b209

@ -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;

@ -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)

Loading…
Cancel
Save