!1670 修复:模板空间拾取box模型错误

pull/1662/MERGE
林三 3 years ago committed by ChenX
parent 9104b55e70
commit c94b215e83

@ -1176,11 +1176,13 @@ export async function ReplaceTemplate(oldTemp: TemplateRecord, newTemp: Template
let positioning = oldTemp.Positioning; let positioning = oldTemp.Positioning;
// if (!(positioning instanceof PositioningTemporary && oldTemp.Parent && !oldTemp.Parent.IsErase)) // if (!(positioning instanceof PositioningTemporary && oldTemp.Parent && !oldTemp.Parent.IsErase))
newTemp.Positioning = positioning; newTemp.Positioning = positioning;
let en = oldTemp.AllEntitys[0];
if (option)
{
let en = oldTemp.AllEntitys[0];
GetEntityInfo(en, option); //获取实体信息 GetEntityInfo(en, option); //获取实体信息
followAttribute(option, newTemp);//房名、柜名、板名跟随 followAttribute(option, newTemp);//房名、柜名、板名跟随
}
if (oldTemp?.Parent?.Object) if (oldTemp?.Parent?.Object)
{ {
@ -1301,7 +1303,7 @@ function IsEqualBH(parent: TemplateRecord, target: TemplateRecord): boolean
return bh2.value === bh1.value;//父节点已经计算出值 return bh2.value === bh1.value;//父节点已经计算出值
} }
export async function SetTemplatePositionAndSetParent(spaceParse: ISpaceParse, template: TemplateRecord, isAddDeepNode = true) export async function SetTemplatePositionAndSetParent(spaceParse: ISpaceParse, template: TemplateRecord, isAddDeepNode = true, option?: IGetRoomInfo)
{ {
if (spaceParse instanceof ClampSpaceParse) if (spaceParse instanceof ClampSpaceParse)
{ {
@ -1320,7 +1322,7 @@ export async function SetTemplatePositionAndSetParent(spaceParse: ISpaceParse, t
else if (spaceParse.VisualSpaceBox) else if (spaceParse.VisualSpaceBox)
{ {
let vstemplate = spaceParse.VisualSpaceBox.Template.Object as TemplateVisualSpace; let vstemplate = spaceParse.VisualSpaceBox.Template.Object as TemplateVisualSpace;
ReplaceTemplate(vstemplate, template, true, false); ReplaceTemplate(vstemplate, template, true, false, option);
DeleteTempate(vstemplate); DeleteTempate(vstemplate);
} }
else else

@ -448,7 +448,7 @@ export class TemplateManage extends React.Component<ITemplateManage, {}> {
template.WParam.expr = ""; template.WParam.expr = "";
template.HParam.expr = ""; template.HParam.expr = "";
await SetTemplatePositionAndSetParent(parse, template); await SetTemplatePositionAndSetParent(parse, template, true, this.option);
} }
} }
}; };

Loading…
Cancel
Save