pull/551/MERGE
ChenX 5 years ago
parent 846f99b7bf
commit f3ac6bb57f

@ -1,15 +1,15 @@
import { IDoorConfigOption, IDoorInfo, DoorOpenDir, IDrawerInfo } from "../../../UI/Store/DoorInterface";
import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord";
import { GetOnlineTemplate } from "../../../DatabaseServices/Template/TempateUtils";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { app } from "../../../ApplicationServices/Application";
import { EBoardKeyList } from "../../../Common/BoardKeyList";
import { DrillType, BoardProcessOption } from "../../../UI/Store/BoardInterface";
import { INeedUpdateParams } from "../../../UI/Components/Template/TemplateComponent";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { TemplateParam } from "../../../DatabaseServices/Template/Param/TemplateParam";
import { ClampSpaceParse } from "../../../Geometry/SpaceParse/ClampSpaceParse";
import { PositioningClampSpace } from "../../../DatabaseServices/Template/Positioning/PositioningClampSpace";
import { app } from "../../../ApplicationServices/Application";
import { GetOnlineTemplate } from "../../../DatabaseServices/Template/TempateUtils";
import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord";
import { ClampSpaceParse } from "../../../Geometry/SpaceParse/ClampSpaceParse";
import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
import { INeedUpdateParams } from "../../../UI/Components/Template/TemplateComponent";
import { BoardProcessOption, DrillType } from "../../../UI/Store/BoardInterface";
import { IDoorConfigOption, IDoorInfo } from "../../../UI/Store/DoorInterface";
export class DrawDoorTool
{
@ -44,7 +44,6 @@ export class DrawDoorTool
//全部的模板id
let tempIds: Set<string> = new Set();
for (let info of doorInfos)
{
if (info.tempInfo.temp.id)
@ -58,7 +57,6 @@ export class DrawDoorTool
this.surroundOption = spaceParse.Boards.length > 0 ? spaceParse.Boards[0].BoardProcessOption : undefined;
for (let id of [...tempIds])
{
let temp = await GetOnlineTemplate(id);

@ -43,7 +43,7 @@ export class DrawLeftRightOpenDoor extends DrawDoorTool
let hasLayerDown = j === 0 ? this.isDrawLayBrS[j + 1] : this.isDrawLayBrS[j];
let rowTemplate = this.GetRowTemplate(info, this.rowHeighs[j], hasLayerDown, this.isDrawLayBrS[j + 1]);
colTemp.Children.push(rowTemplate.Id)
colTemp.Children.push(rowTemplate.Id);
if (j < row - 1)
{
@ -161,7 +161,7 @@ export class DrawLeftRightOpenDoor extends DrawDoorTool
)
{
let rowTemplate = this.GetDoorSpaceTemplate(info, rowHeigh, hasLayerDown, hasLayUp);
let doorTemplate = this.GetDoorTemp(info)
let doorTemplate = this.GetDoorTemp(info);
for (let id of doorTemplate.Objects)
{
@ -396,6 +396,6 @@ export class DrawLeftRightOpenDoor extends DrawDoorTool
temp.PZParam.expr = "_POS";
temp.PXParam.expr = "__L";
temp.PYParam.expr = "__MBNS<0?-__MBNS:0";
return temp
return temp;
}
}

Loading…
Cancel
Save