!1229 修复:attach 拾取虚拟空间报错

pull/1229/MERGE
ZoeLeeFZ 4 years ago committed by ChenX
parent 7bdf10bc6f
commit 352d6f04fc

@ -75,7 +75,9 @@ export class UploadHoleOption implements Command
filter: ".json", callback: async (files) =>
{
let f = files[0];
let fileData = JSON.parse(await FileSystem.ReadFileAsText(f));
let json = await FileSystem.ReadFileAsText(f);
if (!json) return;
let fileData = JSON.parse(json);
let configs = await userConfigStore.GetAllConfigs(BoardModalType.Dr, false) || {};
let store = DrillStore.GetInstance() as DrillStore;
for (let i in fileData)

@ -12,7 +12,7 @@ import { Board } from "../Entity/Board";
import { TemplateAction } from "./Action/TemplateAction";
import { TemplateParam } from "./Param/TemplateParam";
import { PositioningClampSpace } from "./Positioning/PositioningClampSpace";
import { AddFilletAction, AddStretchAction, InitTempateBoardThicknessActions, InitTempateSizeActions, InitTemplate, SetTempateCoordinate, UpdateTemplateSizeOffBoards } from "./TempateUtils";
import { AddFilletAction, AddStretchAction, InitTempateBoardThicknessActions, InitTempateSizeActions, InitTemplate, SetTempateCoordinate, UpdateTemplateSizeOffBoards, SetTemplatePositionAndSetParent } from "./TempateUtils";
import { TemplateRecord } from "./TemplateRecord";
import { TemplateSplitType } from "./TemplateType";
@ -331,33 +331,7 @@ export class TemplateAttach
return;
}
let parse = selectSpace.SpaceParse as ClampSpaceParse;
let brs = parse.Boards;
let positioning = new PositioningClampSpace();
positioning.FromSpaceParse(parse);
template.Positioning = positioning;
await template.UpdateTemplateTree();//单独更新 不继承
let tbrs = brs.filter(br => br.Template !== undefined);
if (tbrs.length === 0)
{
app.Editor.Prompt("选取的空间不存在模版!");
}
else
{
tbrs.sort((b1, b2) =>
{
let t1 = b1.Template.Object as TemplateRecord;
let t2 = b2.Template.Object as TemplateRecord;
return t2.NodeDepth - t1.NodeDepth;
});
let templateSource = tbrs[0].Template.Object as TemplateRecord;
templateSource.Children.push(template.Id);
}
SetTemplatePositionAndSetParent(selectSpace.SpaceParse, template);
}
}

Loading…
Cancel
Save