更新版本

types/DatabaseServices/AlignLine/AlignLineGroupRecord.d.ts

@@ -6,6 +6,7 @@ import { SymbolTableRecord } from "../SymbolTableRecord";
  */
 export declare class AlignLineGroupRecord extends SymbolTableRecord {
     Objects: ObjectId[];
+    Force: boolean;
     constructor();
     get Name(): string;
     set Name(name: string);

types/DatabaseServices/AlignLine/AlignLineGroupRecord.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AlignLineGroupRecord.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/AlignLine/AlignLineGroupRecord.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;GAEG;AACH,qBACa,oBAAqB,SAAQ,iBAAiB;IAE3C,OAAO,EAAE,QAAQ,EAAE,CAAM;;IAMrC,IAAI,IAAI,IAIO,MAAM,CADpB;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAOpB;IAED,KAAK;IAQL,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAavB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAS3B"}
+{"version":3,"file":"AlignLineGroupRecord.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/AlignLine/AlignLineGroupRecord.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;GAEG;AACH,qBACa,oBAAqB,SAAQ,iBAAiB;IAE3C,OAAO,EAAE,QAAQ,EAAE,CAAM;IACzB,KAAK,EAAE,OAAO,CAAS;;IAOnC,IAAI,IAAI,IAIO,MAAM,CADpB;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAOpB;IAED,KAAK;IAQL,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAgBvB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAW3B"}

types/DatabaseServices/Entity/Board.d.ts

@@ -2,6 +2,7 @@ import Geom3 from '@jscad/modeling/src/geometries/geom3/type';
 import { BufferGeometry, Frustum, Geometry, Matrix3, Matrix4, Object3D, ShapeBufferGeometry, UVGenerator, Vector3 } from 'three';
 import { ArcBoardBuild } from '../../Add-on/ArcBoard/ArcBoardBuild';
 import { ArcBoardOptions } from '../../Add-on/ArcBoard/ArcBoardFeeding';
+import { SplitBoardSide2DPathUtil } from '../../Add-on/BoardCutting/SplitBoardSide2DPathUtil';
 import { SplitBoardSideModelUtil } from '../../Add-on/BoardCutting/SplitBoardSideModel';
 import { FaceDirection } from "../../Add-on/DrawDrilling/DrillType";
 import { ObjectSnapMode } from '../../Editor/ObjectSnapMode';
@@ -77,6 +78,7 @@ export declare class Board extends ExtrudeSolid {
     RelativeHandle: ObjectId[];
     private _IsChaiDan;
     private _2DModelingList;
+    private _Side2DModelingMap;
     private _3DModelingList;
     private _SideModelingMap;
     private _CustomNumber;
@@ -170,6 +172,8 @@ export declare class Board extends ExtrudeSolid {
     set BoardModeling(models: IModeling[]);
     get Modeling2D(): I2DModeling[];
     set Modeling2D(ms: I2DModeling[]);
+    get Side2DModelingMap(): Map<number, I2DModeling[]>;
+    set Side2DModelingMap(map: Map<number, I2DModeling[]>);
     get Modeling3D(): I3DModeling[];
     set Modeling3D(ms: I3DModeling[]);
     get SideModelingMap(): Map<number, ExtrudeSolid[]>;
@@ -177,6 +181,7 @@ export declare class Board extends ExtrudeSolid {
     get AllSideModelGrooveMap(): Map<number, ExtrudeSolid[]>;
     ClearSideModeling(): void;
     ClearModeling2DList(): void;
+    ClearSideModeling2DList(): void;
     ClearModeling3DList(): void;
     get IsChaiDan(): boolean;
     set IsChaiDan(v: boolean);
@@ -210,6 +215,9 @@ export declare class Board extends ExtrudeSolid {
     private UpdateSplitBoardSideModelUtil;
     private _SplitBoardSideModelUtil;
     get SplitBoardSideModelUtil(): SplitBoardSideModelUtil;
+    private UpdateSplitBoardSide2DModelUtil;
+    private _SplitBoardSide2DModelUtil;
+    get SplitBoardSide2DModelUtil(): SplitBoardSide2DPathUtil;
     GeneralRectContour(): void;
     /**
      * 板件的轮廓,在板件坐标系中的表现方式.
@@ -243,12 +251,16 @@ export declare class Board extends ExtrudeSolid {
     Clear3DPathCache(): void;
     private Get3DPathDrawObject;
     Clear2DPathCache(): void;
+    ClearSide2DPathCache(): void;
     _2DPathCsgs: Geom3[];
     _2DPathDrawObject: Object3D;
+    _Side2DPathCsgs: Geom3[];
+    _Side2DPathDrawObject: Object3D;
     /**
      * 这个函数生成了二维刀路的csg数组,并且同时生成了_2DPathDrawObject(二维刀路提刀线框显示对象)
      */
     Get2DPathCsgs(): Geom3[];
+    GetSide2DPathCsgs(): Geom3[];
     _SideModeingCsgs: Geom3[];
     _SpiltBoardSideModeingCsgs: Geom3[];
     GetSideModeingCsgs(): Geom3[];
@@ -256,7 +268,8 @@ export declare class Board extends ExtrudeSolid {
     get HasSideModel(): boolean;
     private _asyncSideModelIng;
     get AsyncSideModeling(): boolean;
-    protected get Has2DPath(): boolean;
+    get Has2DPath(): boolean;
+    get HasSide2DPath(): boolean;
     private _workerCalcedGeom;
     private _async2DPathIng;
     get Async2DPathing(): boolean;
@@ -302,12 +315,15 @@ export declare class Board extends ExtrudeSolid {
     UpdateDrawObjectMaterial(renderType: RenderType, obj: Object3D): void;
     CheckSealing(obj: Object3D): void;
     private AddSideModelGripPoints;
-    GetStrectchPointCountList(dragType: DragPointType): number[];
+    private AddSide2DModelPathGripPoints;
+    GetStrectchGroovePointCountList(dragType: DragPointType): number[];
+    GetStrectch2DModelPathPointCountList(): number[];
     GetGripPoints(): Vector3[];
     private MapToArcPoints;
     MoveGripPoints(indexList: number[], vec: Vector3): void;
     GetStretchPoints(): Vector3[];
     MoveStretchPoints(indexList: Array<number>, vec: Vector3): void;
+    private MoveSide2DModelPath;
     GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3, frustum?: Frustum): Vector3[];
     private MoveArcBoardPoints;
     private GetOffsetVecAlongPath;

types/DatabaseServices/Entity/Extrude.d.ts

@@ -80,6 +80,7 @@ export declare class ExtrudeSolid extends Entity {
     set Thickness(thickness: number);
     get Grooves(): ExtrudeSolid[];
     get SideModelingMap(): Map<any, any>;
+    get Side2DModelingMap(): Map<any, any>;
     /**
      * 返回未拷贝的轮廓曲线
      */
@@ -148,7 +149,7 @@ export declare class ExtrudeSolid extends Entity {
     AppendGrooves(grooves: ExtrudeSolid[], output?: ExtrudeSolid[], outSplitExtrudeSolid?: ExtrudeSolid[]): void;
     AppendSideModel(relevanceSideModelMap: Map<number, ExtrudeSolid[]>): void;
     GetObjectSnapPoints(snapMode: ObjectSnapMode, pickPoint: Vector3, lastPoint: Vector3, viewXform?: Matrix3, frustum?: Frustum): Vector3[];
-    protected GetStrectchPointCountList(dragType: DragPointType): number[];
+    protected GetStrectchGroovePointCountList(dragType: DragPointType): number[];
     GetGripOrStretchPoints(dragType: DragPointType): Vector3[];
     MoveGripOrStretchPoints(indexList: number[], vec: Vector3, dragType: DragPointType): void;
     GetGripPoints(): Array<Vector3>;
@@ -240,6 +241,7 @@ export declare class ExtrudeSolid extends Entity {
     get MeshGeometry(): BufferGeometry;
     UpdateMeshGeom(geo: BufferGeometry | Geometry): BufferGeometry;
     protected get Has2DPath(): boolean;
+    protected get HasSide2DPath(): boolean;
     protected get HasSideModel(): boolean;
     protected _EdgeGeometry: EdgesGeometry | BufferGeometry;
     get EdgeGeometry(): BufferGeometry;