更新版本

types/DatabaseServices/Template/Action/TempateThicknessAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TempateThicknessAction.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Action/TempateThicknessAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,oBAAY,kBAAkB;IAE1B,MAAM,IAAI;IACV,IAAI,IAAI;IACR,KAAK,IAAI;CACZ;AAED,MAAM,WAAW,mBAAmB;IAGhC,SAAS,EAAE,kBAAkB,CAAC;IAC9B;;OAEG;IACH,OAAO,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,qBACa,sBAAuB,SAAQ,cAAc;IAEtD,kBAAkB,EAAE,GAAG,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAa;IACnE,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IA0BrD,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAqBvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAe3B"}
+{"version":3,"file":"TempateThicknessAction.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Action/TempateThicknessAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,oBAAY,kBAAkB;IAE1B,MAAM,IAAI;IACV,IAAI,IAAI;IACR,KAAK,IAAI;CACZ;AAED,MAAM,WAAW,mBAAmB;IAGhC,SAAS,EAAE,kBAAkB,CAAC;IAC9B;;OAEG;IACH,OAAO,EAAE,cAAc,EAAE,CAAC;CAC7B;AAED;;GAEG;AACH,qBACa,sBAAuB,SAAQ,cAAc;IAEtD,kBAAkB,EAAE,GAAG,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAa;IACnE,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IA2BrD,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAqBvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAe3B"}

types/DatabaseServices/Template/Action/TemplateFilletAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateFilletAction.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Action/TemplateFilletAction.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAS,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,WAAW,aAAa;IAE1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB;IAE/B,MAAM,EAAE,QAAQ,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,qBACa,oBAAqB,SAAQ,cAAc;IAGpD,WAAW,EAAE,kBAAkB,EAAE,CAAM;;IAOvC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IA6ErD,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAC;KAAE;IA4C9F,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA4FvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAkD3B"}
+{"version":3,"file":"TemplateFilletAction.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Action/TemplateFilletAction.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAS,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,WAAW,aAAa;IAE1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB;IAE/B,MAAM,EAAE,QAAQ,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,qBACa,oBAAqB,SAAQ,cAAc;IAGpD,WAAW,EAAE,kBAAkB,EAAE,CAAM;;IAOvC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IA8ErD,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,EAAE,CAAC;KAAE;IA4C9F,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA4FvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAkD3B"}

types/DatabaseServices/Template/Positioning/PositioningClampSpace.d.ts

@@ -1,14 +1,12 @@
 import { ClampSpaceParse } from "../../../Geometry/SpaceParse/ClampSpaceParse";
 import { ClampSpaceParseFix } from "../../../Geometry/SpaceParse/ClampSpaceParseFix";
 import { CADFiler } from "../../CADFiler";
-import { Entity } from "../../Entity/Entity";
 import { ObjectId } from "../../ObjectId";
 import { Positioning, PositioningParam } from "./Positioning";
 export declare class PositioningClampSpace extends Positioning {
     Objects: ObjectId[];
     SelectBoxIndex: number[];
     SignalDist: number;
-    IntersectSpaceEntitys: Entity[];
     FromSpaceParse(parse: ClampSpaceParse): void;
     _SpaceParse: ClampSpaceParseFix;
     /**

types/DatabaseServices/Template/Positioning/PositioningClampSpace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PositioningClampSpace.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Positioning/PositioningClampSpace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AAGrF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE9D,qBACa,qBAAsB,SAAQ,WAAW;IAEtC,OAAO,EAAE,QAAQ,EAAE,CAAM;IAGzB,cAAc,EAAE,MAAM,EAAE,CAAa;IACrC,UAAU,SAAO;IAG7B,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAEhC,cAAc,CAAC,KAAK,EAAE,eAAe;IAYrC,WAAW,EAAE,kBAAkB,CAAC;IAChC;;MAEE;IACI,WAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB;IAyB1C,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAe9B,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;CAYlC"}
+{"version":3,"file":"PositioningClampSpace.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Positioning/PositioningClampSpace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AAGrF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE9D,qBACa,qBAAsB,SAAQ,WAAW;IAEtC,OAAO,EAAE,QAAQ,EAAE,CAAM;IAGzB,cAAc,EAAE,MAAM,EAAE,CAAa;IACrC,UAAU,SAAO;IAE7B,cAAc,CAAC,KAAK,EAAE,eAAe;IAQrC,WAAW,EAAE,kBAAkB,CAAC;IAChC;;MAEE;IACI,WAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB;IAyB1C,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAe9B,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;CAYlC"}

types/DatabaseServices/Template/Positioning/PositioningTemporary.d.ts

@@ -1,10 +1,8 @@
-import { Entity } from "../../Entity/Entity";
 import { Positioning } from "./Positioning";
 /**
  * 临时定位
  * 在首次绘制时使用2点3点空间时通常不能使用定位,使用临时定位设置给模块后,模块在第一次使用后清空定位.
  */
 export declare class PositioningTemporary extends Positioning {
-    IntersectSpaceEntitys: Entity[];
 }
 //# sourceMappingURL=PositioningTemporary.d.ts.map

types/DatabaseServices/Template/Positioning/PositioningTemporary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PositioningTemporary.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Positioning/PositioningTemporary.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;;GAGG;AACH,qBACa,oBAAqB,SAAQ,WAAW;IAGjD,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACnC"}
+{"version":3,"file":"PositioningTemporary.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Positioning/PositioningTemporary.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;;GAGG;AACH,qBACa,oBAAqB,SAAQ,WAAW;CAGpD"}

types/DatabaseServices/Template/ProgramTempate/TemplateBoard.d.ts

@@ -3,6 +3,7 @@ import { BoardProcessOption } from "../../../UI/Store/OptionInterface/BoardProce
 import { BoardConfigOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
 import { CADFiler } from "../../CADFiler";
 import { Board } from "../../Entity/Board";
+import { ObjectId } from "../../ObjectId";
 import { TemplateRecord } from "../TemplateRecord";
 /**
  * 板件模板的基类.(层板,立板,背板)
@@ -11,6 +12,8 @@ export declare class TemplateBoardRecord extends TemplateRecord {
     UseBoardProcessOption: boolean;
     BoardProcessOption: BoardProcessOption;
     DrawBoardCount: number;
+    protected IntersectSpaceEntitys: Set<ObjectId>;
+    protected IntersectHighDrill: string[];
     protected _option: BoardConfigOption;
     get Option(): BoardConfigOption;
     set Option(option: BoardConfigOption);

types/DatabaseServices/Template/ProgramTempate/TemplateBoard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateBoard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAGvF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,qBACa,mBAAoB,SAAQ,cAAc;IAGnD,qBAAqB,UAAS;IAC9B,kBAAkB,EAAE,kBAAkB,CAAC;IAE3B,cAAc,SAAK;IAE/B,SAAS,CAAC,OAAO,EAAE,iBAAiB,CAAC;IAMrC,IAAI,MAAM,IAIS,iBAAiB,CADnC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,EAKnC;IACD,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,EAAE;IAKvD,KAAK;cAOW,MAAM;IAiFtB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAMvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAM3B"}
+{"version":3,"file":"TemplateBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateBoard.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAGvF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,qBACa,mBAAoB,SAAQ,cAAc;IAGnD,qBAAqB,UAAS;IAC9B,kBAAkB,EAAE,kBAAkB,CAAC;IAE3B,cAAc,SAAK;IAG/B,SAAS,CAAC,qBAAqB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE/C,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAEvC,SAAS,CAAC,OAAO,EAAE,iBAAiB,CAAC;IAMrC,IAAI,MAAM,IAIS,iBAAiB,CADnC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,iBAAiB,EAKnC;IACD,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,EAAE;IAKvD,KAAK;cAOW,MAAM;IAoItB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAMvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAM3B"}

types/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateLatticeRecord.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBACa,qBAAsB,SAAQ,cAAc;IAErD,OAAO,CAAC,MAAM,CAA+C;;IAM7D,IAAI,MAAM,IAIS,cAAc,CADhC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,EAKhC;cAQe,MAAM;IAsDtB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAoCvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAgC3B"}
+{"version":3,"file":"TemplateLatticeRecord.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBACa,qBAAsB,SAAQ,cAAc;IAErD,OAAO,CAAC,MAAM,CAA+C;;IAM7D,IAAI,MAAM,IAIS,cAAc,CADhC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,EAKhC;cAQe,MAAM;IAkEtB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA4CvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAsC3B"}

types/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.d.ts

@@ -2,6 +2,7 @@ import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
 import { IGrooveOption, LayerBoardOption, LayerNailOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
 import { CADFiler } from "../../CADFiler";
 import { Board } from "../../Entity/Board";
+import { ObjectId } from "../../ObjectId";
 import { TemplateBoardRecord } from "./TemplateBoard";
 /**
  * 层板模板
@@ -11,6 +12,8 @@ export declare class TemplateLayerBoard extends TemplateBoardRecord {
     protected _option: LayerBoardOption;
     private _nailOption;
     private grooveOption;
+    IntersectSpaceEntitys: Set<ObjectId>;
+    IntersectHighDrill: string[];
     set GrooveOption(option: IGrooveOption);
     get NailOption(): LayerNailOption;
     set NailOption(nailOpt: LayerNailOption);

types/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateLayerBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AAEtH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;GAEG;AACH,qBACa,kBAAmB,SAAQ,mBAAmB;;IAOvD,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAkC;IACrE,OAAO,CAAC,WAAW,CAA6C;IAChE,OAAO,CAAC,YAAY,CAKlB;IACF,IAAI,YAAY,CAAC,MAAM,EAAE,aAAa,EAIrC;IACD,IAAI,UAAU,IAIU,eAAe,CADtC;IACD,IAAI,UAAU,CAAC,OAAO,EAAE,eAAe,EAItC;IAED,gBAAgB,CAAC,KAAK,EAAE,WAAW;cAQnB,MAAM;IAiBtB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA8DvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAyC3B"}
+{"version":3,"file":"TemplateLayerBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateLayerBoard.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AAEtH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;GAEG;AACH,qBACa,kBAAmB,SAAQ,mBAAmB;;IAOvD,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAkC;IACrE,OAAO,CAAC,WAAW,CAA6C;IAChE,OAAO,CAAC,YAAY,CAKlB;IAGF,qBAAqB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAa;IACjD,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,IAAI,YAAY,CAAC,MAAM,EAAE,aAAa,EAIrC;IACD,IAAI,UAAU,IAIU,eAAe,CADtC;IACD,IAAI,UAAU,CAAC,OAAO,EAAE,eAAe,EAItC;IAED,gBAAgB,CAAC,KAAK,EAAE,WAAW;cAKnB,MAAM;IAiBtB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA6EvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAkD3B"}

types/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.d.ts

@@ -8,6 +8,7 @@ export declare class TemplateTopBottomBoard extends TemplateRecord {
     private _bottomOption;
     UseBoardProcessOption: boolean;
     BoardProcessOption: BoardProcessOption;
+    isChangeBigHole: boolean;
     DrawCounts: [number, number, number];
     constructor();
     get TopOption(): TBBoardOption;

types/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateTopBottomBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,oDAAoD,CAAC;AAGnF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,WAAW;AACX,qBACa,sBAAuB,SAAQ,cAAc;IAEtD,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,aAAa,CAAkD;IACvE,qBAAqB,UAAS;IAC9B,kBAAkB,EAAE,kBAAkB,CAAC;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAa;;IAM7D,IAAI,SAAS,IAIS,aAAa,CADlC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,aAAa,EAKlC;IACD,IAAI,YAAY,IAIS,aAAa,CADrC;IACD,IAAI,YAAY,CAAC,MAAM,EAAE,aAAa,EAIrC;cAQe,MAAM;IA4GtB,OAAO,CAAC,eAAe;IA4BvB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA2CvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAwC3B"}
+{"version":3,"file":"TemplateTopBottomBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,oDAAoD,CAAC;AAGnF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,WAAW;AACX,qBACa,sBAAuB,SAAQ,cAAc;IAEtD,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,aAAa,CAAkD;IACvE,qBAAqB,UAAS;IAC9B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,UAAS;IACZ,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAa;;IAM7D,IAAI,SAAS,IAIS,aAAa,CADlC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,aAAa,EAKlC;IACD,IAAI,YAAY,IAIS,aAAa,CADrC;IACD,IAAI,YAAY,CAAC,MAAM,EAAE,aAAa,EAIrC;cAQe,MAAM;IA4HtB,OAAO,CAAC,eAAe;IA4BvB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA2CvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAwC3B"}

types/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.d.ts

@@ -1,6 +1,7 @@
 import { ISpaceParse } from "../../../Geometry/SpaceParse/ISpaceParse";
 import { IGrooveOption, VerticalBoardOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
 import { CADFiler } from "../../CADFiler";
+import { ObjectId } from "../../ObjectId";
 import { TemplateBoardRecord } from "./TemplateBoard";
 /**
  * 立板模板
@@ -10,6 +11,8 @@ export declare class TemplateVerticalBoard extends TemplateBoardRecord {
     protected _option: VerticalBoardOption;
     private grooveOption;
     set GrooveOption(option: IGrooveOption);
+    IntersectSpaceEntitys: Set<ObjectId>;
+    IntersectHighDrill: string[];
     GeneralBoardList(space: ISpaceParse): import("../../Entity/Board").Board[];
     ReadFile(file: CADFiler): void;
     WriteFile(file: CADFiler): void;

types/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateVerticalBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AAExG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;GAEG;AACH,qBACa,qBAAsB,SAAQ,mBAAmB;;IAO1D,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAqC;IAC3E,OAAO,CAAC,YAAY,CAKlB;IACF,IAAI,YAAY,CAAC,MAAM,EAAE,aAAa,EAIrC;IACD,gBAAgB,CAAC,KAAK,EAAE,WAAW;IAInC,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA4CvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CA0B3B"}
+{"version":3,"file":"TemplateVerticalBoard.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateVerticalBoard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AAExG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD;;GAEG;AACH,qBACa,qBAAsB,SAAQ,mBAAmB;;IAO1D,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAqC;IAC3E,OAAO,CAAC,YAAY,CAKlB;IACF,IAAI,YAAY,CAAC,MAAM,EAAE,aAAa,EAIrC;IAGD,qBAAqB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAa;IACjD,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAElC,gBAAgB,CAAC,KAAK,EAAE,WAAW;IAKnC,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAmFvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAoC3B"}

types/DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateWineRackRecord.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord.ts"],"names":[],"mappings":"AAQA,OAAO,EAAiB,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAErF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBACa,sBAAuB,SAAQ,cAAc;IAEtD,OAAO,CAAC,MAAM,CAAiD;;IAM/D,IAAI,MAAM,IAIS,eAAe,CADjC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,EAKjC;cACe,MAAM;IAmDtB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IA2CvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAsC3B"}
+{"version":3,"file":"TemplateWineRackRecord.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateWineRackRecord.ts"],"names":[],"mappings":"AAQA,OAAO,EAAiB,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAErF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBACa,sBAAuB,SAAQ,cAAc;IAEtD,OAAO,CAAC,MAAM,CAAiD;;IAM/D,IAAI,MAAM,IAIS,eAAe,CADjC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,eAAe,EAKjC;cACe,MAAM;IAmDtB,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAmDvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CA4C3B"}

types/DatabaseServices/Template/TemplateRecord.d.ts

@@ -125,7 +125,6 @@ export declare class TemplateRecord extends SymbolTableRecord {
     protected _CacheSpaceCS: Matrix4;
     protected _CacheSpaceSize: Vector3;
     protected _CatchRootParam: Set<TemplateParam>;
-    protected _CacheIntersectSpaceEntitys: Entity[];
     /**
      * 本节点可用的所有变量定义.(包括变量继承)
      * @param [useCache=true] 当更新当前节点的时候,我们不希望使用缓存,(因为父节点的参数可能已经被更新)

types/DatabaseServices/Template/TemplateRecord.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateRecord.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Template/TemplateRecord.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TemplateRecord.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Template/TemplateRecord.ts"],"names":[],"mappings":"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"}