功能:提供房间和墙体关联关系

api.cjs.js

@@ -1604,28 +1604,15 @@ exports.Entity = Entity_1 = class Entity extends CADObject {
     Move(v) {
         if (equaln$1(v.x, 0) && equaln$1(v.y, 0) && equaln$1(v.z, 0))
             return;
-        this.WriteAllObjectRecord();
-        this._Matrix.elements[12] += v.x;
-        this._Matrix.elements[13] += v.y;
-        this._Matrix.elements[14] += v.z;
-        this._SpaceOCS.elements[12] += v.x;
-        this._SpaceOCS.elements[13] += v.y;
-        this._SpaceOCS.elements[14] += v.z;
-        this.Update(exports.UpdateDraw.Matrix);
+        tempMatrix1.identity().setPosition(v.x, v.y, v.z);
+        this.ApplyMatrix(tempMatrix1);
         return this;
     }
     set Position(pt) {
         let moveX = pt.x - this._Matrix.elements[12];
         let moveY = pt.y - this._Matrix.elements[13];
         let moveZ = pt.z - this._Matrix.elements[14];
-        if (moveX === 0 && moveY === 0 && moveZ === 0)
-            return;
-        this.WriteAllObjectRecord();
-        this._Matrix.setPosition(pt);
-        this._SpaceOCS.elements[12] += moveX;
-        this._SpaceOCS.elements[13] += moveY;
-        this._SpaceOCS.elements[14] += moveZ;
-        this.Update(exports.UpdateDraw.Matrix);
+        this.Move({ x: moveX, y: moveY, z: moveZ });
     }
     get Z() { return this._Matrix.elements[14]; }
     set Z(z) {
@@ -2859,7 +2846,7 @@ function CreatePolylinePath(pts, buls) {
     return shape;
 }
 
-function GetGoodShaderSimple(color = new three.Vector3, side = three.FrontSide) {
+function GetGoodShaderSimple(color = new three.Vector3, side = three.FrontSide, logBuf = false) {
     return {
         uniforms: {
             "SurfaceColor": { value: color }
@@ -3175,7 +3162,7 @@ class ColorMaterial {
         let key = `${color}${side}`;
         if (this._ConceptualMaterial.has(key))
             return this._ConceptualMaterial.get(key);
-        let shaderParams = GetGoodShaderSimple(new three.Vector3().fromArray(this.GetColor(color).toArray()), side);
+        let shaderParams = GetGoodShaderSimple(new three.Vector3().fromArray(this.GetColor(color).toArray()), side, ColorMaterial.UseLogBuf);
         let mtl = new three.ShaderMaterial(shaderParams);
         this._ConceptualMaterial.set(key, mtl);
         return mtl;
@@ -3513,8 +3500,8 @@ exports.Curve = class Curve extends exports.Entity {
     GetPointAtDistance(distance) { return; }
     GetDistAtParam(param) { return; }
     GetDistAtPoint(pt) { return; }
-    GetParamAtPoint(pt) { return; }
-    GetParamAtPoint2(pt) { return this.GetParamAtPoint(pt); }
+    GetParamAtPoint(pt, fuzz = 1e-6) { return; }
+    GetParamAtPoint2(pt, fuzz = 1e-6) { return this.GetParamAtPoint(pt, fuzz); }
     GetParamAtDist(d) { return; }
     /**
      * 返回曲线在指定位置的一阶导数(在wcs内)
@@ -3563,8 +3550,8 @@ exports.Curve = class Curve extends exports.Entity {
     //翻转曲线.首尾调换.
     Reverse() { return this; }
     //点在曲线上
-    PtOnCurve(pt, fuzz = 1e-6) {
-        return equalv3(this.StartPoint, pt, fuzz) || equalv3(this.EndPoint, pt, fuzz) || this.ParamOnCurve(this.GetParamAtPoint(pt));
+    PtOnCurve(pt, fuzz = 1e-5) {
+        return equalv3(this.StartPoint, pt, fuzz) || equalv3(this.EndPoint, pt, fuzz) || this.ParamOnCurve(this.GetParamAtPoint(pt, fuzz));
     }
     //点在曲线中,不在起点或者终点.
     PtOnCurve2(pt) {
@@ -3846,9 +3833,9 @@ exports.Line = Line_1 = class Line extends exports.Curve {
     GetPointAtParam(param) {
         return this.StartPoint.add(this.GetFistDeriv(0).multiplyScalar(param));
     }
-    GetParamAtPoint(pt) {
+    GetParamAtPoint(pt, fuzz = 1e-5) {
         let { closestPt, param } = this.GetClosestAtPoint(pt, true);
-        if (!equalv3(closestPt, pt, 1e-5))
+        if (!equalv3(closestPt, pt, fuzz))
             return NaN;
         return param;
     }
@@ -5649,20 +5636,20 @@ var BoolOpeartionType;
 })(BoolOpeartionType || (BoolOpeartionType = {}));
 const fuzz = 1e-3;
 let fuzzV3 = new three.Vector3(fuzz, fuzz, fuzz);
-//判断曲线是否在源封闭曲线内
-function isTargetCurInOrOnSourceCur(sourceCur, targetCur) {
-    if (!sourceCur.BoundingBox.expandByVector(fuzzV3).containsBox(targetCur.BoundingBox))
+//判断小曲线是不是被大曲线包含(或者重叠?)
+function isTargetCurInOrOnSourceCur(bigCurve, smallCurve) {
+    if (!bigCurve.BoundingBox.expandByVector(fuzzV3).containsBox(smallCurve.BoundingBox))
         return false;
     let cus = [];
-    if (targetCur instanceof exports.Polyline)
-        cus = targetCur.Explode();
+    if (smallCurve instanceof exports.Polyline)
+        cus = smallCurve.Explode();
     else
-        cus = [targetCur];
+        cus = [smallCurve];
     return cus.every(c => {
-        let pts = getIntPtContextPts(sourceCur, c);
+        let pts = getIntPtContextPts(bigCurve, c);
         if (pts.length <= 1)
             pts.push(c.StartPoint, c.EndPoint);
-        return IsPtsAllInOrOnReg(sourceCur, pts);
+        return IsPtsAllInOrOnReg(bigCurve, pts);
     });
 }
 //获取交点处上下距0.01par的点
@@ -5862,12 +5849,12 @@ class Contour {
         let sourceContainerTarget;
         let targetContainerSource;
         if (sourceOutline.Area > targetOutline.Area) {
-            sourceContainerTarget = interPts.length === 0 ? fastCurveInCurve(sourceOutline, targetOutline) : this.CuInOutline(targetOutline);
+            sourceContainerTarget = CurveContainerCurve(sourceOutline, targetOutline, interPts);
             targetContainerSource = false;
         }
         else {
             sourceContainerTarget = false;
-            targetContainerSource = interPts.length === 0 ? fastCurveInCurve(targetOutline, sourceOutline) : target.CuInOutline(sourceOutline);
+            targetContainerSource = CurveContainerCurve(targetOutline, sourceOutline, interPts);
         }
         //包含.相交.分离(三种状态)
         if (sourceContainerTarget) //源包含目标
@@ -6104,8 +6091,15 @@ class Contour {
     get Shape() {
         return this._Curve.Shape;
     }
-    CuInOutline(targetCur) {
-        return isTargetCurInOrOnSourceCur(this._Curve, targetCur);
+    /**
+     * 判断是否完全包含曲线
+     * @param smallCurve 传入的这个曲线不能比本轮廓还大(这个需要自己优化?)
+     * @returns
+     */
+    ContainerCurve(smallCurve, isAreaCheckd = false, ipts = undefined) {
+        if (!isAreaCheckd && this.Area < smallCurve.Area)
+            return false;
+        return CurveContainerCurve(this._Curve, smallCurve, ipts);
     }
     Equal(tar) {
         return equalCurve(this._Curve, tar._Curve);
@@ -6124,15 +6118,30 @@ function fastEqualCurve(c1, c2, tolerance = 1e-3) {
         return false;
     return equalv3(c1.Midpoint, c2.Midpoint, tolerance);
 }
-//对于双多段线互相切割后的结果,快速判断曲线是否在另一条曲线内部
-//也许有一天这个中点算法需要改一下, 使用.MidPoint比较稳妥
-function fastCurveInCurve(sourceCu, targetCu) {
-    return sourceCu.PtInCurve(targetCu.Midpoint);
+/**
+ * 对于双多段线互相切割后的结果(或者交点个数为0),快速判断曲线是否在另一条曲线内部
+ * @param bigCurve
+ * @param smallCurve
+ * @returns
+ */
+function fastCurveInCurve(bigCurve, smallCurve) {
+    return bigCurve.PtInCurve(smallCurve.Midpoint);
 }
 //当交点小于等于1时
-function fastCurveInCurve2(sourceCu, targetCu) {
-    return sourceCu.PtInCurve(targetCu.StartPoint) ||
-        sourceCu.PtInCurve(targetCu.Midpoint);
+function fastCurveInCurve2(bigCurve, smallCurve) {
+    return bigCurve.PtInCurve(smallCurve.StartPoint) ||
+        bigCurve.PtInCurve(smallCurve.Midpoint);
+}
+//大曲线是否完全包含小曲线(或者重合)
+function CurveContainerCurve(bigCurve, smallCurve, ipts = undefined, fuzz = COMBINE_FUZZ) {
+    if (!ipts)
+        ipts = bigCurve.IntersectWith2(smallCurve, IntersectOption.ExtendNone, fuzz);
+    if (ipts.length === 0)
+        return fastCurveInCurve(bigCurve, smallCurve);
+    else if (ipts.length === 1)
+        return fastCurveInCurve2(bigCurve, smallCurve);
+    else
+        return isTargetCurInOrOnSourceCur(bigCurve, smallCurve);
 }
 
 class CurveTreeNode {
@@ -7680,10 +7689,10 @@ exports.Polyline = Polyline_1 = class Polyline extends exports.Curve {
         pl.LineData = lineData;
         return pl;
     }
-    PtOnCurve(pt) {
+    PtOnCurve(pt, fuzz = 1e-6) {
         for (let i = 0; i < this.EndParam; i++) {
             let c = this.GetCurveAtIndex(i);
-            if (c.PtOnCurve(pt))
+            if (c.PtOnCurve(pt, fuzz))
                 return true;
         }
         return false;
@@ -7900,6 +7909,17 @@ exports.Polyline = Polyline_1 = class Polyline extends exports.Curve {
         }
         return box;
     }
+    SetPtsBuls(pts, buls) {
+        this.WriteAllObjectRecord();
+        this._LineData.length = 0;
+        for (let i = 0; i < pts.length; i++) {
+            let pt = pts[i];
+            let bul = buls[i];
+            this._LineData.push({ pt, bul });
+        }
+        this.Update();
+        return this;
+    }
     /**
      * 得到曲线有用的点表和凸度(闭合曲线首尾重复)
      */
@@ -9855,11 +9875,9 @@ function ScaleUV2(geo, ocs, xScale = 1e-3, yScale = 1e-3, isInvert = false) {
 }
 
 class Shape {
-    constructor(out, hols) {
-        this._Holes = [];
-        this._Shape = new three.Shape();
-        this._Outline = out || new Contour();
-        hols && this._Holes.push(...hols);
+    constructor(_Outline = new Contour, _Holes = []) {
+        this._Outline = _Outline;
+        this._Holes = _Holes;
     }
     get Outline() {
         return this._Outline;
@@ -9875,17 +9893,27 @@ class Shape {
     get BoundingBox() {
         return this._Outline.BoundingBox;
     }
-    set Outline(cus) {
-        this._Outline = cus;
-        this.UpdateShape();
+    set Outline(con) {
+        this._Outline = con;
     }
-    set Holes(cus) {
-        this._Holes = cus;
-        this.UpdateShape();
+    set Holes(holes) {
+        this._Holes = holes;
     }
     get Shape() {
-        this.UpdateShape();
-        return this._Shape;
+        let shape = this.Outline.Shape;
+        for (let h of this._Holes) {
+            if (h.Curve instanceof exports.Polyline)
+                h.Curve.UpdateOCSTo(this.Outline.Curve.OCS);
+            if (h.Curve instanceof exports.Circle) {
+                let sp = new three.Path();
+                let cen = h.Curve.Center.applyMatrix4(this.Outline.Curve.OCSInv);
+                sp.ellipse(cen.x, cen.y, h.Curve.Radius, h.Curve.Radius, 0, 2 * Math.PI, false, 0);
+                shape.holes.push(sp);
+            }
+            else
+                shape.holes.push(h.Shape);
+        }
+        return shape;
     }
     get Position() {
         return this._Outline.Curve.Position;
@@ -10036,8 +10064,8 @@ class Shape {
         //合并运算时提取出运算后的孔洞和形状
         const pickUpHoleOrShape = (srcHoles, tarHoles, outline) => {
             srcHoles.forEach(cu => {
-                let tmpContours = cu.SubstactBoolOperation(outline).sort((a, b) => b.Area - a.Area);
-                let isAllContainered = tmpContours.length > 1 && tmpContours.slice(1).every((cu, index) => tmpContours[0].CuInOutline(cu.Curve));
+                let tmpContours = cu.SubstactBoolOperation(outline).sort((a, b) => b.Area - a.Area); //面积从大到校
+                let isAllContainered = tmpContours.length > 1 && tmpContours.slice(1).every((cu, index) => tmpContours[0].ContainerCurve(cu.Curve, true));
                 //洞是否被最大的洞包含,是,则把被包含的洞都提取出来加入形状数组
                 if (isAllContainered) {
                     shapes.push(...this.targetOutlinesSubHoles(tmpContours.slice(1).map(c => new Shape(c)), tarHoles.map(c => new Shape(c))));
@@ -10151,7 +10179,7 @@ class Shape {
             let outline = contours.shift();
             //取出包含的洞
             arrayRemoveIf(contours, (con) => {
-                let bisIn = outline.CuInOutline(con.Curve);
+                let bisIn = outline.ContainerCurve(con.Curve, true);
                 if (bisIn)
                     tmpHoles.push(con);
                 return bisIn;
@@ -10238,30 +10266,15 @@ class Shape {
         let holes = [];
         if (tmpHoles.length <= 1)
             return tmpHoles;
-        tmpHoles.sort((a, b) => b.Area - a.Area);
+        tmpHoles.sort((a, b) => b.Area - a.Area); //面积从大到小排序
         while (tmpHoles.length) {
             let srcHole = tmpHoles.shift();
             holes.push(srcHole);
             //移除包含的洞
-            arrayRemoveIf(tmpHoles, h => srcHole.CuInOutline(h.Curve));
+            arrayRemoveIf(tmpHoles, h => srcHole.ContainerCurve(h.Curve, true));
         }
         return holes;
     }
-    UpdateShape() {
-        this._Shape = this.Outline.Shape;
-        for (let h of this._Holes) {
-            if (h.Curve instanceof exports.Polyline)
-                h.Curve.UpdateOCSTo(this.Outline.Curve.OCS);
-            if (h.Curve instanceof exports.Circle) {
-                let sp = new three.Path();
-                let cen = h.Curve.Center.applyMatrix4(this.Outline.Curve.OCSInv);
-                sp.ellipse(cen.x, cen.y, h.Curve.Radius, h.Curve.Radius, 0, 2 * Math.PI, false, 0);
-                this._Shape.holes.push(sp);
-            }
-            else
-                this._Shape.holes.push(h.Shape);
-        }
-    }
     //读写文件
     ReadFile(file) {
         file.Read(); //1
@@ -11634,6 +11647,7 @@ class PointShapeUtils {
     }
 }
 
+//为了避免Core对UI库的依赖,导致测试用例失败,导致外部项目引用失败,我们分离了这个函数
 var Intent;
 (function (Intent) {
     Intent["NONE"] = "none";
@@ -11647,6 +11661,11 @@ function Toaster(option) {
     for (let f of ToasterInjectFunctions)
         f(option);
 }
+const ToasterShowEntityMsgInjectFunctions = [];
+function ToasterShowEntityMsg(option) {
+    for (let f of ToasterShowEntityMsgInjectFunctions)
+        f(option);
+}
 
 var EMetalsType;
 (function (EMetalsType) {
@@ -11666,6 +11685,7 @@ var EFindType;
     EFindType[EFindType["RemoveModelingAndSpecial"] = 7] = "RemoveModelingAndSpecial";
     EFindType[EFindType["ModifyHardware"] = 8] = "ModifyHardware";
     EFindType[EFindType["FindMinSize"] = 9] = "FindMinSize";
+    EFindType[EFindType["GetHardWareOption"] = 10] = "GetHardWareOption";
 })(EFindType || (EFindType = {}));
 var ECompareType;
 (function (ECompareType) {
@@ -12010,7 +12030,7 @@ const DefaultClosingStripOption = {
 };
 Object.freeze(DefaultClosingStripOption);
 const DefaultBoardFindOption = {
-    version: 5,
+    version: 6,
     condition: {
         layer: false,
         height: false,
@@ -12024,6 +12044,7 @@ const DefaultBoardFindOption = {
         useSpecial: false,
         useModeling: false,
         roomName: false,
+        hardwareName: false,
         cabinetName: false,
         brName: false,
         material: false,
@@ -12051,6 +12072,7 @@ const DefaultBoardFindOption = {
         roomName: ECompareType.Equal,
         cabinetName: ECompareType.Equal,
         brName: ECompareType.Equal,
+        hardwareName: ECompareType.Equal,
         [EBoardKeyList.Mat]: ECompareType.Equal,
         [EBoardKeyList.Color]: ECompareType.Equal,
         [EBoardKeyList.BrMat]: ECompareType.Equal,
@@ -12073,6 +12095,7 @@ const DefaultBoardFindOption = {
     roomName: "",
     cabinetName: "",
     brName: "",
+    hardwareName: "",
     [EBoardKeyList.BrMat]: "",
     material: "",
     color: "",
@@ -13668,7 +13691,17 @@ class LookOverBoardInfosTool {
                 }
             }
             //封边
-            let sealData = GetBoardSealingData(GetSealedBoardContour(b, true, true));
+            let sealContour = GetSealedBoardContour(b, true, true);
+            if (!sealContour) {
+                ToasterShowEntityMsg({
+                    intent: Intent.DANGER,
+                    msg: "板件扣封边失败,请检查板件轮廓!",
+                    timeout: 10000,
+                    ent: b
+                });
+                throw "错误:板扣除封边失败!";
+            }
+            let sealData = GetBoardSealingData(sealContour);
             let color = b.BoardProcessOption[EBoardKeyList.Color];
             for (let data of sealData) {
                 if (equaln$1(0, data.size))
@@ -13762,12 +13795,6 @@ class LookOverBoardInfosTool {
 }
 const lookOverBoardInfosTool = new LookOverBoardInfosTool();
 
-const ReportFunctionList = [];
-function SendReport(msg) {
-    for (let f of ReportFunctionList)
-        f(msg);
-}
-
 const ShowObjectsFunctionList = [];
 function ShowSelectObjects(ens) {
     for (let f of ShowObjectsFunctionList)
@@ -13811,7 +13838,25 @@ function FastWireframe(br, color = 0, divCount = 6, optArc = true) {
         }
     return result;
 }
+function FastExtrudeEdgeGeometryOfShape(shape, z0, z1, divCount = 6, optArc = true, coords = []) {
+    let ptss = [shape.getPoints(divCount, optArc)];
+    for (let hole of shape.holes)
+        ptss.push(hole.getPoints(divCount, optArc));
+    for (let pts of ptss)
+        for (let i = 0; i < pts.length; i++) {
+            let p = pts[i];
+            let nextp = pts[FixIndex$1(i + 1, pts)];
+            //底面
+            coords.push(p.x, p.y, z0, nextp.x, nextp.y, z0);
+            //顶面
+            coords.push(p.x, p.y, z1, nextp.x, nextp.y, z1);
+            if (p["_mask_"]) //侧面
+                coords.push(p.x, p.y, z0, p.x, p.y, z1);
+        }
+    return coords;
+}
 let tempP = new three.Vector3;
+//这个代码天生不和Mesh对齐,因为独立坐标系的原因,槽的坐标系可能和主题的坐标系不一致导致的
 function FastExtrudeEdgeGeometry(ext, color = 0, divCount = 6, optArc = true, coords = [], inv = undefined) {
     color = color || ext.ColorIndex;
     let thickness = ext.Thickness;
@@ -15417,20 +15462,6 @@ exports.ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends exports.Entit
         }
         return this;
     }
-    get Position() {
-        return super.Position;
-    }
-    set Position(p) {
-        let v = p.clone().sub(this.Position);
-        if (equalv3(v, ZeroVec))
-            return;
-        super.Position = p;
-        let m = MoveMatrix(v);
-        for (let g of this.grooves)
-            g.ApplyMatrix(m);
-        //由于修改矩阵会导致bsp错误
-        this.csg = undefined;
-    }
     get Width() {
         return this.width;
     }
@@ -16360,9 +16391,9 @@ exports.ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends exports.Entit
     //分裂后重新将排钻实体设置给不同的实体
     HandleSpliteEntitys(splitEntitys) { }
     LazyGrooveCheckAll() {
+        this.IsLazyGrooveCheck = false;
         if (this.IsNeedGrooveCheck)
             this.GrooveCheckAllAutoSplit();
-        this.IsLazyGrooveCheck = false;
     }
     //#endregion
     //#region Draw
@@ -16558,7 +16589,7 @@ exports.ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends exports.Entit
             let holes = [];
             let ocsInv = this.OCSInv;
             let alMatrix4 = new three.Matrix4();
-            if (grooves.length < 1000)
+            if (grooves.length < MaxDrawGrooveCount)
                 for (let g of grooves) {
                     alMatrix4.multiplyMatrices(ocsInv, g.OCSNoClone);
                     let gContour = g.ContourCurve.Clone();
@@ -16579,6 +16610,15 @@ exports.ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends exports.Entit
             bgeo["IsMesh"] = true;
             this._MeshGeometry = bgeo;
             this.GenWorldUV(bgeo);
+            //edge geometry
+            if (grooves.length < MaxDrawGrooveCount) //这个代码保证线框和概念对齐
+             {
+                let coords = FastExtrudeEdgeGeometryOfShape(shape.Shape, 0, this.thickness, 12, true);
+                let edgeGeo = new three.BufferGeometry();
+                edgeGeo.setAttribute('position', new three.Float32BufferAttribute(coords, 3));
+                edgeGeo.applyMatrix4(contour.OCSNoClone);
+                this._EdgeGeometry = edgeGeo;
+            }
             return bgeo;
         }
         let builder = new ExtrudeGeometryBuilder(this);
@@ -16597,7 +16637,7 @@ exports.ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends exports.Entit
             return this._EdgeGeometry;
         //这里我们超过100就用这个,为了性能 和MaxDrawGrooveCount不一致
         if (this.grooves.length > 100 || this.grooves.every(g => equaln$1(g.thickness, this.thickness)) || this.grooves.length === 0) {
-            let coords = FastExtrudeEdgeGeometry(this, this.ColorIndex, 20, true);
+            let coords = FastExtrudeEdgeGeometry(this, this.ColorIndex, 12, true);
             let edgeGeo = new three.BufferGeometry();
             edgeGeo.setAttribute('position', new three.Float32BufferAttribute(coords, 3));
             this._EdgeGeometry = edgeGeo;
@@ -17642,6 +17682,9 @@ class Face {
             if (!sideReg || !noSideFace.Region)
                 return [];
             let toReg = noSideFace.Region.Clone().ApplyMatrix(diffMtx);
+            //注意: 排钻因为布尔运算失败的重灾区
+            // TestDraw(sideReg.Clone(), 1);
+            // TestDraw(toReg.Clone(), 2);
             isSuccess = sideReg.BooleanOper(toReg, BoolOpeartionType.Intersection);
             for (let s of sideReg.ShapeManager.ShapeList) {
                 let box = s.BoundingBox;
@@ -18239,7 +18282,10 @@ class FeedingToolPath extends Singleton {
             let isInt = false;
             for (let c of retCus) {
                 if (holes.length > 0) {
-                    isInt = holes.some(h => h.Curve.IntersectWith(c, 0).length > 0 || h.CuInOutline(c));
+                    isInt = holes.some(h => {
+                        let ipts = h.Curve.IntersectWith2(c, 0);
+                        return ipts.length > 0 || h.ContainerCurve(c, false, ipts);
+                    });
                     if (isInt)
                         break;
                 }
@@ -18313,7 +18359,7 @@ class FeedingToolPath extends Singleton {
         if (isCd)
             arrayRemoveIf(modelings, m => {
                 let c = m.shape.Outline.Curve;
-                if (c instanceof exports.Circle && c.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+                if (m.shape.Holes.length === 0 && c instanceof exports.Circle && c.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                     return true;
                 return false;
             });
@@ -18435,7 +18481,7 @@ class FeedingToolPath extends Singleton {
                 modelings[i].knifeRadius = HostApplicationServices.chaidanOption.radius;
             let m = modelings[i];
             let cu = m.shape.Outline.Curve;
-            if (cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+            if (m.shape.Holes.length === 0 && cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                 continue;
             let cus = this.GetModelFeedPath(br, m);
             if (cus.length === 0)
@@ -18448,7 +18494,7 @@ class FeedingToolPath extends Singleton {
         let errHoles = [];
         for (let m of [...modeling, ...sideModeling]) {
             let cu = m.shape.Outline.Curve;
-            if (cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+            if (m.shape.Holes.length === 0 && cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                 continue;
             if (HostApplicationServices.chaidanOption.useDefaultRad)
                 m.knifeRadius = HostApplicationServices.chaidanOption.radius;
@@ -18685,7 +18731,7 @@ var Production;
                 timeout: 8000,
                 intent: Intent.DANGER,
             });
-            Report([br.__OriginalEnt__ ?? br], br.Name + " 轮廓错误");
+            ShowSelectObjects([br.__OriginalEnt__ ?? br]);
             return undefined;
         }
         let sealedOutline = GetSealedBoardContour(br, false);
@@ -18695,7 +18741,7 @@ var Production;
                 timeout: 8000,
                 intent: Intent.DANGER,
             });
-            Report([br.__OriginalEnt__ ?? br], br.Name + "扣除封边轮廓有误");
+            ShowSelectObjects([br.__OriginalEnt__ ?? br]);
             return;
         }
         let offsetTanslation = sealedOutline.BoundingBox.min;
@@ -18777,7 +18823,7 @@ var Production;
             let data = [];
             for (let m of ms) {
                 let cu = m.shape.Outline.Curve;
-                if (cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+                if (m.shape.Holes.length === 0 && cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                     continue;
                 if (HostApplicationServices.chaidanOption.useDefaultRad)
                     m.knifeRadius = HostApplicationServices.chaidanOption.radius;
@@ -18804,7 +18850,7 @@ var Production;
             let data = [];
             for (let m of ms) {
                 let cu = m.shape.Outline.Curve;
-                if (cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+                if (m.shape.Holes.length === 0 && cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                     continue;
                 if (HostApplicationServices.chaidanOption.useDefaultRad)
                     m.knifeRadius = HostApplicationServices.chaidanOption.radius;
@@ -18952,7 +18998,7 @@ var Production;
         }
         for (let m of modelings) {
             let cu = m.shape.Outline.Curve;
-            if (cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6) {
+            if (m.shape.Holes.length === 0 && cu instanceof exports.Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6) {
                 let center = cu.Center.setZ(0).sub(offsetTanslation);
                 data.frontBackHoles.push({
                     type: exports.GangDrillType.Pxl,
@@ -19011,12 +19057,13 @@ var Production;
             }
         }
         else if (d.Type === exports.GangDrillType.Ljg || d.Type === exports.GangDrillType.Wood) {
-            if (!isParallelTo(d.Normal, brNormal, CanDrawHoleFuzz)) {
+            if (isPerpendicularityTo(d.Normal, brNormal, CanDrawHoleFuzz)) //侧孔
+             {
                 let z = position.z;
                 if (!IsBetweenA2B(z, -d.Radius, br.Thickness + d.Radius, 1e-6))
                     return;
-                let sp = position.clone().setZ(0).add(d.Normal.multiplyScalar(-CanDrawHoleFuzz).applyMatrix4(roMat)); //加长线(以便加大容差)
-                let ep = position.clone().setZ(0).add(d.Normal.multiplyScalar(d.Height + CanDrawHoleFuzz).applyMatrix4(roMat)); //加长线
+                let sp = position.clone().add(d.Normal.multiplyScalar(-CanDrawHoleFuzz).applyMatrix4(roMat)).setZ(0); //加长线(以便加大容差)
+                let ep = position.clone().add(d.Normal.multiplyScalar(d.Height + CanDrawHoleFuzz).applyMatrix4(roMat)).setZ(0); //加长线
                 let line = new exports.Line(sp, ep);
                 let pt = outline.IntersectWith(line, 0)[0];
                 if (!pt) {
@@ -19308,11 +19355,6 @@ var Production;
         return pl;
     }
     Production.Data2Polyline = Data2Polyline;
-    function Report(ens, msg) {
-        ShowSelectObjects(ens);
-        SendReport(msg);
-    }
-    Production.Report = Report;
     function Get2DModeing(br, offset) {
         let res = [];
         let tmtx = MoveMatrix(offset.clone().negate());
@@ -19917,20 +19959,9 @@ function VData2Curve(data) {
 }
 
 var Board_1;
-//转换板件类型成为空间类型. 0x 1y 2z
-function ConverBoardTypeToSpaceType(type) {
-    switch (type) {
-        case BoardType.Layer:
-            return 2;
-        case BoardType.Vertical:
-            return 0;
-        case BoardType.Behind:
-            return 1;
-    }
-}
 //排钻配置名是合法的
 function IsValidDriName(name) {
-    return name === "不排" || HostApplicationServices.DrillConfigs.has(name);
+    return name === DrillType.None || name === DrillType.More || HostApplicationServices.DrillConfigs.has(name);
 }
 /**
  * 板件实体
@@ -21427,19 +21458,26 @@ class Matrix2 {
 }
 
 function EntityUpdateWrap(ent, exec) {
-    let bak = ent.AutoUpdate;
+    let oldAutoUpdate = ent.AutoUpdate;
     ent.AutoUpdate = false;
     exec();
-    ent.DeferUpdate();
-    ent.AutoUpdate = bak;
+    if (oldAutoUpdate) //如果原先是自动更新的,那么我们更新它,否则还是不更新(避免层层嵌套导致的性能优化丢失)
+        ent.DeferUpdate();
+    ent.AutoUpdate = oldAutoUpdate;
 }
 function EntitysUpdateWrap(ens, exec) {
-    let baks = ens.map(e => e.AutoUpdate);
+    let baks = ens.map(e => {
+        let oldAutoUpdate = e.AutoUpdate;
+        e.AutoUpdate = false;
+        return oldAutoUpdate;
+    });
     exec();
     for (let i = 0; i < ens.length; i++) {
-        let en = ens[i];
-        en.DeferUpdate();
-        en.AutoUpdate = baks[i];
+        if (baks[i]) {
+            let en = ens[i];
+            en.DeferUpdate();
+            en.AutoUpdate = true;
+        }
     }
 }
 
@@ -21838,6 +21876,8 @@ var WallSnapMode;
 })(WallSnapMode || (WallSnapMode = {}));
 
 const CURVE_FACE_TYPE_KEY = "__CURVE_FACE_TYPE_KEY__"; //用来存储墙体类型的key
+const CURVE_DIR_TYPE_KEY = "__CURVE_DIR_TYPE_KEY__"; //方向
+const CURVE_WALL_TYPE_KEY = "__CURVE_WALL_TYPE_KEY__"; //墙
 exports.WallFaceType = void 0;
 (function (WallFaceType) {
     WallFaceType[WallFaceType["Inside"] = 0] = "Inside";
@@ -23799,7 +23839,7 @@ exports.Light = Light_1 = class Light extends exports.Entity {
     }
     set Color(color) {
         this.WriteAllObjectRecord();
-        this._LightColor = color;
+        this._LightColor.set(color);
         this.Update();
     }
     get ShowHelper() {
@@ -23973,6 +24013,24 @@ exports.DirectionalLight = class DirectionalLight extends exports.Light {
             this.Update();
         }
     }
+    get SunPosition() { return super.Position; }
+    set SunPosition(p) {
+        if (equaln$1(p.x, this._Matrix.elements[12])
+            && equaln$1(p.y, this._Matrix.elements[13])
+            && equaln$1(p.z, this._Matrix.elements[14]))
+            return;
+        this.WriteAllObjectRecord();
+        this._Matrix.setPosition(p);
+        this.Update(exports.UpdateDraw.Geometry);
+    }
+    get Position() { return super.Position; }
+    set Position(p) {
+        console.error("不支持的用法! 错误的设计");
+        let bak = this._Target.toArray();
+        super.Position = p;
+        this._Target.fromArray(bak);
+        this.Update(exports.UpdateDraw.Geometry);
+    }
     get WebIntensity() {
         let x = this._Intensity / 150;
         x = Math.pow(x, 0.4);
@@ -23995,7 +24053,7 @@ exports.DirectionalLight = class DirectionalLight extends exports.Light {
         if (indexList[0] === 0)
             this.Position = this.Position.add(vec);
         else
-            this.Target = this.Target.add(vec);
+            this._Target.add((vec));
     }
     InitDrawObject(renderType = exports.RenderType.Wireframe) {
         let lightGroup = new three.Group();
@@ -26624,6 +26682,11 @@ exports.TemplateParam = __decorate([
     Factory
 ], exports.TemplateParam);
 
+const BoardType2SplitType = [2, 0, 1];
+//转换板件类型成为空间类型. 0x 1y 2z
+function ConverBoardTypeToSplitType(type) {
+    return BoardType2SplitType[type];
+}
 /**
  * 夹层空间分析
  */
@@ -26642,7 +26705,7 @@ class ClampSpaceParse extends ISpaceParse {
         //单层空间(用于切割)
         let spliteBoxs = new Map();
         for (let [boardType, boards] of this.BoardMap) {
-            let splitType = ConverBoardTypeToSpaceType(boardType);
+            let splitType = ConverBoardTypeToSplitType(boardType);
             let boardBoxCol = this.ParseBoardBox(boards, splitType);
             //#IWFYY
             if (boardType === BoardType.Behind && this.BoardMap.size > 1 && boardBoxCol.length > 1) {
@@ -26703,13 +26766,13 @@ class ClampSpaceParse extends ISpaceParse {
                 this.ParseOK = false;
                 return;
             }
-            let splitType = ConverBoardTypeToSpaceType(type);
+            let splitType = ConverBoardTypeToSplitType(type);
             let p1 = box.min.clone().setComponent(splitType, box.min.getComponent(splitType) - dist);
             let p2 = box.max.clone().setComponent(splitType, box.min.getComponent(splitType));
             let p3 = box.min.clone().setComponent(splitType, box.max.getComponent(splitType));
             let p4 = box.max.clone().setComponent(splitType, box.max.getComponent(splitType) + dist);
             let boxs = [new Box3Ext().setFromPoints([p1, p2]), new Box3Ext().setFromPoints([p3, p4])];
-            this.SpaceBox = await this.WrapSelectBox(boxs, ConverBoardTypeToSpaceType(br.BoardType));
+            this.SpaceBox = await this.WrapSelectBox(boxs, splitType);
             if (this.SpaceBox)
                 this.ParseOK = true;
         }
@@ -26750,6 +26813,8 @@ class ClampSpaceParse extends ISpaceParse {
         }
         for (let [splitType, spBox] of spliteBoxes) {
             let remBoxs = orgBox.substract(spBox, splitType);
+            if (remBoxs[0] === orgBox) //如果切割失败,证明这个板没办法影响空间分析,所以移除它.
+             ;
             if (remBoxs.length === 0)
                 return undefined;
             else if (remBoxs.length === 1) {
@@ -27242,8 +27307,6 @@ exports.TemplateRecord = TemplateRecord_1 = class TemplateRecord extends SymbolT
                 this.RZParam.expr = "";
             }
         }
-        //相对定位. use PX PY PZ
-        this.UpdatePosition(paramMap, evaled);
         //更新LWH(通过定位空间)
         this.LParam.UpdateParam(this._CacheSpaceSize.x);
         this.WParam.UpdateParam(this._CacheSpaceSize.y);
@@ -27259,6 +27322,8 @@ exports.TemplateRecord = TemplateRecord_1 = class TemplateRecord extends SymbolT
         //删除材质变量(材质变量仅在KJL导入中使用,重新出现在右侧列表中是不明智的?) (但是用户可能编辑更新了它?)
         // arrayRemoveIf(this.Params, p => p.type === TemplateParamType.Material);
         this.UpdateEntitys();
+        //相对定位. use PX PY PZ(这个代码在这里,保证所有的变量都是最新的. 这样我们就可以使用H/2自己定位到自己空间的一半位置)(这个只会修改定位,所以放在这里并不会影响其他的代码)
+        this.UpdatePosition(paramMap, evaled);
         //变换到新的模版空间
         for (let en of ens) {
             en.ApplyMatrix(this._CacheSpaceCS);
@@ -29043,6 +29108,7 @@ exports.TemplateWineRackRecord = __decorate([
     Factory
 ], exports.TemplateWineRackRecord);
 
+//铰链
 function IsHinge(en) {
     if (en instanceof exports.HardwareCompositeEntity) {
         if (en.Template) {
@@ -29277,6 +29343,7 @@ exports.Text = class Text extends exports.Entity {
 exports.Text = __decorate([
     Factory
 ], exports.Text);
+const DbText = exports.Text;
 
 const EmptyArray = [];
 exports.VisualSpaceBox = class VisualSpaceBox extends exports.Entity {
@@ -29641,7 +29708,7 @@ class CameraUpdate {
      */
     Pan(mouseMove) {
         mouseMove.y *= -1;
-        mouseMove.multiplyScalar(-this._ViewHeight / (this._Height * window.devicePixelRatio));
+        mouseMove.multiplyScalar(-this._ViewHeight / this._Height);
         mouseMove.applyQuaternion(this.Camera.quaternion);
         this._Target.add(mouseMove);
         this._Target.clamp(ViewScopeMin, ViewScopeMax);
@@ -33905,6 +33972,46 @@ exports.PositioningBoardSpace = __decorate([
     Factory
 ], exports.PositioningBoardSpace);
 
+/**
+ * 拉手的定位空间
+ */
+exports.PositioningHandleSpace = class PositioningHandleSpace extends exports.Positioning {
+    constructor(_ObjectId) {
+        super();
+        this.ObjectId = _ObjectId;
+    }
+    /**
+    * 定位
+    */
+    async Positioning() {
+        this.SpaceCS = undefined;
+        this.SpaceSize = undefined;
+        if (this.ObjectId && !this.ObjectId.IsErase) {
+            let ent = this.ObjectId.Object;
+            this.SpaceCS = ent.SpaceOCS;
+            let box = ent.GetBoundingBoxInMtx(ent.SpaceOCSInv);
+            this.SpaceSize = box.getSize(new three.Vector3);
+            let baseP = box.min.applyMatrix4(this.SpaceCS);
+            this.SpaceCS.setPosition(baseP);
+        }
+    }
+    //#region File
+    ReadFile(file) {
+        file.Read();
+        this.ObjectId = file.ReadObjectId();
+    }
+    WriteFile(file) {
+        file.Write(1);
+        file.WriteObjectId(this.ObjectId);
+    }
+};
+__decorate([
+    AutoRecord
+], exports.PositioningHandleSpace.prototype, "ObjectId", void 0);
+exports.PositioningHandleSpace = __decorate([
+    Factory
+], exports.PositioningHandleSpace);
+
 /**
  * 板件模板的基类.(层板,立板,背板)
  */
@@ -34286,23 +34393,22 @@ class ActivityLayerBoardTool {
         }
         return 0;
     }
-    BuildNails(initNail, nailOpt, face, fYVec) {
+    BuildNails(initNail, nailOpt, face, fYVec, nailCount) {
         let fXVec = new three.Vector3().setFromMatrixColumn(face.OCS, 0);
         let addCount = nailOpt.addCount;
-        let count = nailOpt.count;
         let dist = nailOpt.dist;
         let frontDist = nailOpt.front;
         let backDist = nailOpt.behind;
         let singleDist;
         //绘制数量为1时,层板钉在中间位置
-        if (count === 1)
+        if (nailCount === 1)
             singleDist = face.Length / 2 - frontDist;
         else
-            singleDist = (face.Length - frontDist - backDist) / (count - 1);
+            singleDist = (face.Length - frontDist - backDist) / (nailCount - 1);
         let buildNails = [];
         //构建层板钉
-        for (let i = 0; i < count; i++) {
-            if (count === 1) {
+        for (let i = 0; i < nailCount; i++) {
+            if (nailCount === 1) {
                 initNail.ApplyMatrix(MoveMatrix(fXVec.multiplyScalar(singleDist)));
                 buildNails.push(initNail);
             }
@@ -34388,10 +34494,12 @@ class ActivityLayerBoardTool {
                         zDist += (-nail.Height + nailOption.depth);
                         nail.Position = nail.Position.add(new three.Vector3(xDist, yDist, zDist));
                         nail.ApplyMatrix(zRoMat).ApplyMatrix(face.OCS);
+                        //层板钉数
+                        let nailCount = nailOption.count;
                         if (option || this.NailRules)
-                            nailOption.count = this.GetRuleCount(face.Length, rules);
+                            nailCount = this.GetRuleCount(face.Length, rules);
                         let yVec = new three.Vector3().setFromMatrixColumn(otherBoard.OCS, 1);
-                        let nails = this.BuildNails(nail, nailOption, face, yVec);
+                        let nails = this.BuildNails(nail, nailOption, face, yVec, nailCount);
                         for (let nail of nails)
                             nailBoardMap.set(nail, otherBoard);
                         allNails.push(...nails);
@@ -34650,18 +34758,20 @@ exports.TemplateLeftRightBoardRecord = class TemplateLeftRightBoardRecord extend
         let thickness = this.GetParam("BH")?.value ?? 18;
         let zs = this.GetParam("ZS")?.value ?? 0; //左缩
         let ys = this.GetParam("YS")?.value ?? 0; //右缩
-        lBr.Thickness = thickness;
-        rBr.Thickness = thickness;
-        if (!this._CacheSpaceSize) {
-            console.warn("左右侧板模板数据错误无法更新");
-            return;
-        }
-        lBr.Height = this._CacheSpaceSize.z;
-        rBr.Height = this._CacheSpaceSize.z;
-        lBr.Width = this._CacheSpaceSize.y - zs;
-        rBr.Width = this._CacheSpaceSize.y - ys;
-        lBr.Position = new three.Vector3(0, zs, 0);
-        rBr.Position = new three.Vector3(this._CacheSpaceSize.x - rBr.Thickness, ys, 0);
+        EntitysUpdateWrap([lBr, rBr], () => {
+            lBr.Thickness = thickness;
+            rBr.Thickness = thickness;
+            if (!this._CacheSpaceSize) {
+                console.warn("左右侧板模板数据错误无法更新");
+                return;
+            }
+            lBr.Height = this._CacheSpaceSize.z;
+            rBr.Height = this._CacheSpaceSize.z;
+            lBr.Width = this._CacheSpaceSize.y - zs; //似乎用拉伸来做比较好,这样能保持住背板对他的拉槽.
+            rBr.Width = this._CacheSpaceSize.y - ys;
+            lBr.Position = new three.Vector3(0, zs, 0);
+            rBr.Position = new three.Vector3(this._CacheSpaceSize.x - rBr.Thickness, ys, 0);
+        });
     }
     ReadFile(file) {
         super.ReadFile(file);
@@ -36336,6 +36446,14 @@ class RegionReplacement {
 //分析可用的内空间(墙面方向指向空间内部为内空间) 否则为外墙空间
 //构造面域树? 不需要了? 还是需要的 需要一个最大的天花板
 //区域对象 (地面+天花?)
+const ROOM_REGION_CURVES_KEY = "__ROOM_REGION_CURVES_KEY__";
+//墙内曲线的类型
+var WallCurveDirType;
+(function (WallCurveDirType) {
+    WallCurveDirType[WallCurveDirType["left"] = 0] = "left";
+    WallCurveDirType[WallCurveDirType["right"] = 1] = "right";
+    WallCurveDirType[WallCurveDirType["lid"] = 2] = "lid";
+})(WallCurveDirType || (WallCurveDirType = {}));
 /**
  * 区域分析(房间+外墙+全屋顶)
  */
@@ -36364,24 +36482,32 @@ class RoomRegionParse {
             for (let c of wall.LeftCurves) {
                 curves.push(c);
                 leftCurves.add(c);
+                c[CURVE_DIR_TYPE_KEY] = WallCurveDirType.left;
+                c[CURVE_WALL_TYPE_KEY] = wall;
             }
-            for (let c of wall.RightCurves)
+            for (let c of wall.RightCurves) {
                 curves.push(c);
-            for (let c of wall.LidCurves)
+                c[CURVE_DIR_TYPE_KEY] = WallCurveDirType.right;
+                c[CURVE_WALL_TYPE_KEY] = wall;
+            }
+            for (let c of wall.LidCurves) {
                 curves.push(c);
+                c[CURVE_DIR_TYPE_KEY] = WallCurveDirType.lid;
+                c[CURVE_WALL_TYPE_KEY] = wall;
+            }
         }
         const REGION_PARSE_NUM = 3;
         const POLYLINE_JOIN_FUZZ = Math.pow(10, -REGION_PARSE_NUM);
-        let parse = new RegionParse(curves, REGION_PARSE_NUM);
-        for (let [orgArc, arcs] of parse.ExpLineMap) {
+        let regParse = new RegionParse(curves, REGION_PARSE_NUM);
+        for (let [orgArc, arcs] of regParse.ExpLineMap) {
             if (leftCurves.has(orgArc))
                 for (let arc of arcs)
                     leftCurves.add(arc);
         }
         let regionPolylines = [];
-        let map = new Map();
+        let regPolyline2RoutesMap = new Map(); //区域轮廓多段线->墙线 映射
         //分析内外墙1内2外
-        for (let routes of parse.RegionsOutline) {
+        for (let routes of regParse.RegionsOutline) {
             let pl = exports.Polyline.Combine(routes.map(r => r.curve), POLYLINE_JOIN_FUZZ);
             // for (let i = 0; i < routes.length; i++)
             // {
@@ -36395,20 +36521,27 @@ class RoomRegionParse {
             // }
             // TestDraw(routes[0].curve); //test
             regionPolylines.push(pl);
-            map.set(pl, routes);
+            regPolyline2RoutesMap.set(pl, routes);
         }
         //不可能有内部轮廓 如果有 就证明错了
-        for (let routes of parse.RegionsInternal) {
+        for (let routes of regParse.RegionsInternal) {
             let pl = exports.Polyline.Combine(routes.map(r => r.curve));
             pl.ColorIndex = pl.Area2 > 0 ? 3 : 4;
             // throw "未知错误 出现外部轮廓"
         }
+        //面域分析炸开的线和原始轮廓的关联关系
+        for (let [orgArc, newArcs] of regParse.ExpLineMap) {
+            for (let arc of newArcs) {
+                arc[CURVE_DIR_TYPE_KEY] = orgArc[CURVE_DIR_TYPE_KEY];
+                arc[CURVE_WALL_TYPE_KEY] = orgArc[CURVE_WALL_TYPE_KEY];
+            }
+        }
         let cons = regionPolylines.map(pl => new ContourTreeNode(Contour.CreateContour(pl, false)));
         ContourTreeNode.ParseContourTree(cons);
         let roofs = [];
         //解析 天花板区域 内空区域
         for (let con of cons) {
-            let routes = map.get(con.contour.Curve);
+            let routes = regPolyline2RoutesMap.get(con.contour.Curve);
             if (con.contour.Curve.ColorIndex === 2) //天花板区域(或者柱子)
              {
                 if (con.Depth !== 0 || con.area < 1e6) //柱子
@@ -36476,6 +36609,7 @@ class RoomRegionParse {
                     this._UpdateDb.ModelSpace.Append(floor);
                     this._UpdateDb.ModelSpace.Append(top);
                     let region = new exports.RoomRegion(name, top.Id, floor.Id, floor.Area);
+                    region[ROOM_REGION_CURVES_KEY] = routes.map(r => r.curve);
                     region.Position = pos;
                     this._UpdateDb.ModelSpace.Append(region);
                     floor.RegionId = region.Id;
@@ -36483,8 +36617,8 @@ class RoomRegionParse {
                 }
             }
         }
-        for (let [orgArc, arcs] of parse.ExpLineMap)
-            orgArc[CURVE_FACE_TYPE_KEY] = arcs[0][CURVE_FACE_TYPE_KEY];
+        for (let [orgArc, arcs] of regParse.ExpLineMap)
+            orgArc[CURVE_FACE_TYPE_KEY] = arcs[0][CURVE_FACE_TYPE_KEY]; //圆弧不可能被两个房间拥有,所以这个写法没问题
         for (let wall of walls) {
             // 因为我们现在没有分裂圆弧 所以我们不需要在合并线
             // wall.LeftCurves && arrayRemoveDuplicateBySort(wall.LeftCurves, (cu1: Curve, cu2: Curve) => cu1.Join(cu2) === Status.True);
@@ -37242,12 +37376,14 @@ exports.AxisCS = AxisCS;
 exports.BUL_IS_LINE_FUZZ = BUL_IS_LINE_FUZZ;
 exports.CADFactory = CADFactory;
 exports.CADFiler = CADFiler;
+exports.CURVE_DIR_TYPE_KEY = CURVE_DIR_TYPE_KEY;
 exports.CURVE_FACE_TYPE_KEY = CURVE_FACE_TYPE_KEY;
 exports.CURVE_MESH_NAMES = CURVE_MESH_NAMES;
+exports.CURVE_WALL_TYPE_KEY = CURVE_WALL_TYPE_KEY;
 exports.CameraUpdate = CameraUpdate;
 exports.ContourTreeNode = ContourTreeNode;
-exports.ConverBoardTypeToSpaceType = ConverBoardTypeToSpaceType;
 exports.CurveTapeShape = CurveTapeShape;
+exports.DbText = DbText;
 exports.DisposeTextShapeCache = DisposeTextShapeCache;
 exports.ExtrudeBuildConfig = ExtrudeBuildConfig;
 exports.ExtrudeGeometryBuilder = ExtrudeGeometryBuilder;

api.esm.js

@@ -1576,28 +1576,15 @@ let Entity = Entity_1 = class Entity extends CADObject {
     Move(v) {
         if (equaln$1(v.x, 0) && equaln$1(v.y, 0) && equaln$1(v.z, 0))
             return;
-        this.WriteAllObjectRecord();
-        this._Matrix.elements[12] += v.x;
-        this._Matrix.elements[13] += v.y;
-        this._Matrix.elements[14] += v.z;
-        this._SpaceOCS.elements[12] += v.x;
-        this._SpaceOCS.elements[13] += v.y;
-        this._SpaceOCS.elements[14] += v.z;
-        this.Update(UpdateDraw.Matrix);
+        tempMatrix1.identity().setPosition(v.x, v.y, v.z);
+        this.ApplyMatrix(tempMatrix1);
         return this;
     }
     set Position(pt) {
         let moveX = pt.x - this._Matrix.elements[12];
         let moveY = pt.y - this._Matrix.elements[13];
         let moveZ = pt.z - this._Matrix.elements[14];
-        if (moveX === 0 && moveY === 0 && moveZ === 0)
-            return;
-        this.WriteAllObjectRecord();
-        this._Matrix.setPosition(pt);
-        this._SpaceOCS.elements[12] += moveX;
-        this._SpaceOCS.elements[13] += moveY;
-        this._SpaceOCS.elements[14] += moveZ;
-        this.Update(UpdateDraw.Matrix);
+        this.Move({ x: moveX, y: moveY, z: moveZ });
     }
     get Z() { return this._Matrix.elements[14]; }
     set Z(z) {
@@ -2831,7 +2818,7 @@ function CreatePolylinePath(pts, buls) {
     return shape;
 }
 
-function GetGoodShaderSimple(color = new Vector3, side = FrontSide) {
+function GetGoodShaderSimple(color = new Vector3, side = FrontSide, logBuf = false) {
     return {
         uniforms: {
             "SurfaceColor": { value: color }
@@ -3147,7 +3134,7 @@ class ColorMaterial {
         let key = `${color}${side}`;
         if (this._ConceptualMaterial.has(key))
             return this._ConceptualMaterial.get(key);
-        let shaderParams = GetGoodShaderSimple(new Vector3().fromArray(this.GetColor(color).toArray()), side);
+        let shaderParams = GetGoodShaderSimple(new Vector3().fromArray(this.GetColor(color).toArray()), side, ColorMaterial.UseLogBuf);
         let mtl = new ShaderMaterial(shaderParams);
         this._ConceptualMaterial.set(key, mtl);
         return mtl;
@@ -3485,8 +3472,8 @@ let Curve = class Curve extends Entity {
     GetPointAtDistance(distance) { return; }
     GetDistAtParam(param) { return; }
     GetDistAtPoint(pt) { return; }
-    GetParamAtPoint(pt) { return; }
-    GetParamAtPoint2(pt) { return this.GetParamAtPoint(pt); }
+    GetParamAtPoint(pt, fuzz = 1e-6) { return; }
+    GetParamAtPoint2(pt, fuzz = 1e-6) { return this.GetParamAtPoint(pt, fuzz); }
     GetParamAtDist(d) { return; }
     /**
      * 返回曲线在指定位置的一阶导数(在wcs内)
@@ -3535,8 +3522,8 @@ let Curve = class Curve extends Entity {
     //翻转曲线.首尾调换.
     Reverse() { return this; }
     //点在曲线上
-    PtOnCurve(pt, fuzz = 1e-6) {
-        return equalv3(this.StartPoint, pt, fuzz) || equalv3(this.EndPoint, pt, fuzz) || this.ParamOnCurve(this.GetParamAtPoint(pt));
+    PtOnCurve(pt, fuzz = 1e-5) {
+        return equalv3(this.StartPoint, pt, fuzz) || equalv3(this.EndPoint, pt, fuzz) || this.ParamOnCurve(this.GetParamAtPoint(pt, fuzz));
     }
     //点在曲线中,不在起点或者终点.
     PtOnCurve2(pt) {
@@ -3818,9 +3805,9 @@ let Line = Line_1 = class Line extends Curve {
     GetPointAtParam(param) {
         return this.StartPoint.add(this.GetFistDeriv(0).multiplyScalar(param));
     }
-    GetParamAtPoint(pt) {
+    GetParamAtPoint(pt, fuzz = 1e-5) {
         let { closestPt, param } = this.GetClosestAtPoint(pt, true);
-        if (!equalv3(closestPt, pt, 1e-5))
+        if (!equalv3(closestPt, pt, fuzz))
             return NaN;
         return param;
     }
@@ -5621,20 +5608,20 @@ var BoolOpeartionType;
 })(BoolOpeartionType || (BoolOpeartionType = {}));
 const fuzz = 1e-3;
 let fuzzV3 = new Vector3(fuzz, fuzz, fuzz);
-//判断曲线是否在源封闭曲线内
-function isTargetCurInOrOnSourceCur(sourceCur, targetCur) {
-    if (!sourceCur.BoundingBox.expandByVector(fuzzV3).containsBox(targetCur.BoundingBox))
+//判断小曲线是不是被大曲线包含(或者重叠?)
+function isTargetCurInOrOnSourceCur(bigCurve, smallCurve) {
+    if (!bigCurve.BoundingBox.expandByVector(fuzzV3).containsBox(smallCurve.BoundingBox))
         return false;
     let cus = [];
-    if (targetCur instanceof Polyline)
-        cus = targetCur.Explode();
+    if (smallCurve instanceof Polyline)
+        cus = smallCurve.Explode();
     else
-        cus = [targetCur];
+        cus = [smallCurve];
     return cus.every(c => {
-        let pts = getIntPtContextPts(sourceCur, c);
+        let pts = getIntPtContextPts(bigCurve, c);
         if (pts.length <= 1)
             pts.push(c.StartPoint, c.EndPoint);
-        return IsPtsAllInOrOnReg(sourceCur, pts);
+        return IsPtsAllInOrOnReg(bigCurve, pts);
     });
 }
 //获取交点处上下距0.01par的点
@@ -5834,12 +5821,12 @@ class Contour {
         let sourceContainerTarget;
         let targetContainerSource;
         if (sourceOutline.Area > targetOutline.Area) {
-            sourceContainerTarget = interPts.length === 0 ? fastCurveInCurve(sourceOutline, targetOutline) : this.CuInOutline(targetOutline);
+            sourceContainerTarget = CurveContainerCurve(sourceOutline, targetOutline, interPts);
             targetContainerSource = false;
         }
         else {
             sourceContainerTarget = false;
-            targetContainerSource = interPts.length === 0 ? fastCurveInCurve(targetOutline, sourceOutline) : target.CuInOutline(sourceOutline);
+            targetContainerSource = CurveContainerCurve(targetOutline, sourceOutline, interPts);
         }
         //包含.相交.分离(三种状态)
         if (sourceContainerTarget) //源包含目标
@@ -6076,8 +6063,15 @@ class Contour {
     get Shape() {
         return this._Curve.Shape;
     }
-    CuInOutline(targetCur) {
-        return isTargetCurInOrOnSourceCur(this._Curve, targetCur);
+    /**
+     * 判断是否完全包含曲线
+     * @param smallCurve 传入的这个曲线不能比本轮廓还大(这个需要自己优化?)
+     * @returns
+     */
+    ContainerCurve(smallCurve, isAreaCheckd = false, ipts = undefined) {
+        if (!isAreaCheckd && this.Area < smallCurve.Area)
+            return false;
+        return CurveContainerCurve(this._Curve, smallCurve, ipts);
     }
     Equal(tar) {
         return equalCurve(this._Curve, tar._Curve);
@@ -6096,15 +6090,30 @@ function fastEqualCurve(c1, c2, tolerance = 1e-3) {
         return false;
     return equalv3(c1.Midpoint, c2.Midpoint, tolerance);
 }
-//对于双多段线互相切割后的结果,快速判断曲线是否在另一条曲线内部
-//也许有一天这个中点算法需要改一下, 使用.MidPoint比较稳妥
-function fastCurveInCurve(sourceCu, targetCu) {
-    return sourceCu.PtInCurve(targetCu.Midpoint);
+/**
+ * 对于双多段线互相切割后的结果(或者交点个数为0),快速判断曲线是否在另一条曲线内部
+ * @param bigCurve
+ * @param smallCurve
+ * @returns
+ */
+function fastCurveInCurve(bigCurve, smallCurve) {
+    return bigCurve.PtInCurve(smallCurve.Midpoint);
 }
 //当交点小于等于1时
-function fastCurveInCurve2(sourceCu, targetCu) {
-    return sourceCu.PtInCurve(targetCu.StartPoint) ||
-        sourceCu.PtInCurve(targetCu.Midpoint);
+function fastCurveInCurve2(bigCurve, smallCurve) {
+    return bigCurve.PtInCurve(smallCurve.StartPoint) ||
+        bigCurve.PtInCurve(smallCurve.Midpoint);
+}
+//大曲线是否完全包含小曲线(或者重合)
+function CurveContainerCurve(bigCurve, smallCurve, ipts = undefined, fuzz = COMBINE_FUZZ) {
+    if (!ipts)
+        ipts = bigCurve.IntersectWith2(smallCurve, IntersectOption.ExtendNone, fuzz);
+    if (ipts.length === 0)
+        return fastCurveInCurve(bigCurve, smallCurve);
+    else if (ipts.length === 1)
+        return fastCurveInCurve2(bigCurve, smallCurve);
+    else
+        return isTargetCurInOrOnSourceCur(bigCurve, smallCurve);
 }
 
 class CurveTreeNode {
@@ -7652,10 +7661,10 @@ let Polyline = Polyline_1 = class Polyline extends Curve {
         pl.LineData = lineData;
         return pl;
     }
-    PtOnCurve(pt) {
+    PtOnCurve(pt, fuzz = 1e-6) {
         for (let i = 0; i < this.EndParam; i++) {
             let c = this.GetCurveAtIndex(i);
-            if (c.PtOnCurve(pt))
+            if (c.PtOnCurve(pt, fuzz))
                 return true;
         }
         return false;
@@ -7872,6 +7881,17 @@ let Polyline = Polyline_1 = class Polyline extends Curve {
         }
         return box;
     }
+    SetPtsBuls(pts, buls) {
+        this.WriteAllObjectRecord();
+        this._LineData.length = 0;
+        for (let i = 0; i < pts.length; i++) {
+            let pt = pts[i];
+            let bul = buls[i];
+            this._LineData.push({ pt, bul });
+        }
+        this.Update();
+        return this;
+    }
     /**
      * 得到曲线有用的点表和凸度(闭合曲线首尾重复)
      */
@@ -9827,11 +9847,9 @@ function ScaleUV2(geo, ocs, xScale = 1e-3, yScale = 1e-3, isInvert = false) {
 }
 
 class Shape {
-    constructor(out, hols) {
-        this._Holes = [];
-        this._Shape = new Shape$1();
-        this._Outline = out || new Contour();
-        hols && this._Holes.push(...hols);
+    constructor(_Outline = new Contour, _Holes = []) {
+        this._Outline = _Outline;
+        this._Holes = _Holes;
     }
     get Outline() {
         return this._Outline;
@@ -9847,17 +9865,27 @@ class Shape {
     get BoundingBox() {
         return this._Outline.BoundingBox;
     }
-    set Outline(cus) {
-        this._Outline = cus;
-        this.UpdateShape();
+    set Outline(con) {
+        this._Outline = con;
     }
-    set Holes(cus) {
-        this._Holes = cus;
-        this.UpdateShape();
+    set Holes(holes) {
+        this._Holes = holes;
     }
     get Shape() {
-        this.UpdateShape();
-        return this._Shape;
+        let shape = this.Outline.Shape;
+        for (let h of this._Holes) {
+            if (h.Curve instanceof Polyline)
+                h.Curve.UpdateOCSTo(this.Outline.Curve.OCS);
+            if (h.Curve instanceof Circle) {
+                let sp = new Path$1();
+                let cen = h.Curve.Center.applyMatrix4(this.Outline.Curve.OCSInv);
+                sp.ellipse(cen.x, cen.y, h.Curve.Radius, h.Curve.Radius, 0, 2 * Math.PI, false, 0);
+                shape.holes.push(sp);
+            }
+            else
+                shape.holes.push(h.Shape);
+        }
+        return shape;
     }
     get Position() {
         return this._Outline.Curve.Position;
@@ -10008,8 +10036,8 @@ class Shape {
         //合并运算时提取出运算后的孔洞和形状
         const pickUpHoleOrShape = (srcHoles, tarHoles, outline) => {
             srcHoles.forEach(cu => {
-                let tmpContours = cu.SubstactBoolOperation(outline).sort((a, b) => b.Area - a.Area);
-                let isAllContainered = tmpContours.length > 1 && tmpContours.slice(1).every((cu, index) => tmpContours[0].CuInOutline(cu.Curve));
+                let tmpContours = cu.SubstactBoolOperation(outline).sort((a, b) => b.Area - a.Area); //面积从大到校
+                let isAllContainered = tmpContours.length > 1 && tmpContours.slice(1).every((cu, index) => tmpContours[0].ContainerCurve(cu.Curve, true));
                 //洞是否被最大的洞包含,是,则把被包含的洞都提取出来加入形状数组
                 if (isAllContainered) {
                     shapes.push(...this.targetOutlinesSubHoles(tmpContours.slice(1).map(c => new Shape(c)), tarHoles.map(c => new Shape(c))));
@@ -10123,7 +10151,7 @@ class Shape {
             let outline = contours.shift();
             //取出包含的洞
             arrayRemoveIf(contours, (con) => {
-                let bisIn = outline.CuInOutline(con.Curve);
+                let bisIn = outline.ContainerCurve(con.Curve, true);
                 if (bisIn)
                     tmpHoles.push(con);
                 return bisIn;
@@ -10210,30 +10238,15 @@ class Shape {
         let holes = [];
         if (tmpHoles.length <= 1)
             return tmpHoles;
-        tmpHoles.sort((a, b) => b.Area - a.Area);
+        tmpHoles.sort((a, b) => b.Area - a.Area); //面积从大到小排序
         while (tmpHoles.length) {
             let srcHole = tmpHoles.shift();
             holes.push(srcHole);
             //移除包含的洞
-            arrayRemoveIf(tmpHoles, h => srcHole.CuInOutline(h.Curve));
+            arrayRemoveIf(tmpHoles, h => srcHole.ContainerCurve(h.Curve, true));
         }
         return holes;
     }
-    UpdateShape() {
-        this._Shape = this.Outline.Shape;
-        for (let h of this._Holes) {
-            if (h.Curve instanceof Polyline)
-                h.Curve.UpdateOCSTo(this.Outline.Curve.OCS);
-            if (h.Curve instanceof Circle) {
-                let sp = new Path$1();
-                let cen = h.Curve.Center.applyMatrix4(this.Outline.Curve.OCSInv);
-                sp.ellipse(cen.x, cen.y, h.Curve.Radius, h.Curve.Radius, 0, 2 * Math.PI, false, 0);
-                this._Shape.holes.push(sp);
-            }
-            else
-                this._Shape.holes.push(h.Shape);
-        }
-    }
     //读写文件
     ReadFile(file) {
         file.Read(); //1
@@ -11606,6 +11619,7 @@ class PointShapeUtils {
     }
 }
 
+//为了避免Core对UI库的依赖,导致测试用例失败,导致外部项目引用失败,我们分离了这个函数
 var Intent;
 (function (Intent) {
     Intent["NONE"] = "none";
@@ -11619,6 +11633,11 @@ function Toaster(option) {
     for (let f of ToasterInjectFunctions)
         f(option);
 }
+const ToasterShowEntityMsgInjectFunctions = [];
+function ToasterShowEntityMsg(option) {
+    for (let f of ToasterShowEntityMsgInjectFunctions)
+        f(option);
+}
 
 var EMetalsType;
 (function (EMetalsType) {
@@ -11638,6 +11657,7 @@ var EFindType;
     EFindType[EFindType["RemoveModelingAndSpecial"] = 7] = "RemoveModelingAndSpecial";
     EFindType[EFindType["ModifyHardware"] = 8] = "ModifyHardware";
     EFindType[EFindType["FindMinSize"] = 9] = "FindMinSize";
+    EFindType[EFindType["GetHardWareOption"] = 10] = "GetHardWareOption";
 })(EFindType || (EFindType = {}));
 var ECompareType;
 (function (ECompareType) {
@@ -11982,7 +12002,7 @@ const DefaultClosingStripOption = {
 };
 Object.freeze(DefaultClosingStripOption);
 const DefaultBoardFindOption = {
-    version: 5,
+    version: 6,
     condition: {
         layer: false,
         height: false,
@@ -11996,6 +12016,7 @@ const DefaultBoardFindOption = {
         useSpecial: false,
         useModeling: false,
         roomName: false,
+        hardwareName: false,
         cabinetName: false,
         brName: false,
         material: false,
@@ -12023,6 +12044,7 @@ const DefaultBoardFindOption = {
         roomName: ECompareType.Equal,
         cabinetName: ECompareType.Equal,
         brName: ECompareType.Equal,
+        hardwareName: ECompareType.Equal,
         [EBoardKeyList.Mat]: ECompareType.Equal,
         [EBoardKeyList.Color]: ECompareType.Equal,
         [EBoardKeyList.BrMat]: ECompareType.Equal,
@@ -12045,6 +12067,7 @@ const DefaultBoardFindOption = {
     roomName: "",
     cabinetName: "",
     brName: "",
+    hardwareName: "",
     [EBoardKeyList.BrMat]: "",
     material: "",
     color: "",
@@ -13640,7 +13663,17 @@ class LookOverBoardInfosTool {
                 }
             }
             //封边
-            let sealData = GetBoardSealingData(GetSealedBoardContour(b, true, true));
+            let sealContour = GetSealedBoardContour(b, true, true);
+            if (!sealContour) {
+                ToasterShowEntityMsg({
+                    intent: Intent.DANGER,
+                    msg: "板件扣封边失败,请检查板件轮廓!",
+                    timeout: 10000,
+                    ent: b
+                });
+                throw "错误:板扣除封边失败!";
+            }
+            let sealData = GetBoardSealingData(sealContour);
             let color = b.BoardProcessOption[EBoardKeyList.Color];
             for (let data of sealData) {
                 if (equaln$1(0, data.size))
@@ -13734,12 +13767,6 @@ class LookOverBoardInfosTool {
 }
 const lookOverBoardInfosTool = new LookOverBoardInfosTool();
 
-const ReportFunctionList = [];
-function SendReport(msg) {
-    for (let f of ReportFunctionList)
-        f(msg);
-}
-
 const ShowObjectsFunctionList = [];
 function ShowSelectObjects(ens) {
     for (let f of ShowObjectsFunctionList)
@@ -13783,7 +13810,25 @@ function FastWireframe(br, color = 0, divCount = 6, optArc = true) {
         }
     return result;
 }
+function FastExtrudeEdgeGeometryOfShape(shape, z0, z1, divCount = 6, optArc = true, coords = []) {
+    let ptss = [shape.getPoints(divCount, optArc)];
+    for (let hole of shape.holes)
+        ptss.push(hole.getPoints(divCount, optArc));
+    for (let pts of ptss)
+        for (let i = 0; i < pts.length; i++) {
+            let p = pts[i];
+            let nextp = pts[FixIndex$1(i + 1, pts)];
+            //底面
+            coords.push(p.x, p.y, z0, nextp.x, nextp.y, z0);
+            //顶面
+            coords.push(p.x, p.y, z1, nextp.x, nextp.y, z1);
+            if (p["_mask_"]) //侧面
+                coords.push(p.x, p.y, z0, p.x, p.y, z1);
+        }
+    return coords;
+}
 let tempP = new Vector3;
+//这个代码天生不和Mesh对齐,因为独立坐标系的原因,槽的坐标系可能和主题的坐标系不一致导致的
 function FastExtrudeEdgeGeometry(ext, color = 0, divCount = 6, optArc = true, coords = [], inv = undefined) {
     color = color || ext.ColorIndex;
     let thickness = ext.Thickness;
@@ -15389,20 +15434,6 @@ let ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends Entity {
         }
         return this;
     }
-    get Position() {
-        return super.Position;
-    }
-    set Position(p) {
-        let v = p.clone().sub(this.Position);
-        if (equalv3(v, ZeroVec))
-            return;
-        super.Position = p;
-        let m = MoveMatrix(v);
-        for (let g of this.grooves)
-            g.ApplyMatrix(m);
-        //由于修改矩阵会导致bsp错误
-        this.csg = undefined;
-    }
     get Width() {
         return this.width;
     }
@@ -16332,9 +16363,9 @@ let ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends Entity {
     //分裂后重新将排钻实体设置给不同的实体
     HandleSpliteEntitys(splitEntitys) { }
     LazyGrooveCheckAll() {
+        this.IsLazyGrooveCheck = false;
         if (this.IsNeedGrooveCheck)
             this.GrooveCheckAllAutoSplit();
-        this.IsLazyGrooveCheck = false;
     }
     //#endregion
     //#region Draw
@@ -16530,7 +16561,7 @@ let ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends Entity {
             let holes = [];
             let ocsInv = this.OCSInv;
             let alMatrix4 = new Matrix4();
-            if (grooves.length < 1000)
+            if (grooves.length < MaxDrawGrooveCount)
                 for (let g of grooves) {
                     alMatrix4.multiplyMatrices(ocsInv, g.OCSNoClone);
                     let gContour = g.ContourCurve.Clone();
@@ -16551,6 +16582,15 @@ let ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends Entity {
             bgeo["IsMesh"] = true;
             this._MeshGeometry = bgeo;
             this.GenWorldUV(bgeo);
+            //edge geometry
+            if (grooves.length < MaxDrawGrooveCount) //这个代码保证线框和概念对齐
+             {
+                let coords = FastExtrudeEdgeGeometryOfShape(shape.Shape, 0, this.thickness, 12, true);
+                let edgeGeo = new BufferGeometry();
+                edgeGeo.setAttribute('position', new Float32BufferAttribute(coords, 3));
+                edgeGeo.applyMatrix4(contour.OCSNoClone);
+                this._EdgeGeometry = edgeGeo;
+            }
             return bgeo;
         }
         let builder = new ExtrudeGeometryBuilder(this);
@@ -16569,7 +16609,7 @@ let ExtrudeSolid = ExtrudeSolid_1 = class ExtrudeSolid extends Entity {
             return this._EdgeGeometry;
         //这里我们超过100就用这个,为了性能 和MaxDrawGrooveCount不一致
         if (this.grooves.length > 100 || this.grooves.every(g => equaln$1(g.thickness, this.thickness)) || this.grooves.length === 0) {
-            let coords = FastExtrudeEdgeGeometry(this, this.ColorIndex, 20, true);
+            let coords = FastExtrudeEdgeGeometry(this, this.ColorIndex, 12, true);
             let edgeGeo = new BufferGeometry();
             edgeGeo.setAttribute('position', new Float32BufferAttribute(coords, 3));
             this._EdgeGeometry = edgeGeo;
@@ -17614,6 +17654,9 @@ class Face {
             if (!sideReg || !noSideFace.Region)
                 return [];
             let toReg = noSideFace.Region.Clone().ApplyMatrix(diffMtx);
+            //注意: 排钻因为布尔运算失败的重灾区
+            // TestDraw(sideReg.Clone(), 1);
+            // TestDraw(toReg.Clone(), 2);
             isSuccess = sideReg.BooleanOper(toReg, BoolOpeartionType.Intersection);
             for (let s of sideReg.ShapeManager.ShapeList) {
                 let box = s.BoundingBox;
@@ -18211,7 +18254,10 @@ class FeedingToolPath extends Singleton {
             let isInt = false;
             for (let c of retCus) {
                 if (holes.length > 0) {
-                    isInt = holes.some(h => h.Curve.IntersectWith(c, 0).length > 0 || h.CuInOutline(c));
+                    isInt = holes.some(h => {
+                        let ipts = h.Curve.IntersectWith2(c, 0);
+                        return ipts.length > 0 || h.ContainerCurve(c, false, ipts);
+                    });
                     if (isInt)
                         break;
                 }
@@ -18285,7 +18331,7 @@ class FeedingToolPath extends Singleton {
         if (isCd)
             arrayRemoveIf(modelings, m => {
                 let c = m.shape.Outline.Curve;
-                if (c instanceof Circle && c.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+                if (m.shape.Holes.length === 0 && c instanceof Circle && c.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                     return true;
                 return false;
             });
@@ -18407,7 +18453,7 @@ class FeedingToolPath extends Singleton {
                 modelings[i].knifeRadius = HostApplicationServices.chaidanOption.radius;
             let m = modelings[i];
             let cu = m.shape.Outline.Curve;
-            if (cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+            if (m.shape.Holes.length === 0 && cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                 continue;
             let cus = this.GetModelFeedPath(br, m);
             if (cus.length === 0)
@@ -18420,7 +18466,7 @@ class FeedingToolPath extends Singleton {
         let errHoles = [];
         for (let m of [...modeling, ...sideModeling]) {
             let cu = m.shape.Outline.Curve;
-            if (cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+            if (m.shape.Holes.length === 0 && cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                 continue;
             if (HostApplicationServices.chaidanOption.useDefaultRad)
                 m.knifeRadius = HostApplicationServices.chaidanOption.radius;
@@ -18657,7 +18703,7 @@ var Production;
                 timeout: 8000,
                 intent: Intent.DANGER,
             });
-            Report([br.__OriginalEnt__ ?? br], br.Name + " 轮廓错误");
+            ShowSelectObjects([br.__OriginalEnt__ ?? br]);
             return undefined;
         }
         let sealedOutline = GetSealedBoardContour(br, false);
@@ -18667,7 +18713,7 @@ var Production;
                 timeout: 8000,
                 intent: Intent.DANGER,
             });
-            Report([br.__OriginalEnt__ ?? br], br.Name + "扣除封边轮廓有误");
+            ShowSelectObjects([br.__OriginalEnt__ ?? br]);
             return;
         }
         let offsetTanslation = sealedOutline.BoundingBox.min;
@@ -18749,7 +18795,7 @@ var Production;
             let data = [];
             for (let m of ms) {
                 let cu = m.shape.Outline.Curve;
-                if (cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+                if (m.shape.Holes.length === 0 && cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                     continue;
                 if (HostApplicationServices.chaidanOption.useDefaultRad)
                     m.knifeRadius = HostApplicationServices.chaidanOption.radius;
@@ -18776,7 +18822,7 @@ var Production;
             let data = [];
             for (let m of ms) {
                 let cu = m.shape.Outline.Curve;
-                if (cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
+                if (m.shape.Holes.length === 0 && cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6)
                     continue;
                 if (HostApplicationServices.chaidanOption.useDefaultRad)
                     m.knifeRadius = HostApplicationServices.chaidanOption.radius;
@@ -18924,7 +18970,7 @@ var Production;
         }
         for (let m of modelings) {
             let cu = m.shape.Outline.Curve;
-            if (cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6) {
+            if (m.shape.Holes.length === 0 && cu instanceof Circle && cu.Radius < HostApplicationServices.chaidanOption.modeling2HoleRad + 1e-6) {
                 let center = cu.Center.setZ(0).sub(offsetTanslation);
                 data.frontBackHoles.push({
                     type: GangDrillType.Pxl,
@@ -18983,12 +19029,13 @@ var Production;
             }
         }
         else if (d.Type === GangDrillType.Ljg || d.Type === GangDrillType.Wood) {
-            if (!isParallelTo(d.Normal, brNormal, CanDrawHoleFuzz)) {
+            if (isPerpendicularityTo(d.Normal, brNormal, CanDrawHoleFuzz)) //侧孔
+             {
                 let z = position.z;
                 if (!IsBetweenA2B(z, -d.Radius, br.Thickness + d.Radius, 1e-6))
                     return;
-                let sp = position.clone().setZ(0).add(d.Normal.multiplyScalar(-CanDrawHoleFuzz).applyMatrix4(roMat)); //加长线(以便加大容差)
-                let ep = position.clone().setZ(0).add(d.Normal.multiplyScalar(d.Height + CanDrawHoleFuzz).applyMatrix4(roMat)); //加长线
+                let sp = position.clone().add(d.Normal.multiplyScalar(-CanDrawHoleFuzz).applyMatrix4(roMat)).setZ(0); //加长线(以便加大容差)
+                let ep = position.clone().add(d.Normal.multiplyScalar(d.Height + CanDrawHoleFuzz).applyMatrix4(roMat)).setZ(0); //加长线
                 let line = new Line(sp, ep);
                 let pt = outline.IntersectWith(line, 0)[0];
                 if (!pt) {
@@ -19280,11 +19327,6 @@ var Production;
         return pl;
     }
     Production.Data2Polyline = Data2Polyline;
-    function Report(ens, msg) {
-        ShowSelectObjects(ens);
-        SendReport(msg);
-    }
-    Production.Report = Report;
     function Get2DModeing(br, offset) {
         let res = [];
         let tmtx = MoveMatrix(offset.clone().negate());
@@ -19889,20 +19931,9 @@ function VData2Curve(data) {
 }
 
 var Board_1;
-//转换板件类型成为空间类型. 0x 1y 2z
-function ConverBoardTypeToSpaceType(type) {
-    switch (type) {
-        case BoardType.Layer:
-            return 2;
-        case BoardType.Vertical:
-            return 0;
-        case BoardType.Behind:
-            return 1;
-    }
-}
 //排钻配置名是合法的
 function IsValidDriName(name) {
-    return name === "不排" || HostApplicationServices.DrillConfigs.has(name);
+    return name === DrillType.None || name === DrillType.More || HostApplicationServices.DrillConfigs.has(name);
 }
 /**
  * 板件实体
@@ -21399,19 +21430,26 @@ class Matrix2 {
 }
 
 function EntityUpdateWrap(ent, exec) {
-    let bak = ent.AutoUpdate;
+    let oldAutoUpdate = ent.AutoUpdate;
     ent.AutoUpdate = false;
     exec();
-    ent.DeferUpdate();
-    ent.AutoUpdate = bak;
+    if (oldAutoUpdate) //如果原先是自动更新的,那么我们更新它,否则还是不更新(避免层层嵌套导致的性能优化丢失)
+        ent.DeferUpdate();
+    ent.AutoUpdate = oldAutoUpdate;
 }
 function EntitysUpdateWrap(ens, exec) {
-    let baks = ens.map(e => e.AutoUpdate);
+    let baks = ens.map(e => {
+        let oldAutoUpdate = e.AutoUpdate;
+        e.AutoUpdate = false;
+        return oldAutoUpdate;
+    });
     exec();
     for (let i = 0; i < ens.length; i++) {
-        let en = ens[i];
-        en.DeferUpdate();
-        en.AutoUpdate = baks[i];
+        if (baks[i]) {
+            let en = ens[i];
+            en.DeferUpdate();
+            en.AutoUpdate = true;
+        }
     }
 }
 
@@ -21810,6 +21848,8 @@ var WallSnapMode;
 })(WallSnapMode || (WallSnapMode = {}));
 
 const CURVE_FACE_TYPE_KEY = "__CURVE_FACE_TYPE_KEY__"; //用来存储墙体类型的key
+const CURVE_DIR_TYPE_KEY = "__CURVE_DIR_TYPE_KEY__"; //方向
+const CURVE_WALL_TYPE_KEY = "__CURVE_WALL_TYPE_KEY__"; //墙
 var WallFaceType;
 (function (WallFaceType) {
     WallFaceType[WallFaceType["Inside"] = 0] = "Inside";
@@ -23771,7 +23811,7 @@ let Light = Light_1 = class Light extends Entity {
     }
     set Color(color) {
         this.WriteAllObjectRecord();
-        this._LightColor = color;
+        this._LightColor.set(color);
         this.Update();
     }
     get ShowHelper() {
@@ -23945,6 +23985,24 @@ let DirectionalLight = class DirectionalLight extends Light {
             this.Update();
         }
     }
+    get SunPosition() { return super.Position; }
+    set SunPosition(p) {
+        if (equaln$1(p.x, this._Matrix.elements[12])
+            && equaln$1(p.y, this._Matrix.elements[13])
+            && equaln$1(p.z, this._Matrix.elements[14]))
+            return;
+        this.WriteAllObjectRecord();
+        this._Matrix.setPosition(p);
+        this.Update(UpdateDraw.Geometry);
+    }
+    get Position() { return super.Position; }
+    set Position(p) {
+        console.error("不支持的用法! 错误的设计");
+        let bak = this._Target.toArray();
+        super.Position = p;
+        this._Target.fromArray(bak);
+        this.Update(UpdateDraw.Geometry);
+    }
     get WebIntensity() {
         let x = this._Intensity / 150;
         x = Math.pow(x, 0.4);
@@ -23967,7 +24025,7 @@ let DirectionalLight = class DirectionalLight extends Light {
         if (indexList[0] === 0)
             this.Position = this.Position.add(vec);
         else
-            this.Target = this.Target.add(vec);
+            this._Target.add((vec));
     }
     InitDrawObject(renderType = RenderType.Wireframe) {
         let lightGroup = new Group();
@@ -26596,6 +26654,11 @@ TemplateParam = __decorate([
     Factory
 ], TemplateParam);
 
+const BoardType2SplitType = [2, 0, 1];
+//转换板件类型成为空间类型. 0x 1y 2z
+function ConverBoardTypeToSplitType(type) {
+    return BoardType2SplitType[type];
+}
 /**
  * 夹层空间分析
  */
@@ -26614,7 +26677,7 @@ class ClampSpaceParse extends ISpaceParse {
         //单层空间(用于切割)
         let spliteBoxs = new Map();
         for (let [boardType, boards] of this.BoardMap) {
-            let splitType = ConverBoardTypeToSpaceType(boardType);
+            let splitType = ConverBoardTypeToSplitType(boardType);
             let boardBoxCol = this.ParseBoardBox(boards, splitType);
             //#IWFYY
             if (boardType === BoardType.Behind && this.BoardMap.size > 1 && boardBoxCol.length > 1) {
@@ -26675,13 +26738,13 @@ class ClampSpaceParse extends ISpaceParse {
                 this.ParseOK = false;
                 return;
             }
-            let splitType = ConverBoardTypeToSpaceType(type);
+            let splitType = ConverBoardTypeToSplitType(type);
             let p1 = box.min.clone().setComponent(splitType, box.min.getComponent(splitType) - dist);
             let p2 = box.max.clone().setComponent(splitType, box.min.getComponent(splitType));
             let p3 = box.min.clone().setComponent(splitType, box.max.getComponent(splitType));
             let p4 = box.max.clone().setComponent(splitType, box.max.getComponent(splitType) + dist);
             let boxs = [new Box3Ext().setFromPoints([p1, p2]), new Box3Ext().setFromPoints([p3, p4])];
-            this.SpaceBox = await this.WrapSelectBox(boxs, ConverBoardTypeToSpaceType(br.BoardType));
+            this.SpaceBox = await this.WrapSelectBox(boxs, splitType);
             if (this.SpaceBox)
                 this.ParseOK = true;
         }
@@ -26722,6 +26785,8 @@ class ClampSpaceParse extends ISpaceParse {
         }
         for (let [splitType, spBox] of spliteBoxes) {
             let remBoxs = orgBox.substract(spBox, splitType);
+            if (remBoxs[0] === orgBox) //如果切割失败,证明这个板没办法影响空间分析,所以移除它.
+             ;
             if (remBoxs.length === 0)
                 return undefined;
             else if (remBoxs.length === 1) {
@@ -27214,8 +27279,6 @@ let TemplateRecord = TemplateRecord_1 = class TemplateRecord extends SymbolTable
                 this.RZParam.expr = "";
             }
         }
-        //相对定位. use PX PY PZ
-        this.UpdatePosition(paramMap, evaled);
         //更新LWH(通过定位空间)
         this.LParam.UpdateParam(this._CacheSpaceSize.x);
         this.WParam.UpdateParam(this._CacheSpaceSize.y);
@@ -27231,6 +27294,8 @@ let TemplateRecord = TemplateRecord_1 = class TemplateRecord extends SymbolTable
         //删除材质变量(材质变量仅在KJL导入中使用,重新出现在右侧列表中是不明智的?) (但是用户可能编辑更新了它?)
         // arrayRemoveIf(this.Params, p => p.type === TemplateParamType.Material);
         this.UpdateEntitys();
+        //相对定位. use PX PY PZ(这个代码在这里,保证所有的变量都是最新的. 这样我们就可以使用H/2自己定位到自己空间的一半位置)(这个只会修改定位,所以放在这里并不会影响其他的代码)
+        this.UpdatePosition(paramMap, evaled);
         //变换到新的模版空间
         for (let en of ens) {
             en.ApplyMatrix(this._CacheSpaceCS);
@@ -29015,6 +29080,7 @@ TemplateWineRackRecord = __decorate([
     Factory
 ], TemplateWineRackRecord);
 
+//铰链
 function IsHinge(en) {
     if (en instanceof HardwareCompositeEntity) {
         if (en.Template) {
@@ -29249,6 +29315,7 @@ let Text = class Text extends Entity {
 Text = __decorate([
     Factory
 ], Text);
+const DbText = Text;
 
 const EmptyArray = [];
 let VisualSpaceBox = class VisualSpaceBox extends Entity {
@@ -29613,7 +29680,7 @@ class CameraUpdate {
      */
     Pan(mouseMove) {
         mouseMove.y *= -1;
-        mouseMove.multiplyScalar(-this._ViewHeight / (this._Height * window.devicePixelRatio));
+        mouseMove.multiplyScalar(-this._ViewHeight / this._Height);
         mouseMove.applyQuaternion(this.Camera.quaternion);
         this._Target.add(mouseMove);
         this._Target.clamp(ViewScopeMin, ViewScopeMax);
@@ -33877,6 +33944,46 @@ PositioningBoardSpace = __decorate([
     Factory
 ], PositioningBoardSpace);
 
+/**
+ * 拉手的定位空间
+ */
+let PositioningHandleSpace = class PositioningHandleSpace extends Positioning {
+    constructor(_ObjectId) {
+        super();
+        this.ObjectId = _ObjectId;
+    }
+    /**
+    * 定位
+    */
+    async Positioning() {
+        this.SpaceCS = undefined;
+        this.SpaceSize = undefined;
+        if (this.ObjectId && !this.ObjectId.IsErase) {
+            let ent = this.ObjectId.Object;
+            this.SpaceCS = ent.SpaceOCS;
+            let box = ent.GetBoundingBoxInMtx(ent.SpaceOCSInv);
+            this.SpaceSize = box.getSize(new Vector3);
+            let baseP = box.min.applyMatrix4(this.SpaceCS);
+            this.SpaceCS.setPosition(baseP);
+        }
+    }
+    //#region File
+    ReadFile(file) {
+        file.Read();
+        this.ObjectId = file.ReadObjectId();
+    }
+    WriteFile(file) {
+        file.Write(1);
+        file.WriteObjectId(this.ObjectId);
+    }
+};
+__decorate([
+    AutoRecord
+], PositioningHandleSpace.prototype, "ObjectId", void 0);
+PositioningHandleSpace = __decorate([
+    Factory
+], PositioningHandleSpace);
+
 /**
  * 板件模板的基类.(层板,立板,背板)
  */
@@ -34258,23 +34365,22 @@ class ActivityLayerBoardTool {
         }
         return 0;
     }
-    BuildNails(initNail, nailOpt, face, fYVec) {
+    BuildNails(initNail, nailOpt, face, fYVec, nailCount) {
         let fXVec = new Vector3().setFromMatrixColumn(face.OCS, 0);
         let addCount = nailOpt.addCount;
-        let count = nailOpt.count;
         let dist = nailOpt.dist;
         let frontDist = nailOpt.front;
         let backDist = nailOpt.behind;
         let singleDist;
         //绘制数量为1时,层板钉在中间位置
-        if (count === 1)
+        if (nailCount === 1)
             singleDist = face.Length / 2 - frontDist;
         else
-            singleDist = (face.Length - frontDist - backDist) / (count - 1);
+            singleDist = (face.Length - frontDist - backDist) / (nailCount - 1);
         let buildNails = [];
         //构建层板钉
-        for (let i = 0; i < count; i++) {
-            if (count === 1) {
+        for (let i = 0; i < nailCount; i++) {
+            if (nailCount === 1) {
                 initNail.ApplyMatrix(MoveMatrix(fXVec.multiplyScalar(singleDist)));
                 buildNails.push(initNail);
             }
@@ -34360,10 +34466,12 @@ class ActivityLayerBoardTool {
                         zDist += (-nail.Height + nailOption.depth);
                         nail.Position = nail.Position.add(new Vector3(xDist, yDist, zDist));
                         nail.ApplyMatrix(zRoMat).ApplyMatrix(face.OCS);
+                        //层板钉数
+                        let nailCount = nailOption.count;
                         if (option || this.NailRules)
-                            nailOption.count = this.GetRuleCount(face.Length, rules);
+                            nailCount = this.GetRuleCount(face.Length, rules);
                         let yVec = new Vector3().setFromMatrixColumn(otherBoard.OCS, 1);
-                        let nails = this.BuildNails(nail, nailOption, face, yVec);
+                        let nails = this.BuildNails(nail, nailOption, face, yVec, nailCount);
                         for (let nail of nails)
                             nailBoardMap.set(nail, otherBoard);
                         allNails.push(...nails);
@@ -34622,18 +34730,20 @@ let TemplateLeftRightBoardRecord = class TemplateLeftRightBoardRecord extends Te
         let thickness = this.GetParam("BH")?.value ?? 18;
         let zs = this.GetParam("ZS")?.value ?? 0; //左缩
         let ys = this.GetParam("YS")?.value ?? 0; //右缩
-        lBr.Thickness = thickness;
-        rBr.Thickness = thickness;
-        if (!this._CacheSpaceSize) {
-            console.warn("左右侧板模板数据错误无法更新");
-            return;
-        }
-        lBr.Height = this._CacheSpaceSize.z;
-        rBr.Height = this._CacheSpaceSize.z;
-        lBr.Width = this._CacheSpaceSize.y - zs;
-        rBr.Width = this._CacheSpaceSize.y - ys;
-        lBr.Position = new Vector3(0, zs, 0);
-        rBr.Position = new Vector3(this._CacheSpaceSize.x - rBr.Thickness, ys, 0);
+        EntitysUpdateWrap([lBr, rBr], () => {
+            lBr.Thickness = thickness;
+            rBr.Thickness = thickness;
+            if (!this._CacheSpaceSize) {
+                console.warn("左右侧板模板数据错误无法更新");
+                return;
+            }
+            lBr.Height = this._CacheSpaceSize.z;
+            rBr.Height = this._CacheSpaceSize.z;
+            lBr.Width = this._CacheSpaceSize.y - zs; //似乎用拉伸来做比较好,这样能保持住背板对他的拉槽.
+            rBr.Width = this._CacheSpaceSize.y - ys;
+            lBr.Position = new Vector3(0, zs, 0);
+            rBr.Position = new Vector3(this._CacheSpaceSize.x - rBr.Thickness, ys, 0);
+        });
     }
     ReadFile(file) {
         super.ReadFile(file);
@@ -36308,6 +36418,14 @@ class RegionReplacement {
 //分析可用的内空间(墙面方向指向空间内部为内空间) 否则为外墙空间
 //构造面域树? 不需要了? 还是需要的 需要一个最大的天花板
 //区域对象 (地面+天花?)
+const ROOM_REGION_CURVES_KEY = "__ROOM_REGION_CURVES_KEY__";
+//墙内曲线的类型
+var WallCurveDirType;
+(function (WallCurveDirType) {
+    WallCurveDirType[WallCurveDirType["left"] = 0] = "left";
+    WallCurveDirType[WallCurveDirType["right"] = 1] = "right";
+    WallCurveDirType[WallCurveDirType["lid"] = 2] = "lid";
+})(WallCurveDirType || (WallCurveDirType = {}));
 /**
  * 区域分析(房间+外墙+全屋顶)
  */
@@ -36336,24 +36454,32 @@ class RoomRegionParse {
             for (let c of wall.LeftCurves) {
                 curves.push(c);
                 leftCurves.add(c);
+                c[CURVE_DIR_TYPE_KEY] = WallCurveDirType.left;
+                c[CURVE_WALL_TYPE_KEY] = wall;
             }
-            for (let c of wall.RightCurves)
+            for (let c of wall.RightCurves) {
                 curves.push(c);
-            for (let c of wall.LidCurves)
+                c[CURVE_DIR_TYPE_KEY] = WallCurveDirType.right;
+                c[CURVE_WALL_TYPE_KEY] = wall;
+            }
+            for (let c of wall.LidCurves) {
                 curves.push(c);
+                c[CURVE_DIR_TYPE_KEY] = WallCurveDirType.lid;
+                c[CURVE_WALL_TYPE_KEY] = wall;
+            }
         }
         const REGION_PARSE_NUM = 3;
         const POLYLINE_JOIN_FUZZ = Math.pow(10, -REGION_PARSE_NUM);
-        let parse = new RegionParse(curves, REGION_PARSE_NUM);
-        for (let [orgArc, arcs] of parse.ExpLineMap) {
+        let regParse = new RegionParse(curves, REGION_PARSE_NUM);
+        for (let [orgArc, arcs] of regParse.ExpLineMap) {
             if (leftCurves.has(orgArc))
                 for (let arc of arcs)
                     leftCurves.add(arc);
         }
         let regionPolylines = [];
-        let map = new Map();
+        let regPolyline2RoutesMap = new Map(); //区域轮廓多段线->墙线 映射
         //分析内外墙1内2外
-        for (let routes of parse.RegionsOutline) {
+        for (let routes of regParse.RegionsOutline) {
             let pl = Polyline.Combine(routes.map(r => r.curve), POLYLINE_JOIN_FUZZ);
             // for (let i = 0; i < routes.length; i++)
             // {
@@ -36367,20 +36493,27 @@ class RoomRegionParse {
             // }
             // TestDraw(routes[0].curve); //test
             regionPolylines.push(pl);
-            map.set(pl, routes);
+            regPolyline2RoutesMap.set(pl, routes);
         }
         //不可能有内部轮廓 如果有 就证明错了
-        for (let routes of parse.RegionsInternal) {
+        for (let routes of regParse.RegionsInternal) {
             let pl = Polyline.Combine(routes.map(r => r.curve));
             pl.ColorIndex = pl.Area2 > 0 ? 3 : 4;
             // throw "未知错误 出现外部轮廓"
         }
+        //面域分析炸开的线和原始轮廓的关联关系
+        for (let [orgArc, newArcs] of regParse.ExpLineMap) {
+            for (let arc of newArcs) {
+                arc[CURVE_DIR_TYPE_KEY] = orgArc[CURVE_DIR_TYPE_KEY];
+                arc[CURVE_WALL_TYPE_KEY] = orgArc[CURVE_WALL_TYPE_KEY];
+            }
+        }
         let cons = regionPolylines.map(pl => new ContourTreeNode(Contour.CreateContour(pl, false)));
         ContourTreeNode.ParseContourTree(cons);
         let roofs = [];
         //解析 天花板区域 内空区域
         for (let con of cons) {
-            let routes = map.get(con.contour.Curve);
+            let routes = regPolyline2RoutesMap.get(con.contour.Curve);
             if (con.contour.Curve.ColorIndex === 2) //天花板区域(或者柱子)
              {
                 if (con.Depth !== 0 || con.area < 1e6) //柱子
@@ -36448,6 +36581,7 @@ class RoomRegionParse {
                     this._UpdateDb.ModelSpace.Append(floor);
                     this._UpdateDb.ModelSpace.Append(top);
                     let region = new RoomRegion(name, top.Id, floor.Id, floor.Area);
+                    region[ROOM_REGION_CURVES_KEY] = routes.map(r => r.curve);
                     region.Position = pos;
                     this._UpdateDb.ModelSpace.Append(region);
                     floor.RegionId = region.Id;
@@ -36455,8 +36589,8 @@ class RoomRegionParse {
                 }
             }
         }
-        for (let [orgArc, arcs] of parse.ExpLineMap)
-            orgArc[CURVE_FACE_TYPE_KEY] = arcs[0][CURVE_FACE_TYPE_KEY];
+        for (let [orgArc, arcs] of regParse.ExpLineMap)
+            orgArc[CURVE_FACE_TYPE_KEY] = arcs[0][CURVE_FACE_TYPE_KEY]; //圆弧不可能被两个房间拥有,所以这个写法没问题
         for (let wall of walls) {
             // 因为我们现在没有分裂圆弧 所以我们不需要在合并线
             // wall.LeftCurves && arrayRemoveDuplicateBySort(wall.LeftCurves, (cu1: Curve, cu2: Curve) => cu1.Join(cu2) === Status.True);
@@ -37210,5 +37344,5 @@ function UpdateStartEndPoint(curve) {
         curve.EndPoint = ep;
 }
 
-export { AlignedDimension, AllObjectData, AmbientLight, Arc, ArcDimension, AxisCS, BUL_IS_LINE_FUZZ, BlockTable, BlockTableRecord, Board, BoxSolid, CADFactory, CADFiler, CURVE_FACE_TYPE_KEY, CURVE_MESH_NAMES, CameraSnapshootRecord, CameraType, CameraUpdate, Circle, CommandHistoryRecord, CompositeEntity, ContourTreeNode, ConverBoardTypeToSpaceType, CreateObjectData, Curve, CurveTapeShape, CylinderHole, Cylineder, Database, DepthType, DiameterDimension, Dimension, DirectionalLight, DisposeTextShapeCache, DuplicateRecordCloning, Ellipse, Entity, EntityColorHistoryRecord, EntityRef, EraseEntityData, ExtendType$1 as ExtendType, ExtrudeBuildConfig, ExtrudeGeometryBuilder, ExtrudeHole, ExtrudeSolid, FaceEntity, Factory, FastDrillingEdgeGeometry, FastDrillingMeshGeometry, FastMeshGeometry, GangDrillType, GetBoxGeoBufferGeometry, GetHoleLengthOfIndex, Groove, GroupRecord, GroupTable, HardwareCompositeEntity, HardwareTopline, HemisphereLight, HistoricManage, HistorycRecord, Hole, InitClipperCpp, IsPhysical, Light, Line, LineAngularDimension, LinearDimension, MaterialTableRecord, MaxDrawGrooveCount, ObjectAllDataHistoryRecord, ObjectCollection, PhysicalMaterialRecord, Point, PointLight, Polyline, Positioning, PositioningBoardSpace, PositioningClampSpace, PositioningTemporary, ProcessingGroupRecord, ProcessingGroupTable, Purge, PurgeTemplateTreeRoot, RadiusDimension, RectAreaLight, Region, RemoveObjectData, RenderType, RevolveSolid, RoomBase, RoomFlatBase, RoomFlatFloor, RoomFlatTop, RoomHoleBase, RoomHoleLine, RoomHolePolyline, RoomRegion, RoomWallArc, RoomWallBase, RoomWallLine, RoomWallParse, Shape2, Spline, SpotLight, Status, SubtractRange, SubtractRange2, SweepSolid, SymbolTable, Tape, TempPolyline$1 as TempPolyline, TempateDefaultParamCount, TempateThicknessAction, TemplateAction, TemplateBehindBoard, TemplateBoardRecord, TemplateFilletAction, TemplateLatticeRecord, TemplateLayerBoard, TemplateLeftRightBoardRecord, TemplateMaterialAction, TemplateMoveAction, TemplateParam, TemplateRecord, TemplateSetSealAction, TemplateSizeBoard, TemplateStretchGripAction, TemplateStretchScaleBoxAction, TemplateTable, TemplateTopBottomBoard, TemplateVerticalBoard, TemplateVisualSpace, TemplateWineRackRecord, Text, TextAligen, TextureTable, TextureTableRecord, ThicknessDirection, UVType, UpdateDraw, UpdateHoleFakerWallsAndUpdateDraw, UpdateRelevanceWallHole, UpdateTempPolyline, UpdateWallHolesDataAndUpdateDraw, ViewportEntity, ViewportEntity2, VisualSpaceBox, WallFaceType, applyMixins, boardUVGenerator, boardUVGenerator2, clipperCpp };
+export { AlignedDimension, AllObjectData, AmbientLight, Arc, ArcDimension, AxisCS, BUL_IS_LINE_FUZZ, BlockTable, BlockTableRecord, Board, BoxSolid, CADFactory, CADFiler, CURVE_DIR_TYPE_KEY, CURVE_FACE_TYPE_KEY, CURVE_MESH_NAMES, CURVE_WALL_TYPE_KEY, CameraSnapshootRecord, CameraType, CameraUpdate, Circle, CommandHistoryRecord, CompositeEntity, ContourTreeNode, CreateObjectData, Curve, CurveTapeShape, CylinderHole, Cylineder, Database, DbText, DepthType, DiameterDimension, Dimension, DirectionalLight, DisposeTextShapeCache, DuplicateRecordCloning, Ellipse, Entity, EntityColorHistoryRecord, EntityRef, EraseEntityData, ExtendType$1 as ExtendType, ExtrudeBuildConfig, ExtrudeGeometryBuilder, ExtrudeHole, ExtrudeSolid, FaceEntity, Factory, FastDrillingEdgeGeometry, FastDrillingMeshGeometry, FastMeshGeometry, GangDrillType, GetBoxGeoBufferGeometry, GetHoleLengthOfIndex, Groove, GroupRecord, GroupTable, HardwareCompositeEntity, HardwareTopline, HemisphereLight, HistoricManage, HistorycRecord, Hole, InitClipperCpp, IsPhysical, Light, Line, LineAngularDimension, LinearDimension, MaterialTableRecord, MaxDrawGrooveCount, ObjectAllDataHistoryRecord, ObjectCollection, PhysicalMaterialRecord, Point, PointLight, Polyline, Positioning, PositioningBoardSpace, PositioningClampSpace, PositioningHandleSpace, PositioningTemporary, ProcessingGroupRecord, ProcessingGroupTable, Purge, PurgeTemplateTreeRoot, RadiusDimension, RectAreaLight, Region, RemoveObjectData, RenderType, RevolveSolid, RoomBase, RoomFlatBase, RoomFlatFloor, RoomFlatTop, RoomHoleBase, RoomHoleLine, RoomHolePolyline, RoomRegion, RoomWallArc, RoomWallBase, RoomWallLine, RoomWallParse, Shape2, Spline, SpotLight, Status, SubtractRange, SubtractRange2, SweepSolid, SymbolTable, Tape, TempPolyline$1 as TempPolyline, TempateDefaultParamCount, TempateThicknessAction, TemplateAction, TemplateBehindBoard, TemplateBoardRecord, TemplateFilletAction, TemplateLatticeRecord, TemplateLayerBoard, TemplateLeftRightBoardRecord, TemplateMaterialAction, TemplateMoveAction, TemplateParam, TemplateRecord, TemplateSetSealAction, TemplateSizeBoard, TemplateStretchGripAction, TemplateStretchScaleBoxAction, TemplateTable, TemplateTopBottomBoard, TemplateVerticalBoard, TemplateVisualSpace, TemplateWineRackRecord, Text, TextAligen, TextureTable, TextureTableRecord, ThicknessDirection, UVType, UpdateDraw, UpdateHoleFakerWallsAndUpdateDraw, UpdateRelevanceWallHole, UpdateTempPolyline, UpdateWallHolesDataAndUpdateDraw, ViewportEntity, ViewportEntity2, VisualSpaceBox, WallFaceType, applyMixins, boardUVGenerator, boardUVGenerator2, clipperCpp };
 //# sourceMappingURL=api.esm.js.map

package.json

@@ -1,6 +1,6 @@
 {
     "name": "webcad_ue4_api",
-    "version": "0.3.10",
+    "version": "0.3.11",
     "description": "",
     "main": "api.esm.js",
     "module": "api.esm.js",

types/Add-on/ActivityLayerBoard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActivityLayerBoard.d.ts","sourceRoot":"","sources":["../../../src/Add-on/ActivityLayerBoard.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,qBAAa,kBAAmB,YAAW,OAAO;IAExC,IAAI;CA2Eb"}
+{"version":3,"file":"ActivityLayerBoard.d.ts","sourceRoot":"","sources":["../../../src/Add-on/ActivityLayerBoard.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,qBAAa,kBAAmB,YAAW,OAAO;IAExC,IAAI;CA0Eb"}

types/Add-on/BoardFindModify.d.ts

@@ -15,6 +15,7 @@ export declare class BoardFindModify implements Command {
     private FindMinSizeBrs;
     private FindHaveSpiteSize;
     private GetBoardOption;
+    private GetHardWareOption;
     private RemoveBoardModelingOrSpecialShape;
     private ModifyHardware;
     private FilterHardware;

types/Add-on/BoardFindModify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardFindModify.d.ts","sourceRoot":"","sources":["../../../src/Add-on/BoardFindModify.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAYnD,qBAAa,eAAgB,YAAW,OAAO;IAE3C,OAAO,CAAC,iBAAiB,CAAS;IAC5B,IAAI;YAqCI,SAAS;IAmBvB,OAAO,CAAC,aAAa;YAQP,OAAO;IA2CrB,OAAO,CAAC,QAAQ;IAwJhB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,cAAc;IAYtB,YAAY,CAAC,CAAC,KAAA;YAIA,SAAS;IAYvB,OAAO,CAAC,QAAQ;YA8JF,cAAc;YAKd,cAAc;YAKd,iBAAiB;YASjB,cAAc;YAqDd,iCAAiC;YAkBjC,cAAc;IA4B5B,OAAO,CAAC,cAAc;CA2CzB"}
+{"version":3,"file":"BoardFindModify.d.ts","sourceRoot":"","sources":["../../../src/Add-on/BoardFindModify.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAYnD,qBAAa,eAAgB,YAAW,OAAO;IAE3C,OAAO,CAAC,iBAAiB,CAAS;IAC5B,IAAI;YAwCI,SAAS;IAmBvB,OAAO,CAAC,aAAa;YAQP,OAAO;IA2CrB,OAAO,CAAC,QAAQ;IAwJhB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,cAAc;IAYtB,YAAY,CAAC,CAAC,KAAA;YAIA,SAAS;IAYvB,OAAO,CAAC,QAAQ;YA8JF,cAAc;YAKd,cAAc;YAKd,iBAAiB;YASjB,cAAc;YAqDd,iBAAiB;YAcjB,iCAAiC;YAkBjC,cAAc;IA+B5B,OAAO,CAAC,cAAc;CAkDzB"}

types/Add-on/CommandFeeding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandFeeding.d.ts","sourceRoot":"","sources":["../../../src/Add-on/CommandFeeding.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAOnD,qBAAa,cAAe,YAAW,OAAO;IAEpC,IAAI;IA8EV,OAAO,CAAC,QAAQ;IA8BhB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,kBAAkB;IAqB1B,OAAO,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"CommandFeeding.d.ts","sourceRoot":"","sources":["../../../src/Add-on/CommandFeeding.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAQnD,qBAAa,cAAe,YAAW,OAAO;IAEpC,IAAI;IA8EV,OAAO,CAAC,QAAQ;IA8BhB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,kBAAkB;IAqB1B,OAAO,CAAC,QAAQ;CAOnB"}

types/Add-on/DrawBoard/ActivityLayerBoardTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActivityLayerBoardTool.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/DrawBoard/ActivityLayerBoardTool.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAS5D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEzF,cAAM,sBAAsB;IAExB,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,aAAa;IAwCrB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,wBAAwB;IAiBhC,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,UAAU;IA8ClB,OAAO,CAAC,QAAQ;IAMhB,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,GAAE,SAAS,EAAO,EAAE,MAAM,CAAC,EAAE,YAAY;IAqG/F,OAAO,CAAC,WAAW;IAuCnB,OAAO,CAAC,cAAc;CA6CzB;AAED,eAAO,MAAM,sBAAsB,wBAA+B,CAAC"}
+{"version":3,"file":"ActivityLayerBoardTool.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/DrawBoard/ActivityLayerBoardTool.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAS5D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEzF,cAAM,sBAAsB;IAExB,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,aAAa;IAwCrB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,wBAAwB;IAiBhC,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,QAAQ;IAMhB,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,GAAE,SAAS,EAAO,EAAE,MAAM,CAAC,EAAE,YAAY;IAuG/F,OAAO,CAAC,WAAW;IAuCnB,OAAO,CAAC,cAAc;CA6CzB;AAED,eAAO,MAAM,sBAAsB,wBAA+B,CAAC"}

types/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.d.ts

@@ -1,3 +1,4 @@
+import { Box3, Matrix4 } from "three";
 import { Board } from "../../../DatabaseServices/Entity/Board";
 import { Entity } from '../../../DatabaseServices/Entity/Entity';
 import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord";
@@ -29,7 +30,7 @@ export declare class DrawDoorTool {
     protected GetRootTemplate(): TemplateRecord;
     private CreatePositionSpaceTr;
     protected CreateHandleTr(info: IDoorInfo, doorTr: TemplateRecord): void;
-    protected GetHingeTemp(info: IDoorInfo, door: TemplateRecord): void;
+    protected GetHingeTemp(info: IDoorInfo, door: TemplateRecord): boolean;
     protected RelativeMetalsToBoard(allEntitys: Entity[], isUpDownDoor: boolean): boolean;
     private SetHingeType;
     getSpaceAllBoards(): Board[];
@@ -41,7 +42,7 @@ export declare class DrawDoorTool {
      *
      * @private
      * @param {number} doorSpecs  门板高度/宽度
-     * @param {Box3} enBox        铰链空间box
+     * @param {Box3} inventedBox        铰链空间box  GetBoundingBoxInMtx
      * @param {Entity[]} checkEnts      判断碰撞板
      * @param {number} distance   一次偏移量
      * @param {Matrix4} ocs
@@ -51,6 +52,11 @@ export declare class DrawDoorTool {
      */
     private GetHingeMoveNum;
     private MoveAgain;
-    private IsIntersects;
 }
+/**
+ * @param enBox 实体的世界坐标系盒子
+ * @param checkEnts 校验的实体列表
+ * @param parentOCS 父空间的坐标系
+ */
+export declare function IsBoxAndEntitysIntersect(enBox: Box3, checkEnts: Entity[], parentOCS?: Matrix4): boolean;
 //# sourceMappingURL=DrawDoorTool.d.ts.map

types/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrawDoorTool.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAQjE,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAGnF,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAEvE,OAAO,EAAgB,kBAAkB,EAAwB,MAAM,kCAAkC,CAAC;AAC1G,OAAO,EAAE,SAAS,EAAgB,MAAM,6CAA6C,CAAC;AACtF,OAAO,EAAgE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAM7I,qBAAa,YAAY;IAiBjB,OAAO,CAAC,KAAK;IACb,SAAS,CAAC,UAAU,EAAE,WAAW;IAhBrC,YAAY;IACZ,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAa;IAE9D,SAAS,CAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAC9C,SAAS,CAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAC9C,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,CAAM;IACvC,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,CAAM;IACvC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC7C,gBAAgB;IAChB,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAC1D,OAAO,CAAC,QAAQ,CAA4B;IAC5C,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACpC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC;IACjC,OAAO,CAAC,kBAAkB,CAAmB;gBAEjC,KAAK,EAAE,SAAS,EACd,UAAU,EAAE,WAAW;IAOrC,OAAO,CAAC,aAAa;cAIL,IAAI;IA2Fd,IAAI;IAGV,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE,MAAM;IAU3G,SAAS,CAAC,eAAe;IAoDzB,OAAO,CAAC,qBAAqB;IAU7B,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc;IAwEhE,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc;IAuJ5D,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO;IAkM3E,OAAO,CAAC,YAAY;IAcpB,iBAAiB;IAgBjB,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS;IA4ErC,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS;IAqB/D,OAAO,CAAC,eAAe;IAiCvB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,SAAS;IAyCjB,OAAO,CAAC,YAAY;CAUvB"}
+{"version":3,"file":"DrawDoorTool.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/DrawBoard/DrawDoorDrawer/DrawDoorTool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAW,MAAM,OAAO,CAAC;AAI/C,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAQjE,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAGnF,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAEvE,OAAO,EAAgB,kBAAkB,EAAwB,MAAM,kCAAkC,CAAC;AAC1G,OAAO,EAAE,SAAS,EAA4B,MAAM,6CAA6C,CAAC;AAClG,OAAO,EAAgE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAM7I,qBAAa,YAAY;IAiBjB,OAAO,CAAC,KAAK;IACb,SAAS,CAAC,UAAU,EAAE,WAAW;IAhBrC,YAAY;IACZ,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAa;IAE9D,SAAS,CAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAC9C,SAAS,CAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAM;IAC9C,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,CAAM;IACvC,SAAS,CAAC,YAAY,EAAE,OAAO,EAAE,CAAM;IACvC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC7C,gBAAgB;IAChB,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAC1D,OAAO,CAAC,QAAQ,CAA4B;IAC5C,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACpC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC;IACjC,OAAO,CAAC,kBAAkB,CAAmB;gBAEjC,KAAK,EAAE,SAAS,EACd,UAAU,EAAE,WAAW;IAOrC,OAAO,CAAC,aAAa;cAIL,IAAI;IA2Fd,IAAI;IAGV,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE,MAAM;IAiB3G,SAAS,CAAC,eAAe;IAoDzB,OAAO,CAAC,qBAAqB;IAU7B,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc;IAwEhE,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc;IAwM5D,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO;IA8L3E,OAAO,CAAC,YAAY;IAcpB,iBAAiB;IAgBjB,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS;IA4ErC,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS;IAqB/D,OAAO,CAAC,eAAe;IAiCvB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,eAAe;IA+BvB,OAAO,CAAC,SAAS;CA+CpB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAqBvG"}

types/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrawLeftRightOpenDoor.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAInF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,qBAAsB,SAAQ,YAAY;IAE7C,IAAI;IA6FV,SAAS,CAAC,eAAe;IAMzB,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,oBAAoB;IAoH5B,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,YAAY;CA2BvB"}
+{"version":3,"file":"DrawLeftRightOpenDoor.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/DrawBoard/DrawDoorDrawer/DrawLeftRightOpenDoor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAKnF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,qBAAsB,SAAQ,YAAY;IAE7C,IAAI;IAwGV,SAAS,CAAC,eAAe;IAMzB,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,oBAAoB;IAoH5B,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,YAAY;CA2BvB"}

types/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrawUpDownOpenDoor.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAInF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,kBAAmB,SAAQ,YAAY;IAE1C,IAAI;IA+FV,SAAS,CAAC,eAAe;IAOzB,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,oBAAoB;IAsH5B,OAAO,CAAC,YAAY;IA0BpB,OAAO,CAAC,eAAe;CA0B1B"}
+{"version":3,"file":"DrawUpDownOpenDoor.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAKnF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,kBAAmB,SAAQ,YAAY;IAE1C,IAAI;IA0GV,SAAS,CAAC,eAAe;IAOzB,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,oBAAoB;IAsH5B,OAAO,CAAC,YAAY;IA0BpB,OAAO,CAAC,eAAe;CA0B1B"}

types/Add-on/DrawBoard/DrawLeftRightBoard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrawLeftRightBoard.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/DrawBoard/DrawLeftRightBoard.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,qBAAa,aAAc,YAAW,OAAO;IAEnC,IAAI;IAgBV,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,aAAa,CAqKnB;IACF,OAAO,CAAC,aAAa,CAiCnB;CACL"}
+{"version":3,"file":"DrawLeftRightBoard.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/DrawBoard/DrawLeftRightBoard.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,qBAAa,aAAc,YAAW,OAAO;IAEnC,IAAI;IAgBV,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,aAAa,CAuKnB;IACF,OAAO,CAAC,aAAa,CAiCnB;CACL"}

types/Add-on/DrawLight/BatchModifyLights.d.ts

@@ -0,0 +1,5 @@
+import { Command } from "../../Editor/CommandMachine";
+export declare class BatchModifyLights implements Command {
+    exec(): Promise<void>;
+}
+//# sourceMappingURL=BatchModifyLights.d.ts.map

types/Add-on/DrawLight/BatchModifyLights.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BatchModifyLights.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/DrawLight/BatchModifyLights.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAQtD,qBAAa,iBAAkB,YAAW,OAAO;IAEvC,IAAI;CA6Fb"}

types/Add-on/Erp/ErpView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ErpView.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/Erp/ErpView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,UAAU,WAAW;IAEjB,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QAAE,SAAS,EAAE,cAAc,EAAE,CAAC;QAAC,UAAU,EAAE,eAAe,EAAE,CAAC;QAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;KAAE,CAAC;IACjH,KAAK,EAAE,UAAU,CAAC;CACrB;AACD,qBAAa,OAAQ,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;IACzD,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;gBAC/B,KAAK,KAAA;IAKjB,WAAW,YAAa,MAAM,YAAW,GAAG,UA2B1C;IACF,YAAY,aA4BV;IACF,OAAO,CAAC,UAAU,CAQhB;IACF,OAAO,CAAC,YAAY,CAYlB;IACF,MAAM;IA+BN,oBAAoB;CAKvB"}
+{"version":3,"file":"ErpView.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/Erp/ErpView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,UAAU,WAAW;IAEjB,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QAAE,SAAS,EAAE,cAAc,EAAE,CAAC;QAAC,UAAU,EAAE,eAAe,EAAE,CAAC;QAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;KAAE,CAAC;IACjH,KAAK,EAAE,UAAU,CAAC;CACrB;AACD,qBAAa,OAAQ,SAAQ,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;IACzD,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;gBAC/B,KAAK,KAAA;IAKjB,WAAW,YAAa,MAAM,YAAW,GAAG,UA2B1C;IACF,YAAY,aA4BV;IACF,OAAO,CAAC,UAAU,CAQhB;IACF,OAAO,CAAC,YAAY,CAYlB;IACF,MAAM;IAgCN,oBAAoB;CAKvB"}

types/Add-on/HideSelect/HideSelectUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HideSelectUtils.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/HideSelect/HideSelectUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAS9D,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,WAkBhC;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,WAUlC;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,WAMpC;AACD,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,WAMnC;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,WAelC;AACD,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,WAejC;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,WASnC"}
+{"version":3,"file":"HideSelectUtils.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/HideSelect/HideSelectUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAS9D,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,WAkBhC;AAGD,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,WAUlC;AAGD,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,WAMpC;AAGD,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,WAMnC;AAGD,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,WAelC;AAGD,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,WAejC;AAGD,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,WASnC"}

types/Add-on/JiaJu/Import/JiaJuImport.d.ts

@@ -0,0 +1,8 @@
+import { Command } from "../../../Editor/CommandMachine";
+export declare function xmlStr2Json(xmlStr: string): {};
+export declare class Command_JiaJuImport implements Command {
+    exec(): Promise<void>;
+}
+export declare function ImportJiajuFile(xmlFile: File): Promise<void>;
+export declare function ImportJiaJuData(bom: JiaJu.Bom): Promise<void>;
+//# sourceMappingURL=JiaJuImport.d.ts.map

types/Add-on/JiaJu/Import/JiaJuImport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"JiaJuImport.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/JiaJu/Import/JiaJuImport.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,OAAO,EAAe,MAAM,gCAAgC,CAAC;AAStE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,MAKzC;AAuBD,qBAAa,mBAAoB,YAAW,OAAO;IAEzC,IAAI;CAeb;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,IAAI,iBAgBlD;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,iBA8CnD"}

types/Add-on/JiaJu/Import/JiaJuInterface.d.ts

@@ -0,0 +1,169 @@
+declare namespace JiaJu {
+    export interface Bom {
+        Rooms: Rooms[];
+        Orders: Order[];
+        Products: [Products];
+        Other: [];
+    }
+    type Rot = string;
+    export interface Rooms {
+        Room: Room[];
+    }
+    export interface Room {
+        ID: string;
+        Name: string;
+        Path: Path[];
+    }
+    export interface Order {
+    }
+    export interface Products {
+        Product: ModelProduct[];
+    }
+    export enum CategoryName {
+        Empty = "",
+        衣柜 = "\u8863\u67DC"
+    }
+    export interface ProductBase {
+        CategoryName: CategoryName;
+        ChannelID: string;
+        PID: string;
+        OrderID: string;
+        TypeID: "" | "XianTiao" | "GuiTi";
+        ObjType: "CabinetDoor" | "Cabinet" | "Group" | "Board" | "Decoration" | "TopLine" | "SweepLine";
+        TypeLabel: string;
+        Name: string;
+        Coordinate: string;
+        Coordinate_Parent: string;
+        Pos: string;
+        Pos_Parent: string;
+        Rot: Rot;
+        Rot_Parent: Rot;
+    }
+    export interface ModelProduct extends ProductBase {
+        RoomID: string;
+        ParamTable: ModelParamTable[];
+        Products: [ModelProducts];
+    }
+    export interface ModelParamTable {
+        CODE: string;
+        D: string;
+        DATE: Date;
+        EXTEND_BACK: string;
+        EXTEND_DOWN: string;
+        EXTEND_FRONT: string;
+        EXTEND_LEFT: string;
+        EXTEND_RIGHT: string;
+        EXTEND_UP: string;
+        FRAME_ID: string;
+        H: string;
+        HIDE_FLAG: string;
+        ID: string;
+        IS_QUOTED: string;
+        MTL: string;
+        MTL_BASE: string;
+        MTL_BYOWNER: string;
+        MTL_DIR: string;
+        MTL_NAME: string;
+        MTL_SALENAME: string;
+        NAME: string;
+        OPEN_STATUS: string;
+        PRO_NOTES: string;
+        QUOTE_CODE: string;
+        RD: string;
+        RH: string;
+        RW: string;
+        SALES_MARKET: string;
+        SERIESID: string;
+        SPRAY_MATRIAL: string;
+        STD: string;
+        W: string;
+        YG_AZBZ: string;
+        YG_SJBZ: string;
+        YG_TJZJ_H: string;
+        YG_TJZJ_H1: string;
+    }
+    export interface ModelProducts {
+        Product: EntityProduct[];
+    }
+    export interface EntityProduct extends ProductBase {
+        BoardMode?: "SIDEBOARD" | "FORWARDBOARD" | "HORIZONTALBOARD";
+        ParamTable: EntityParamTable[];
+        OutLines?: OutLine[];
+    }
+    export interface OutLine {
+        Path: Path[];
+        ModelPath: Path[];
+        Hole?: Path[];
+    }
+    export interface Path {
+        GeCurve: GeCurve[];
+    }
+    export interface GeCurve {
+        End: string;
+        EndX: string;
+        EndY: string;
+        EndZ: string;
+        GeCurveType: GeCurveType;
+        Start: string;
+        StartX: string;
+        StartY: string;
+        StartZ: string;
+        ArcCenX: string;
+        ArcCenY: string;
+        ArcCenZ: string;
+        ArcCen: string;
+    }
+    export enum GeCurveType {
+        Seg = "Seg",
+        Arc = "Arc"
+    }
+    export interface EntityParamTable {
+        CODE: string;
+        D: string;
+        EXTEND_BACK: string;
+        EXTEND_DOWN: string;
+        EXTEND_FRONT: string;
+        EXTEND_LEFT: string;
+        EXTEND_RIGHT: string;
+        EXTEND_UP: string;
+        FRAME_ID?: string;
+        H: string;
+        HANDLE_ANG?: string;
+        HANDLE_HEIGHT?: string;
+        HANDLE_HOLECOUNT?: string;
+        HANDLE_PITCHROW?: string;
+        HANDLE_TYPE?: string;
+        HANDLE_YVALUE?: string;
+        HIDE_FLAG: string;
+        ID: string;
+        IS_QUOTED: string;
+        MTL: string;
+        MTL_BYOWNER: string;
+        MTL_DIR: string;
+        NAME: string;
+        OPEN_STATUS: string;
+        PRO_NOTES: string;
+        QUOTE_CODE: string;
+        RD: string;
+        RH: string;
+        RW: string;
+        STD: string;
+        W: string;
+        ABNORMAL?: string;
+        DISP_BORDER?: string;
+        EDGE?: string;
+        LINK_DOWN?: string;
+        LINK_LEFT?: string;
+        LINK_RIGHT?: string;
+        LINK_UP?: string;
+        MTL_BASE?: string;
+        MTL_NAME?: string;
+        MTL_SALENAME?: string;
+        MTL_SIDE?: string;
+        SALES_MARKET?: string;
+        YG_AZBZ?: string;
+        YG_SJBZ?: string;
+    }
+    export {};
+}
+//# sourceMappingURL=JiaJuInterface.d.ts.map

types/Add-on/JiaJu/Import/JiaJuInterface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"JiaJuInterface.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/JiaJu/Import/JiaJuInterface.ts"],"names":[],"mappings":"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"}

types/Add-on/KJL/Import/KJLParse.d.ts

@@ -7,7 +7,7 @@ import { KJLMaterialLoader } from "./KJLMaterialLoader";
 export declare function ParseRoomNameMap(d: KJL_DesignData): Map<string, string>;
 export declare function ParseCabNameMap(data: KJL_AssemblyModel[]): Map<string, string>;
 export declare function ParseEdgeBanding(model: KJL_ParamModel): number[] | undefined;
-export declare function ParseTopline(model: KJL_ParamModel, mtlLoader: KJLMaterialLoader): Promise<HardwareTopline[]>;
+export declare function ParseTopline(model: KJL_ParamModel, mtlLoader: KJLMaterialLoader, roomName: string, gName: string): Promise<HardwareTopline[]>;
 export declare function ParseBT(params: KJL_Parameter[]): number;
 export declare function ParseKMFX(params: KJL_Parameter[]): BoardOpenDir;
 export declare function ParseBCBZ(params: KJL_Parameter[]): string;

types/Add-on/KJL/Import/KJLParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KJLParse.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/KJL/Import/KJLParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,MAAM,OAAO,CAAC;AAItC,OAAO,EAAE,QAAQ,EAAiB,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AAErF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAgB,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAe,MAAM,gBAAgB,CAAC;AACtJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKxD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQvE;AAGD,wBAAgB,eAAe,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAa9E;AAGD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,EAAE,GAAG,SAAS,CA0C5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,iBAAiB,8BAkBrF;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CASvD;AAGD,wBAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY,CAa/D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CASzD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,GAAG,SAAS,CAYhF;AAID,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,GAAG,SAAS,CA8B7E;AAcD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,aAAa,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAuGtI;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAkBvE"}
+{"version":3,"file":"KJLParse.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/KJL/Import/KJLParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,MAAM,OAAO,CAAC;AAKtC,OAAO,EAAE,QAAQ,EAAiB,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AAErF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAgB,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAe,MAAM,gBAAgB,CAAC;AACtJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKxD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQvE;AAGD,wBAAgB,eAAe,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAa9E;AAGD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,EAAE,GAAG,SAAS,CA0C5E;AAED,wBAAsB,YAAY,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,8BAmBtH;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CASvD;AAGD,wBAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY,CAa/D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CASzD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,GAAG,SAAS,CAYhF;AAID,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,aAAa,GAAG,SAAS,CA8B7E;AAcD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,aAAa,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAuGtI;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAkBvE"}

types/Add-on/KJL/Import/KJLUtils.d.ts

@@ -3,5 +3,6 @@ import { HardwareCompositeEntity } from "../../../DatabaseServices/Hardware/Hard
 import { PhysicalMaterialRecord } from "../../../DatabaseServices/PhysicalMaterialRecord";
 import { KJL_ParamModel_Hardware } from "./KJLInterface";
 export declare function CreateHardware(hmodel: KJL_ParamModel_Hardware, roomName: string, gName: string): HardwareCompositeEntity;
+export declare function ParseHardwareParam(hw: HardwareCompositeEntity, hmodel: KJL_ParamModel_Hardware): void;
 export declare function ApplyMaterial(ent: Entity, mtl: PhysicalMaterialRecord): void;
 //# sourceMappingURL=KJLUtils.d.ts.map

types/Add-on/KJL/Import/KJLUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KJLUtils.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/KJL/Import/KJLUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4DAA4D,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAG1F,OAAO,EAAiB,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAExE,wBAAgB,cAAc,CAAC,MAAM,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,uBAAuB,CAqCxH;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,sBAAsB,QAMrE"}
+{"version":3,"file":"KJLUtils.d.ts","sourceRoot":"","sources":["../../../../../src/Add-on/KJL/Import/KJLUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4DAA4D,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAG1F,OAAO,EAAiB,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAExE,wBAAgB,cAAc,CAAC,MAAM,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,uBAAuB,CAoBxH;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,uBAAuB,EAAE,MAAM,EAAE,uBAAuB,QAsB9F;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,sBAAsB,QAMrE"}

types/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LookOverBoardInfosTool.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAMhC,OAAO,EAAE,YAAY,EAAiB,MAAM,6CAA6C,CAAC;AAG1F,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAM5D,OAAO,EAAE,aAAa,EAAc,MAAM,0BAA0B,CAAC;AAGrE,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,aAAa;IAEzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,oBAAY,cAAc,GAAG;IAAE,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CAAE,CAAC;AACzJ,cAAM,sBAAsB;IAExB,OAAO,CAAC,YAAY,CAAoD;IACxE,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,QAAQ,CAA8B;IAC9C,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,GAAG,aAAa,CAAC,EAAE,EAAE,OAAO,GAAE,cAAqB;;;;;;IA2CvE,OAAO,CAAC,MAAM;IAkKd,SAAS,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAKjE,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE;IA6C7E,OAAO,CAAC,cAAc;IAmBtB,iBAAiB,CAAC,EAAE,EAAE,KAAK;IAQ3B,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE;CAc7B;AAED,eAAO,MAAM,sBAAsB,wBAA+B,CAAC"}
+{"version":3,"file":"LookOverBoardInfosTool.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/LookOverBoardInfos/LookOverBoardInfosTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAMhC,OAAO,EAAE,YAAY,EAAiB,MAAM,6CAA6C,CAAC;AAG1F,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAM5D,OAAO,EAAE,aAAa,EAAc,MAAM,0BAA0B,CAAC;AAGrE,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,aAAa;IAEzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,oBAAY,cAAc,GAAG;IAAE,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CAAE,CAAC;AACzJ,cAAM,sBAAsB;IAExB,OAAO,CAAC,YAAY,CAAoD;IACxE,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,QAAQ,CAA8B;IAC9C,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,GAAG,aAAa,CAAC,EAAE,EAAE,OAAO,GAAE,cAAqB;;;;;;IA2CvE,OAAO,CAAC,MAAM;IA6Kd,SAAS,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAKjE,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE;IA6C7E,OAAO,CAAC,cAAc;IAmBtB,iBAAiB,CAAC,EAAE,EAAE,KAAK;IAQ3B,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE;CAc7B;AAED,eAAO,MAAM,sBAAsB,wBAA+B,CAAC"}

types/Add-on/OpenCabinet/OpenCabinet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenCabinet.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/OpenCabinet/OpenCabinet.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAWtD,qBAAa,mBAAoB,YAAW,OAAO;IAE/C,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,aAAa,CAA8C;IACnE,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,MAAM,CAAK;IAEb,IAAI;IA+FV,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,YAAY;IA+DpB,OAAO,CAAC,aAAa;IAuCrB,OAAO,CAAC,MAAM;IA6Dd,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,kBAAkB;CA+F7B"}
+{"version":3,"file":"OpenCabinet.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/OpenCabinet/OpenCabinet.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAWtD,qBAAa,mBAAoB,YAAW,OAAO;IAE/C,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,aAAa,CAA8C;IACnE,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,MAAM,CAAK;IAEb,IAAI;IA+FV,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,YAAY;IA+DpB,OAAO,CAAC,aAAa;IA0CrB,OAAO,CAAC,MAAM;IA6Dd,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,kBAAkB;CAgG7B"}

types/Add-on/RotateLayerBoard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RotateLayerBoard.d.ts","sourceRoot":"","sources":["../../../src/Add-on/RotateLayerBoard.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAkBnD,qBAAa,gBAAiB,YAAW,OAAO;IAE5C,OAAO,CAAC,IAAI,CAMV;IACF,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,KAAK,CAAa;IACpB,IAAI;IA0CV,OAAO,CAAC,YAAY,CAqBlB;IAEF,OAAO,CAAC,oBAAoB;IAiC5B,OAAO,CAAC,qBAAqB;IAwB7B,WAAW;IACX,OAAO,CAAC,gBAAgB;IAOxB;;;MAGE;IACF,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,gBAAgB;IAaxB;;;SAGK;IACL,OAAO,CAAC,eAAe;IA6BvB,OAAO,CAAC,oBAAoB;IA8C5B;;OAEG;IACH,OAAO,CAAC,UAAU;CAoCrB"}
+{"version":3,"file":"RotateLayerBoard.d.ts","sourceRoot":"","sources":["../../../src/Add-on/RotateLayerBoard.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAkBnD,qBAAa,gBAAiB,YAAW,OAAO;IAE5C,OAAO,CAAC,IAAI,CAMV;IACF,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,KAAK,CAAa;IACpB,IAAI;IA0CV,OAAO,CAAC,YAAY,CA0BlB;IAEF,OAAO,CAAC,oBAAoB;IAiC5B,OAAO,CAAC,qBAAqB;IAwB7B,WAAW;IACX,OAAO,CAAC,gBAAgB;IAOxB;;;MAGE;IACF,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,gBAAgB;IAaxB;;;SAGK;IACL,OAAO,CAAC,eAAe;IA6BvB,OAAO,CAAC,oBAAoB;IA8C5B;;OAEG;IACH,OAAO,CAAC,UAAU;CAoCrB"}

types/Add-on/ViewCtrl/FixView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FixView.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/ViewCtrl/FixView.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAKtD,qBAAa,eAAgB,YAAW,OAAO;IAErC,IAAI;CAgEb"}
+{"version":3,"file":"FixView.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/ViewCtrl/FixView.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAItD,qBAAa,eAAgB,YAAW,OAAO;IAErC,IAAI;CA4Eb"}

types/Add-on/Viewport/OneKeyLayout.d.ts

@@ -4,6 +4,7 @@ export declare class OneKeyLayout implements Command {
     exec(): Promise<void>;
     private GetVpInfos;
     private checkBoxOnY;
+    private checkBoxbyRoomName;
     private HandleTextMetaData;
 }
 //# sourceMappingURL=OneKeyLayout.d.ts.map

types/Add-on/Viewport/OneKeyLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OneKeyLayout.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/Viewport/OneKeyLayout.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,qBAAa,YAAa,YAAW,OAAO;IAExC,OAAO,CAAC,UAAU,CAAyB;IACrC,IAAI;IAsWV,OAAO,CAAC,UAAU,CAiKhB;IAEF,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,kBAAkB;CA8B7B"}
+{"version":3,"file":"OneKeyLayout.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/Viewport/OneKeyLayout.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAatD,qBAAa,YAAa,YAAW,OAAO;IAExC,OAAO,CAAC,UAAU,CAAyB;IACrC,IAAI;IA6XV,OAAO,CAAC,UAAU,CAiKhB;IAEF,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,kBAAkB;CA8B7B"}

types/Add-on/twoD2threeD/Polyline2Board.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Polyline2Board.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/twoD2threeD/Polyline2Board.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAW,MAAM,OAAO,CAAC;AAS/C,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAgBtD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,qBACa,cAAe,YAAW,OAAO;IAE1C,KAAK,cAA4C;IACjD,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACf,IAAI;IA+BV,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAEhB,WAAW,EAAE,MAAM,CAAC;IAEpB,YAAY,EAAE,MAAM,CAAC;IAErB,WAAW,EAAE,MAAM,CAAC;IAEpB,WAAW,EAAE,MAAM,CAAC;IAGpB,cAAc,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAE/F,cAAc,EAAE,MAAM,CAAC;IAEvB,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAE3C,gBAAgB,EAAE,MAAM,CAAC;IAEzB,cAAc,EAAE,OAAO,CAAC;IAExB,YAAY,EAAE,cAAc,CAAC;IAE7B,oBAAoB,EAAE,OAAO,CAAC;IAE9B,cAAc,EAAE,OAAO,CAAS;IAEhC,YAAY,EAAE,MAAM,CAAM;IAC1B,UAAU,SAAQ;IAClB,gBAAgB,UAAS;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,WAAW;IA8BrB,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE;IAgjB1B,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,MAAM,UAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE;IA+FnE,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ;IAiB9C,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;CA4BxB"}
+{"version":3,"file":"Polyline2Board.d.ts","sourceRoot":"","sources":["../../../../src/Add-on/twoD2threeD/Polyline2Board.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAW,MAAM,OAAO,CAAC;AAS/C,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAgBtD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,qBACa,cAAe,YAAW,OAAO;IAE1C,KAAK,cAA4C;IACjD,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACf,IAAI;IA+BV,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAEhB,WAAW,EAAE,MAAM,CAAC;IAEpB,YAAY,EAAE,MAAM,CAAC;IAErB,WAAW,EAAE,MAAM,CAAC;IAEpB,WAAW,EAAE,MAAM,CAAC;IAGpB,cAAc,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAE/F,cAAc,EAAE,MAAM,CAAC;IAEvB,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAE3C,gBAAgB,EAAE,MAAM,CAAC;IAEzB,cAAc,EAAE,OAAO,CAAC;IAExB,YAAY,EAAE,cAAc,CAAC;IAE7B,oBAAoB,EAAE,OAAO,CAAC;IAE9B,cAAc,EAAE,OAAO,CAAS;IAEhC,YAAY,EAAE,MAAM,CAAM;IAC1B,UAAU,SAAQ;IAClB,gBAAgB,UAAS;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,WAAW;IA8BrB,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE;IAgjB1B,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,MAAM,UAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE;IA+FnE,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ;IAiB9C,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;CA6BxB"}

types/ApplicationServices/Application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/Application.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAUzE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAOlD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,IAAI,GAAG,EAAE,kBAAkB,CAAC;AAEnC,oBAAY,cAAc;IAEtB,GAAG,IAAI;IACP,IAAI,IAAI;CACX;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAE3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,eAAe,CAAC;IAElC,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,KAAK,UAAQ;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,EAAE,qBAAqB,CAA6D;IAC7F,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IAEvB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IAGjB,cAAc,iBAAsB;IACpC,cAAc,SAAK;IAEnB,OAAO,CAAC,mBAAmB,CAAS;;IA6SpC,uBAAuB;IAgBvB,IAAI,kBAAkB,IACI,OAAO,CAD4B;IAC7D,IAAI,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAOhC;IACD,OAAO,CAAC,gBAAgB,CAQtB;IAEF,WAAW;IAoBX,cAAc,CAAC,IAAI,GAAE,MAAc;IAanC,OAAO,IAAI,QAAQ;IAanB,QAAQ;IAaR,QAAQ,CAAC,CAAC,EAAE,QAAQ;CAkBvB"}
+{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/Application.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAWzE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAOlD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,IAAI,GAAG,EAAE,kBAAkB,CAAC;AAEnC,oBAAY,cAAc;IAEtB,GAAG,IAAI;IACP,IAAI,IAAI;CACX;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAE3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,eAAe,CAAC;IAElC,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,KAAK,UAAQ;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,EAAE,qBAAqB,CAA6D;IAC7F,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IAEvB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IAGjB,cAAc,iBAAsB;IACpC,cAAc,SAAK;IAEnB,OAAO,CAAC,mBAAmB,CAAS;;IA0TpC,uBAAuB;IAgBvB,IAAI,kBAAkB,IACI,OAAO,CAD4B;IAC7D,IAAI,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAOhC;IACD,OAAO,CAAC,gBAAgB,CAQtB;IAEF,WAAW;IAoBX,cAAc,CAAC,IAAI,GAAE,MAAc;IAanC,OAAO,IAAI,QAAQ;IAanB,QAAQ;IAaR,QAAQ,CAAC,CAAC,EAAE,QAAQ;CAkBvB"}

types/Common/CommandNames.d.ts

@@ -5,6 +5,7 @@ export declare enum CommandNames {
     KJLCongfig = "KJLCONFIG",
     KJLMaterialMap = "KJLMATERIALMAP",
     Clearkjltoken = "CLEARKJLTOKEN",
+    JiaJuImport = "JIAJUIMPORT",
     Group = "GROUP",
     DXFImport = "DXF",
     DWGImport = "DWG",
@@ -72,6 +73,7 @@ export declare enum CommandNames {
     SpotLight = "SPOTLIGHT",
     SpotLight2 = "SPOTLIGHT2",
     RectLight = "RECTLIGHT",
+    BatchModifyLights = "BATCHMODIFYLIGHTS",
     Divide = "DIVIDE",
     Point = "POINT",
     AlignDim = "ALGINDIMEN",

types/Common/EntityUpdateWrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityUpdateWrap.d.ts","sourceRoot":"","sources":["../../../src/Common/EntityUpdateWrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,QAO3D;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,QAU9D"}
+{"version":3,"file":"EntityUpdateWrap.d.ts","sourceRoot":"","sources":["../../../src/Common/EntityUpdateWrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,QAQ3D;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,QAoB9D"}

types/Common/Toaster.d.ts

@@ -14,5 +14,18 @@ export interface IToasterOption {
 declare type ToasterFunction = (option: IToasterOption) => void;
 export declare const ToasterInjectFunctions: ToasterFunction[];
 export declare function Toaster(option: IToasterOption): void;
+interface IToasterShowEntityErrorOption {
+    intent: Intent;
+    msg: string;
+    timeout: number;
+    ent: any;
+}
+export declare const ToasterShowEntityMsgInjectFunctions: ((option: IToasterShowEntityErrorOption) => void)[];
+export declare function ToasterShowEntityMsg(option: {
+    intent: Intent;
+    msg: string;
+    timeout: number;
+    ent: any;
+}): void;
 export {};
 //# sourceMappingURL=Toaster.d.ts.map

types/Common/Toaster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Toaster.d.ts","sourceRoot":"","sources":["../../../src/Common/Toaster.ts"],"names":[],"mappings":"AAAA,oBAAY,MAAM;IAEd,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,cAAc;IAE3B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,aAAK,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;AAExD,eAAO,MAAM,sBAAsB,EAAE,eAAe,EAAO,CAAC;AAE5D,wBAAgB,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAIpD"}
+{"version":3,"file":"Toaster.d.ts","sourceRoot":"","sources":["../../../src/Common/Toaster.ts"],"names":[],"mappings":"AAEA,oBAAY,MAAM;IAEd,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,cAAc;IAE3B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,aAAK,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;AAExD,eAAO,MAAM,sBAAsB,EAAE,eAAe,EAAO,CAAC;AAE5D,wBAAgB,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAIpD;AAGD,UAAU,6BAA6B;IAEnC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,mCAAmC,EAAE,CAAC,CAAC,MAAM,EAAE,6BAA6B,KAAK,IAAI,CAAC,EAAO,CAAC;AAC3G,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;CACZ,QAIA"}

types/DatabaseServices/Contour.d.ts

@@ -52,8 +52,13 @@ export declare class Contour {
      */
     static Combine(cus: Curve[], needLink?: boolean, tolerance?: number): Curve;
     get Shape(): THREE.Shape;
-    CuInOutline(targetCur: Curve): boolean;
+    /**
+     * 判断是否完全包含曲线
+     * @param smallCurve 传入的这个曲线不能比本轮廓还大(这个需要自己优化?)
+     * @returns
+     */
+    ContainerCurve(smallCurve: Polyline | Circle | Curve, isAreaCheckd?: boolean, ipts?: any[]): boolean;
     Equal(tar: Contour): boolean;
 }
-export declare function fastCurveInCurve2(sourceCu: Polyline | Circle, targetCu: Curve): boolean;
+export declare function fastCurveInCurve2(bigCurve: Polyline | Circle, smallCurve: Curve): boolean;
 //# sourceMappingURL=Contour.d.ts.map

types/DatabaseServices/Contour.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Contour.d.ts","sourceRoot":"","sources":["../../../src/DatabaseServices/Contour.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAM7C,qBAAa,OAAO;IAEhB,OAAO,CAAC,MAAM,CAAoB;IAElC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM;IASxC,oBAAoB;IACpB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,QAAQ,GAAG,MAAM,EAAE,QAAQ,UAAO;IA2BtE,IAAI,KAAK,IAAI,QAAQ,GAAG,MAAM,CAG7B;IACD,IAAI,IAAI,WAGP;IACD,IAAI,WAAW,sCAGd;IACD;;;;;OAKG;IACH,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG;IAsBhE,KAAK;IAKL,yBAAyB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,EAAE;IAQrD,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;QAAC,KAAK,EAAE,OAAO,EAAE,CAAC;KAAE;IAkE/E,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,EAAE;IA8BjD;;OAEG;IACH,uBAAuB,CAAC,MAAM,EAAE,OAAO,GAAG;QAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;QAAC,SAAS,EAAE,KAAK,EAAE,CAAC;KAAE;IA4G5F,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,QAAQ,EAAE;IA6D5C,4BAA4B,CAAC,OAAO,EAAE,OAAO,EAAE;;;;IAqC/C,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE;;;;IA0FpC;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE;IAiBzD;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,UAAO,EAAE,SAAS,SAAO,GAAG,KAAK;IA6BtE,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAGvB;IACD,WAAW,CAAC,SAAS,EAAE,KAAK;IAI5B,KAAK,CAAC,GAAG,EAAE,OAAO;CAIrB;AA8BD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK,WAI7E"}
+{"version":3,"file":"Contour.d.ts","sourceRoot":"","sources":["../../../src/DatabaseServices/Contour.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAM7C,qBAAa,OAAO;IAEhB,OAAO,CAAC,MAAM,CAAoB;IAElC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM;IASxC,oBAAoB;IACpB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,QAAQ,GAAG,MAAM,EAAE,QAAQ,UAAO;IA2BtE,IAAI,KAAK,IAAI,QAAQ,GAAG,MAAM,CAG7B;IACD,IAAI,IAAI,WAGP;IACD,IAAI,WAAW,sCAGd;IACD;;;;;OAKG;IACH,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG;IAsBhE,KAAK;IAKL,yBAAyB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,EAAE;IAQrD,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;QAAC,KAAK,EAAE,OAAO,EAAE,CAAC;KAAE;IAkE/E,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,EAAE;IA8BjD;;OAEG;IACH,uBAAuB,CAAC,MAAM,EAAE,OAAO,GAAG;QAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;QAAC,SAAS,EAAE,KAAK,EAAE,CAAC;KAAE;IA4G5F,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,QAAQ,EAAE;IA6D5C,4BAA4B,CAAC,OAAO,EAAE,OAAO,EAAE;;;;IAqC/C,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE;;;;IA0FpC;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE;IAiBzD;;;;;OAKG;IACH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,UAAO,EAAE,SAAS,SAAO,GAAG,KAAK;IA6BtE,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAGvB;IAED;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,MAAM,GAAG,KAAK,EAAE,YAAY,UAAQ,EAAE,IAAI,GAAE,GAAG,EAAc,GAAG,OAAO;IAO7G,KAAK,CAAC,GAAG,EAAE,OAAO;CAIrB;AAkCD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,EAAE,UAAU,EAAE,KAAK,WAI/E"}

types/DatabaseServices/Entity/Board.d.ts

@@ -7,7 +7,6 @@ import { ObjectId } from '../ObjectId';
 import { Shape } from '../Shape';
 import { ExtrudeContourCurve, ExtrudeSolid } from './Extrude';
 import { Polyline } from './Polyline';
-export declare function ConverBoardTypeToSpaceType(type: BoardType): number;
 export interface IModeling {
     shape: Shape;
     thickness: number;

types/DatabaseServices/Entity/Board.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Board.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Board.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Board.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Entity/Board.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA+B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAiB,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAUrI,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAM7D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,SAAS,EAA4B,aAAa,EAA8B,MAAM,+BAA+B,CAAC;AAKjK,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAKjC,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAStC,MAAM,WAAW,SAAS;IAEtB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,aAAa,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IAEvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAE3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAExB,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,aAAa,CAAC;IACnB,KAAK,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IAAG,EAAE,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CAAE;AAExD,MAAM,WAAW,WAAW;IAExB,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,GAAG,EAAE,aAAa,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;CACrB;AAED;;GAEG;AACH,qBACa,KAAM,SAAQ,YAAY;IAEnC,SAAS,CAAC,iBAAiB,UAAQ;IACnC,SAAS,CAAC,sBAAsB,UAAQ;IAExC,OAAO,CAAC,SAAS,CAIf;IACF,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,WAAW,CAAkB;IACzB,gBAAgB,EAAE,QAAQ,EAAE,CAAM;IAClC,OAAO,EAAE,YAAY,CAAqB;IACtD,OAAO,CAAC,UAAU,CAAiB;IACnC,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,eAAe,CAAqB;;IAO5C;;OAEG;IACH,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;IAgFrB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,SAA2B;IA4BlG,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,SAA2B;IAQ3G,IAAI,SAAS,oGAGZ;IAED,IAAI,UAAU,iDAGb;IAED,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE;IAK3B,eAAe;IAWf;;OAEG;IACH,IAAI,kBAAkB,IAKM,kBAAkB,CAF7C;IAED,IAAI,kBAAkB,CAAC,GAAG,EAAE,kBAAkB,EAG7C;IACD,IAAI,yBAAyB,YAY5B;IAED,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,YAAY,EAAE;IAyBlD,cAAc,CAAC,EAAE,CAAC,EAAE,YAAY;IAchC,IAAI,WAAW,WAkEd;IAED,IAAI,aAAa,IAiCS,SAAS,EAAE,CAFpC;IAED,IAAI,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,EA8BpC;IAED,IAAI,UAAU,IAKK,WAAW,EAAE,CAF/B;IAED,IAAI,UAAU,CAAC,EAAE,EAAE,WAAW,EAAE,EAO/B;IAED,IAAI,UAAU,IAIK,WAAW,EAAE,CAD/B;IACD,IAAI,UAAU,CAAC,EAAE,EAAE,WAAW,EAAE,EAM/B;IACD,mBAAmB;IAQnB,mBAAmB;IAQnB,IAAI,SAAS,IAII,OAAO,CADvB;IACD,IAAI,SAAS,CAAC,CAAC,EAAE,OAAO,EAQvB;IACD,kBAAkB;IASlB;;OAEG;IACH,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;IAS9C,cAAc,CAAC,CAAC,EAAE,QAAQ;IAyB1B,iBAAiB;IAOjB,KAAK,CAAC,OAAO,GAAE,OAAc;IAmB7B,IAAI,SAAS,YA4BZ;IACD,IAAI,MAAM,IAII,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAqBnB;IACD,IAAI,KAAK,IAII,MAAM,CADlB;IACD,IAAI,KAAK,CAAC,CAAC,EAAE,MAAM,EAmBlB;IACD,IAAI,SAAS,IAAI,SAAS,CAGzB;IACD,IAAI,SAAS,CAAC,IAAI,EAAE,SAAS,EAiB5B;IAGD,YAAY,CAAC,IAAI,EAAE,SAAS;IAQ5B,IAAI,QAAQ,IAAI,OAAO,CAWtB;IACD,IAAI,QAAQ,IAAI,OAAO,CAKtB;IAED,IAAI,MAAM,YAGT;IAED,IAAI,cAAc,YAGjB;IAED,IAAI,SAAS,YAGZ;IAED,IAAI,IAAI,IAII,MAAM,CADjB;IACD,IAAI,IAAI,CAAC,CAAC,EAAE,MAAM,EAKjB;IAED;;OAEG;IACH,IAAI,YAAY,IAIK,mBAAmB,CADvC;IACD,IAAI,YAAY,CAAC,EAAE,EAAE,mBAAmB,EAwDvC;IAED,OAAO;IAKP;;;OAGG;IACM,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,UAAQ,GAAG,IAAI;IAyC5D,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAuBjD,IAAI,QAAQ;;;;MAGX;IACD,SAAS,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO;IA8DtC,IAAI,WAAW,IAAI,WAAW,CAM7B;IAED,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,UAAQ;IAMnD,QAAQ,CAAC,GAAG,EAAE,KAAK;IAenB,KAAK,IAAI,IAAI;IAQb,IAAI,CAAC,MAAM,EAAE,IAAI;IAcjB,OAAO,CAAC,WAAW;IAqCnB,eAAe,EAAE,QAAQ,CAAC;IAC1B,OAAO,CAAC,eAAe;IAsEd,mBAAmB,CAAC,YAAY,EAAE,IAAI,EAAE;IAsIjD,cAAc,CAAC,UAAU,aAAuB;IAqBhD,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAwBtD,OAAO,KAAK,UAAU,GAAkD;IAExE,YAAY,IAAI,IAAI;IAUpB,eAAe;;OAAqD;IACpE,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,mBAAmB;IA4B3B,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAwB9D,YAAY,CAAC,GAAG,EAAE,QAAQ;IAoB1B,gBAAgB;IAShB,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IA+CxD,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IA4CZ,WAAW;IASX,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAkGlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAwC3B"}

types/DatabaseServices/Entity/Circle.d.ts

@@ -1,7 +1,7 @@
 import { Material, Matrix3, Matrix4, Object3D, Vector3 } from 'three';
 import { ObjectSnapMode } from '../../Editor/ObjectSnapMode';
 import { Box3Ext } from '../../Geometry/Box';
-import { IntersectOption } from '../../GraphicsSystem/IntersectWith';
+import { IntersectOption, IntersectResult } from '../../GraphicsSystem/IntersectWith';
 import { RenderType } from '../../GraphicsSystem/RenderType';
 import { CADFiler } from '../CADFiler';
 import { Shape2 } from '../Shape2';
@@ -37,7 +37,7 @@ export declare class Circle extends Curve {
     GetParamAtPoint(pt?: Vector3): number;
     PtOnCurve(pt: Vector3, fuzz?: number): boolean;
     GetOffsetCurves(offsetDist: number): Curve[];
-    IntersectWith2(curve: Curve, intType: IntersectOption): any;
+    IntersectWith2(curve: Curve, intType: IntersectOption): IntersectResult[];
     get BoundingBoxInOCS(): Box3Ext;
     get BoundingBox(): Box3Ext;
     InitDrawObject(renderType?: RenderType): Object3D;

types/DatabaseServices/Entity/Circle.d.ts.map

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

types/DatabaseServices/Entity/Curve.d.ts

@@ -51,8 +51,8 @@ export declare abstract class Curve extends Entity {
     GetPointAtDistance(distance: number): Vector3;
     GetDistAtParam(param: number): number;
     GetDistAtPoint(pt: Vector3): number;
-    GetParamAtPoint(pt: Vector3): number;
-    GetParamAtPoint2(pt: Vector3): number;
+    GetParamAtPoint(pt: Vector3, fuzz?: number): number;
+    GetParamAtPoint2(pt: Vector3, fuzz?: number): number;
     GetParamAtDist(d: number): number;
     /**
      * 返回曲线在指定位置的一阶导数(在wcs内)

types/DatabaseServices/Entity/Curve.d.ts.map

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

types/DatabaseServices/Entity/Entity.d.ts.map

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

types/DatabaseServices/Entity/Extrude.d.ts

@@ -68,8 +68,6 @@ export declare class ExtrudeSolid extends Entity {
     ApplyMatrix(m: Matrix4): this;
     protected ApplyScaleMatrix(m: Matrix4): this;
     protected ApplyMirrorMatrix(m: Matrix4): this;
-    get Position(): Vector3;
-    set Position(p: Vector3);
     get Width(): number;
     get Height(): number;
     get Thickness(): number;

types/DatabaseServices/Entity/Line.d.ts

@@ -30,7 +30,7 @@ export declare class Line extends Curve {
     GetFistDeriv(param: number | Vector3): Vector3;
     IntersectWith2(curve: Curve, intType: IntersectOption, tolerance?: number): IntersectResult[];
     GetPointAtParam(param: number): Vector3;
-    GetParamAtPoint(pt: Vector3): number;
+    GetParamAtPoint(pt: Vector3, fuzz?: number): number;
     GetParamAtDist(d: number): number;
     GetPointAtDistance(distance: number): Vector3;
     GetDistAtParam(param: number): number;

types/DatabaseServices/Entity/Line.d.ts.map

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

types/DatabaseServices/Entity/Polyline.d.ts

@@ -122,7 +122,7 @@ export declare class Polyline extends Curve {
     static Combine(curves: Curve[], tolerance?: number): Polyline | undefined;
     /**首尾相连的曲线直接连接 */
     static FastCombine(curves: Curve[], tolerance?: number): Polyline | undefined;
-    PtOnCurve(pt: Vector3): boolean;
+    PtOnCurve(pt: Vector3, fuzz?: number): boolean;
     PtOnCurve3(p: Vector3, fuzz?: number): boolean;
     PtInCurve(pt: Vector3): boolean;
     GetClosestPointTo(pt: Vector3, extend: boolean): Vector3;
@@ -160,6 +160,7 @@ export declare class Polyline extends Curve {
     IntersectSelf(): number[];
     IsIntersectSelf(): boolean;
     get BoundingBox(): Box3Ext;
+    SetPtsBuls(pts: Vector2[], buls: number[]): this;
     /**
      * 得到曲线有用的点表和凸度(闭合曲线首尾重复)
      */

types/DatabaseServices/Entity/Polyline.d.ts.map

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

types/DatabaseServices/Lights/DirectionalLight.d.ts

@@ -22,6 +22,10 @@ export declare class DirectionalLight extends Light {
     SetRotate(thetaDeg: number, phiDeg: number): void;
     get Target(): Vector3;
     set Target(p: Vector3);
+    get SunPosition(): Vector3;
+    set SunPosition(p: Vector3);
+    get Position(): Vector3;
+    set Position(p: Vector3);
     get WebIntensity(): number;
     ApplyMatrix(m: Matrix4): this;
     GetGripPoints(): Array<Vector3>;

types/DatabaseServices/Lights/DirectionalLight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DirectionalLight.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Lights/DirectionalLight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoE,OAAO,EAAE,QAAQ,EAAW,OAAO,EAAE,MAAM,OAAO,CAAC;AAG9H,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC;;GAEG;AACH,qBACa,gBAAiB,SAAQ,KAAK;IAEvC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAM;IAEtB,gBAAgB,SAAU;IAE1B,oBAAoB,SAAK;IAErC,cAAc,UAAQ;IACtB,OAAO,CAAC,OAAO,CAAiB;IAChC,SAAS,CAAC,WAAW,UAAS;IAC9B,SAAS,CAAC,UAAU,UAAQ;;IAS5B,KAAK,CAAC,OAAO,GAAE,OAAc;IAK7B;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAc1C,IAAI,MAAM,IACI,OAAO,CADwB;IAC7C,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,EAQpB;IACD,IAAI,YAAY,WAKf;IAED,WAAW,CAAC,CAAC,EAAE,OAAO;IAOtB,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAO/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO;IAQhD,SAAS,CAAC,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAqBjF,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ;IAoB/C,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAYlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAU3B"}
+{"version":3,"file":"DirectionalLight.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Lights/DirectionalLight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoE,OAAO,EAAE,QAAQ,EAAW,OAAO,EAAE,MAAM,OAAO,CAAC;AAG9H,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC;;GAEG;AACH,qBACa,gBAAiB,SAAQ,KAAK;IAEvC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAM;IAEtB,gBAAgB,SAAU;IAE1B,oBAAoB,SAAK;IAErC,cAAc,UAAQ;IACtB,OAAO,CAAC,OAAO,CAAiB;IAChC,SAAS,CAAC,WAAW,UAAS;IAC9B,SAAS,CAAC,UAAU,UAAQ;;IAS5B,KAAK,CAAC,OAAO,GAAE,OAAc;IAK7B;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAc1C,IAAI,MAAM,IACI,OAAO,CADwB;IAC7C,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,EAQpB;IAED,IAAI,WAAW,IACI,OAAO,CADkB;IAC5C,IAAI,WAAW,CAAC,CAAC,EAAE,OAAO,EAYzB;IAED,IAAI,QAAQ,IACI,OAAO,CADkB;IACzC,IAAI,QAAQ,CAAC,CAAC,EAAE,OAAO,EAOtB;IAED,IAAI,YAAY,WAKf;IAED,WAAW,CAAC,CAAC,EAAE,OAAO;IAOtB,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAO/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO;IAQhD,SAAS,CAAC,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAqBjF,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ;IAoB/C,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAYlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAU3B"}

types/DatabaseServices/Room/Entity/Wall/RoomWallBase.d.ts

@@ -11,6 +11,8 @@ import { RoomBase } from "../RoomBase";
 import { RoomHolePolyline } from "./Hole/RoomHolePolyline";
 import { WallSnapMode } from "./WallSnapMode";
 export declare const CURVE_FACE_TYPE_KEY = "__CURVE_FACE_TYPE_KEY__";
+export declare const CURVE_DIR_TYPE_KEY = "__CURVE_DIR_TYPE_KEY__";
+export declare const CURVE_WALL_TYPE_KEY = "__CURVE_WALL_TYPE_KEY__";
 export declare enum WallFaceType {
     Inside = 0,
     Pillar = 1,

types/DatabaseServices/Room/Entity/Wall/RoomWallBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomWallBase.d.ts","sourceRoot":"","sources":["../../../../../../src/DatabaseServices/Room/Entity/Wall/RoomWallBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGtD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAGnE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,mBAAmB,4BAA4B,CAAC;AAE7D,oBAAY,YAAY;IAEpB,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;CACd;AAED,UAAU,QAAQ;IAEd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACf;AAED,8BACsB,YAAa,SAAQ,QAAQ;IAE/C,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAoB;IAErC,cAAc,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAM;IAC9D,KAAK,EAAE,QAAQ,EAAE,CAAM;IAEvB,IAAI,SAAS,IAAI,QAAQ,EAAE,CAG1B;IAED,SAAS,CAAC,UAAU,SAAO;IAC3B,SAAS,CAAC,OAAO,SAAQ;IAEzB,IAAI,MAAM,WAGT;IACD,IAAI,MAAM,CAAC,UAAU,QAAA,EAMpB;IAED,IAAI,SAAS,IACI,MAAM,CADoB;IAC3C,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM,EAMtB;IAID,IAAI,eAAe,IAAI,GAAG,GAAG,IAAI,CAAY;IAG7C,WAAW,CAAC,EAAE,EAAE,KAAK;IAGrB,UAAU,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IAC5B,SAAS,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1B,MAAM,EAAE,QAAQ,CAAC;IAEjB,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IA2BrD,QAAQ,CAAC,GAAG,EAAE,SAAS;IAkBhC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAwBlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAa3B;AAGD,MAAM,WAAW,YAAa,SAAQ,QAAQ,EAAE,KAAK;CAAI;AAEzD,eAAO,MAAM,gBAAgB,UAyC5B,CAAC;AAGF,wBAAgB,WAAW,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,WAAmB,QAQzF"}
+{"version":3,"file":"RoomWallBase.d.ts","sourceRoot":"","sources":["../../../../../../src/DatabaseServices/Room/Entity/Wall/RoomWallBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGtD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAGnE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,mBAAmB,4BAA4B,CAAC;AAC7D,eAAO,MAAM,kBAAkB,2BAA2B,CAAC;AAC3D,eAAO,MAAM,mBAAmB,4BAA4B,CAAC;AAE7D,oBAAY,YAAY;IAEpB,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;CACd;AAED,UAAU,QAAQ;IAEd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACf;AAED,8BACsB,YAAa,SAAQ,QAAQ;IAE/C,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAoB;IAErC,cAAc,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAM;IAC9D,KAAK,EAAE,QAAQ,EAAE,CAAM;IAEvB,IAAI,SAAS,IAAI,QAAQ,EAAE,CAG1B;IAED,SAAS,CAAC,UAAU,SAAO;IAC3B,SAAS,CAAC,OAAO,SAAQ;IAEzB,IAAI,MAAM,WAGT;IACD,IAAI,MAAM,CAAC,UAAU,QAAA,EAMpB;IAED,IAAI,SAAS,IACI,MAAM,CADoB;IAC3C,IAAI,SAAS,CAAC,CAAC,EAAE,MAAM,EAMtB;IAID,IAAI,eAAe,IAAI,GAAG,GAAG,IAAI,CAAY;IAG7C,WAAW,CAAC,EAAE,EAAE,KAAK;IAGrB,UAAU,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IAC5B,SAAS,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1B,MAAM,EAAE,QAAQ,CAAC;IAEjB,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IA2BrD,QAAQ,CAAC,GAAG,EAAE,SAAS;IAkBhC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAwBlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAa3B;AAGD,MAAM,WAAW,YAAa,SAAQ,QAAQ,EAAE,KAAK;CAAI;AAEzD,eAAO,MAAM,gBAAgB,UAyC5B,CAAC;AAGF,wBAAgB,WAAW,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,WAAmB,QAQzF"}

types/DatabaseServices/Room/ParseService/RoomRegionParse.d.ts

@@ -3,6 +3,12 @@ import { Polyline } from "../../Entity/Polyline";
 import { RoomRegion } from "../Entity/Region/RoomRegion";
 import { RoomWallBase } from "../Entity/Wall/RoomWallBase";
 import { RegionReplacement } from "./RegionReplacement";
+export declare const ROOM_REGION_CURVES_KEY = "__ROOM_REGION_CURVES_KEY__";
+export declare enum WallCurveDirType {
+    left = 0,
+    right = 1,
+    lid = 2
+}
 /**
  * 区域分析(房间+外墙+全屋顶)
  */

types/DatabaseServices/Room/ParseService/RoomRegionParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomRegionParse.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Room/ParseService/RoomRegionParse.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAuB,YAAY,EAAgB,MAAM,6BAA6B,CAAC;AAE9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAcxD;;GAEG;AACH,qBAAa,eAAe;IASZ,OAAO,CAAC,SAAS;IAP7B,EAAE,EAAE,iBAAiB,CAAC;IACtB,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACvB,OAAO,EAAE,UAAU,EAAE,CAAC;IAEtB;;OAEG;gBACiB,SAAS,EAAE,QAAQ;IAUvC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE;IAgMxB,GAAG;CAaN"}
+{"version":3,"file":"RoomRegionParse.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Room/ParseService/RoomRegionParse.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAgE,YAAY,EAAgB,MAAM,6BAA6B,CAAC;AAEvI,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAaxD,eAAO,MAAM,sBAAsB,+BAA+B,CAAC;AAInE,oBAAY,gBAAgB;IAExB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,GAAG,IAAI;CACV;AAGD;;GAEG;AACH,qBAAa,eAAe;IASZ,OAAO,CAAC,SAAS;IAP7B,EAAE,EAAE,iBAAiB,CAAC;IACtB,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACvB,OAAO,EAAE,UAAU,EAAE,CAAC;IAEtB;;OAEG;gBACiB,SAAS,EAAE,QAAQ;IAUvC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE;IAsNxB,GAAG;CAaN"}

types/DatabaseServices/Shape.d.ts

@@ -6,14 +6,13 @@ import { Curve } from './Entity/Curve';
 export declare class Shape {
     private _Outline;
     private _Holes;
-    private _Shape;
-    constructor(out?: Contour, hols?: Contour[]);
+    constructor(_Outline?: Contour, _Holes?: Contour[]);
     get Outline(): Contour;
     get Holes(): Contour[];
     get Area(): number;
     get BoundingBox(): import("../Geometry/Box").Box3Ext;
-    set Outline(cus: Contour);
-    set Holes(cus: Contour[]);
+    set Outline(con: Contour);
+    set Holes(holes: Contour[]);
     get Shape(): TShape;
     get Position(): Vector3;
     set Position(p: Vector3);
@@ -63,7 +62,6 @@ export declare class Shape {
      * @memberof Shape
      */
     private static removeBeContaineredHoles;
-    UpdateShape(): void;
     ReadFile(file: CADFiler): void;
     WriteFile(file: CADFiler): void;
 }

types/DatabaseServices/Shape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Shape.d.ts","sourceRoot":"","sources":["../../../src/DatabaseServices/Shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,OAAO,EAAQ,KAAK,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,qBAAa,KAAK;IAEd,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,MAAM,CAAwB;gBAC1B,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE;IAM3C,IAAI,OAAO,IAkBM,OAAO,CAfvB;IACD,IAAI,KAAK,IAmBM,OAAO,EAAE,CAhBvB;IACD,IAAI,IAAI,WAKP;IACD,IAAI,WAAW,sCAGd;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,OAAO,EAIvB;IACD,IAAI,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,EAIvB;IACD,IAAI,KAAK,WAIR;IACD,IAAI,QAAQ,IAII,OAAO,CADtB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,OAAO,EAMtB;IACD,EAAE;IAQF,iBAAiB;IAOjB,WAAW,CAAC,CAAC,EAAE,OAAO;IAMtB,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAelC,OAAO;IAaP,KAAK;IAOL,QAAQ,CAAC,KAAK,EAAE,MAAM;IAKtB,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IA8BZ,aAAa;IASb,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAuBrD,gBAAgB;IAShB,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAwBxD,yBAAyB,CAAC,WAAW,EAAE,KAAK,GAAG,KAAK,EAAE;IAWtD,kBAAkB,CAAC,WAAW,EAAE,KAAK,EAAE,cAAc,UAAQ,GAAG,KAAK,EAAE;IA0CvE;;;OAGG;IACH,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE;IAoD3C,KAAK,CAAC,WAAW,EAAE,KAAK;IAWxB,OAAO,CAAC,sBAAsB;IAW9B;;;;;;;;OAQG;IACH,OAAO,CAAC,2BAA2B;IA6BnC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE;IAsBvD;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,WAAW,UAAO,GAAG,OAAO,EAAE;IAgFrE;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAevC,WAAW;IAoBX,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAevB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAO3B"}
+{"version":3,"file":"Shape.d.ts","sourceRoot":"","sources":["../../../src/DatabaseServices/Shape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,OAAO,EAAQ,KAAK,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,qBAAa,KAAK;IAGV,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;gBADN,QAAQ,GAAE,OAAqB,EAC/B,MAAM,GAAE,OAAO,EAAO;IAKlC,IAAI,OAAO,IAkBM,OAAO,CAfvB;IACD,IAAI,KAAK,IAkBQ,OAAO,EAAE,CAfzB;IACD,IAAI,IAAI,WAKP;IACD,IAAI,WAAW,sCAGd;IACD,IAAI,OAAO,CAAC,GAAG,EAAE,OAAO,EAGvB;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAGzB;IAED,IAAI,KAAK,IAAI,MAAM,CAoBlB;IAED,IAAI,QAAQ,IAII,OAAO,CADtB;IACD,IAAI,QAAQ,CAAC,CAAC,EAAE,OAAO,EAMtB;IACD,EAAE;IAQF,iBAAiB;IAOjB,WAAW,CAAC,CAAC,EAAE,OAAO;IAMtB,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAelC,OAAO;IAaP,KAAK;IAOL,QAAQ,CAAC,KAAK,EAAE,MAAM;IAKtB,mBAAmB,CACf,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,EAAE;IA8BZ,aAAa;IASb,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAuBrD,gBAAgB;IAShB,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAwBxD,yBAAyB,CAAC,WAAW,EAAE,KAAK,GAAG,KAAK,EAAE;IAWtD,kBAAkB,CAAC,WAAW,EAAE,KAAK,EAAE,cAAc,UAAQ,GAAG,KAAK,EAAE;IA0CvE;;;OAGG;IACH,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE;IAoD3C,KAAK,CAAC,WAAW,EAAE,KAAK;IAWxB,OAAO,CAAC,sBAAsB;IAW9B;;;;;;;;OAQG;IACH,OAAO,CAAC,2BAA2B;IA6BnC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE;IAsBvD;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,WAAW,UAAO,GAAG,OAAO,EAAE;IAgFrE;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAgBvC,QAAQ,CAAC,IAAI,EAAE,QAAQ;IAevB,SAAS,CAAC,IAAI,EAAE,QAAQ;CAO3B"}

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

@@ -0,0 +1,19 @@
+import { CADFiler } from "../../CADFiler";
+import { Board } from "../../Entity/Board";
+import { HardwareCompositeEntity } from "../../Hardware/HardwareCompositeEntity";
+import { ObjectId } from "../../ObjectId";
+import { Positioning } from "./Positioning";
+/**
+ * 拉手的定位空间
+ */
+export declare class PositioningHandleSpace extends Positioning {
+    constructor(_ObjectId?: ObjectId<Board | HardwareCompositeEntity>);
+    ObjectId: ObjectId<Board | HardwareCompositeEntity>;
+    /**
+    * 定位
+    */
+    Positioning(): Promise<void>;
+    ReadFile(file: CADFiler): void;
+    WriteFile(file: CADFiler): void;
+}
+//# sourceMappingURL=PositioningHandleSpace.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PositioningHandleSpace.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/Positioning/PositioningHandleSpace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C;;GAEG;AACH,qBACa,sBAAuB,SAAQ,WAAW;gBAEvC,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,uBAAuB,CAAC;IAMrD,QAAQ,EAAE,QAAQ,CAAC,KAAK,GAAG,uBAAuB,CAAC,CAAC;IAChE;;MAEE;IACI,WAAW;IAmBjB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAM9B,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;CAOlC"}

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

@@ -1 +1 @@
-{"version":3,"file":"TemplateLeftRightBoardRecord.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateLeftRightBoardRecord.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,qBACa,4BAA6B,SAAQ,cAAc;;IAO5D,cAAc;cAmBK,aAAa;IAgChC,QAAQ,CAAC,IAAI,EAAE,QAAQ;CAwB1B"}
+{"version":3,"file":"TemplateLeftRightBoardRecord.d.ts","sourceRoot":"","sources":["../../../../../src/DatabaseServices/Template/ProgramTempate/TemplateLeftRightBoardRecord.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,qBACa,4BAA6B,SAAQ,cAAc;;IAO5D,cAAc;cAmBK,aAAa;IAmChC,QAAQ,CAAC,IAAI,EAAE,QAAQ;CAwB1B"}

types/DatabaseServices/Text/Text.d.ts

@@ -54,4 +54,5 @@ export declare class Text extends Entity {
     protected _ReadFile(file: CADFiler): void;
     WriteFile(file: CADFiler): void;
 }
+export declare const DbText: typeof Text;
 //# sourceMappingURL=Text.d.ts.map

types/DatabaseServices/Text/Text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Text/Text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,OAAO,EAAQ,QAAQ,EAAiB,OAAO,EAAE,MAAM,OAAO,CAAC;AAI7F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,oBAAY,UAAU;IAElB,OAAO,IAAI;IAAE,GAAG,IAAI;IAAE,QAAQ,IAAI;IAClC,OAAO,IAAI;IAAE,GAAG,IAAI;IAAE,QAAQ,IAAI;IAClC,QAAQ,KAAK;IAAE,IAAI,IAAI;IAAE,SAAS,KAAK;CAC1C;AAGD,wBAAgB,qBAAqB,SAKpC;AAED;;GAEG;AACH,qBACa,IAAK,SAAQ,MAAM;IAMxB,OAAO,CAAC,WAAW;IACZ,SAAS,EAAE,MAAM;IACxB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa;IAPzB,SAAS,CAAC,cAAc,UAAQ;IAEhC,OAAO,CAAC,MAAM,CAAmC;gBACrC,GAAG,CAAC,EAAE,OAAO,EACb,WAAW,GAAE,MAAW,EACzB,SAAS,GAAE,MAAiB,EAC3B,OAAO,GAAE,MAAW,EACpB,aAAa,GAAE,MAAU;IAOrC,IAAI,YAAY,IAII,MAAM,CADzB;IACD,IAAI,YAAY,CAAC,CAAC,EAAE,MAAM,EAOzB;IACD,IAAI,UAAU,IAIM,MAAM,CADzB;IACD,IAAI,UAAU,CAAC,GAAG,EAAE,MAAM,EAQzB;IAED,IAAI,UAAU,CAAC,EAAE,EAAE,UAAU,EAM5B;IACD,IAAI,UAAU,IAPK,UAAU,CAU5B;IAED,IAAI,MAAM,IAII,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAOnB;IAEK,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU;IAIjE,UAAU;IACV,IAAI,KAAK,WAYR;IAED,IAAI,cAAc,YAA8D;IAEhF,IAAI,WAAW,mCAOd;IAED,IAAI,gBAAgB,IAAI,OAAO,CAqB9B;IAED,eAAe;IAQf,OAAO,CAAC,qBAAqB;IAiC7B,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAM7B,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAW5C,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAqBvE,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAIhD,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ;IAU7D,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAI/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO;IAYhD,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC;IAIlC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAQxD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAWlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAW3B"}
+{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../../../../src/DatabaseServices/Text/Text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,OAAO,EAAQ,QAAQ,EAAiB,OAAO,EAAE,MAAM,OAAO,CAAC;AAI7F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,oBAAY,UAAU;IAElB,OAAO,IAAI;IAAE,GAAG,IAAI;IAAE,QAAQ,IAAI;IAClC,OAAO,IAAI;IAAE,GAAG,IAAI;IAAE,QAAQ,IAAI;IAClC,QAAQ,KAAK;IAAE,IAAI,IAAI;IAAE,SAAS,KAAK;CAC1C;AAGD,wBAAgB,qBAAqB,SAKpC;AAED;;GAEG;AACH,qBACa,IAAK,SAAQ,MAAM;IAMxB,OAAO,CAAC,WAAW;IACZ,SAAS,EAAE,MAAM;IACxB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa;IAPzB,SAAS,CAAC,cAAc,UAAQ;IAEhC,OAAO,CAAC,MAAM,CAAmC;gBACrC,GAAG,CAAC,EAAE,OAAO,EACb,WAAW,GAAE,MAAW,EACzB,SAAS,GAAE,MAAiB,EAC3B,OAAO,GAAE,MAAW,EACpB,aAAa,GAAE,MAAU;IAOrC,IAAI,YAAY,IAII,MAAM,CADzB;IACD,IAAI,YAAY,CAAC,CAAC,EAAE,MAAM,EAOzB;IACD,IAAI,UAAU,IAIM,MAAM,CADzB;IACD,IAAI,UAAU,CAAC,GAAG,EAAE,MAAM,EAQzB;IAED,IAAI,UAAU,CAAC,EAAE,EAAE,UAAU,EAM5B;IACD,IAAI,UAAU,IAPK,UAAU,CAU5B;IAED,IAAI,MAAM,IAII,MAAM,CADnB;IACD,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,EAOnB;IAEK,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU;IAIjE,UAAU;IACV,IAAI,KAAK,WAYR;IAED,IAAI,cAAc,YAA8D;IAEhF,IAAI,WAAW,mCAOd;IAED,IAAI,gBAAgB,IAAI,OAAO,CAqB9B;IAED,eAAe;IAQf,OAAO,CAAC,qBAAqB;IAiC7B,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAM7B,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI;IAW5C,cAAc,CAAC,UAAU,GAAE,UAAiC,GAAG,QAAQ;IAqBvE,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ;IAIhD,wBAAwB,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ;IAU7D,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC;IAI/B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO;IAYhD,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC;IAIlC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO;IAQxD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ;IAWlC,SAAS,CAAC,IAAI,EAAE,QAAQ;CAW3B;AAGD,eAAO,MAAM,MAAM,aAAO,CAAC"}

types/Editor/CommandRegister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandRegister.d.ts","sourceRoot":"","sources":["../../../src/Editor/CommandRegister.ts"],"names":[],"mappings":"AAyQA,wBAAgB,eAAe,SAggB9B;AAED,wBAAsB,YAAY,kBAIjC"}
+{"version":3,"file":"CommandRegister.d.ts","sourceRoot":"","sources":["../../../src/Editor/CommandRegister.ts"],"names":[],"mappings":"AA2QA,wBAAgB,eAAe,SAogB9B;AAED,wBAAsB,YAAY,kBAIjC"}

types/Editor/DbClick/DbClick.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DbClick.d.ts","sourceRoot":"","sources":["../../../../src/Editor/DbClick/DbClick.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AA6CnD,qBAAa,cAAe,SAAQ,SAAS;IAEzC,SAAS,sBAwPP;CACL"}
+{"version":3,"file":"DbClick.d.ts","sourceRoot":"","sources":["../../../../src/Editor/DbClick/DbClick.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AA6CnD,qBAAa,cAAe,SAAQ,SAAS;IAEzC,SAAS,sBA2PP;CACL"}

types/Editor/DefaultConfig.d.ts.map

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

types/GLSL/GoochShader.d.ts

@@ -29,5 +29,5 @@ export declare function GetGoochShader(): {
     vertexShader: any;
     fragmentShader: any;
 };
-export declare function GetGoodShaderSimple(color?: Vector3, side?: import("three").Side): ShaderMaterialParameters;
+export declare function GetGoodShaderSimple(color?: Vector3, side?: import("three").Side, logBuf?: boolean): ShaderMaterialParameters;
 //# sourceMappingURL=GoochShader.d.ts.map

types/GLSL/GoochShader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoochShader.d.ts","sourceRoot":"","sources":["../../../src/GLSL/GoochShader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,wBAAwB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGrE,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAe7B;AAED,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,OAAqB,EAAE,IAAI,uBAAY,GAAG,wBAAwB,CAY5G"}
+{"version":3,"file":"GoochShader.d.ts","sourceRoot":"","sources":["../../../src/GLSL/GoochShader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,wBAAwB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGrE,wBAAgB,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAe7B;AAED,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,OAAqB,EAAE,IAAI,uBAAY,EAAE,MAAM,UAAQ,GAAG,wBAAwB,CAY5H"}

types/Geometry/CreateWireframe.d.ts

@@ -2,8 +2,10 @@ import { BufferGeometry, Line, LineBasicMaterial, Matrix4, Object3D } from "thre
 import { ExtrudeHole } from "../DatabaseServices/3DSolid/ExtrudeHole";
 import { Board } from "../DatabaseServices/Entity/Board";
 import { ExtrudeSolid } from "../DatabaseServices/Entity/Extrude";
+import { Shape2 } from "../DatabaseServices/Shape2";
 export declare function CreateWireframe(en3D: Board | ExtrudeSolid): Object3D[];
 export declare function FastWireframe(br: ExtrudeSolid, color?: number, divCount?: number, optArc?: boolean): Line<BufferGeometry, LineBasicMaterial>[];
+export declare function FastExtrudeEdgeGeometryOfShape(shape: Shape2, z0: number, z1: number, divCount?: number, optArc?: boolean, coords?: number[]): number[];
 export declare function FastExtrudeEdgeGeometry(ext: ExtrudeSolid, color?: number, divCount?: number, optArc?: boolean, coords?: number[], inv?: Matrix4): number[];
 export declare function FastWireframe2(dr: ExtrudeHole, color?: number): Line<BufferGeometry, LineBasicMaterial>[];
 //# sourceMappingURL=CreateWireframe.d.ts.map

types/Geometry/CreateWireframe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateWireframe.d.ts","sourceRoot":"","sources":["../../../src/Geometry/CreateWireframe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAoC,IAAI,EAAE,iBAAiB,EAAgB,OAAO,EAAE,QAAQ,EAAW,MAAM,OAAO,CAAC;AAG5I,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAMlE,wBAAgB,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY,cAsEzD;AAaD,wBAAgB,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,SAAI,EAAE,QAAQ,SAAI,EAAE,MAAM,UAAO,GAAG,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,EAAE,CAkDjI;AAGD,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,SAAI,EAAE,QAAQ,SAAI,EAAE,MAAM,UAAO,EAAE,MAAM,GAAE,MAAM,EAAO,EAAE,GAAG,GAAE,OAAmB,YAmDjJ;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,SAAI,6CAoCxD"}
+{"version":3,"file":"CreateWireframe.d.ts","sourceRoot":"","sources":["../../../src/Geometry/CreateWireframe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAoC,IAAI,EAAE,iBAAiB,EAAgB,OAAO,EAAE,QAAQ,EAAW,MAAM,OAAO,CAAC;AAG5I,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAEtE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAKpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY,cAsEzD;AAaD,wBAAgB,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,SAAI,EAAE,QAAQ,SAAI,EAAE,MAAM,UAAO,GAAG,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,EAAE,CAkDjI;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,SAAI,EAAE,MAAM,UAAO,EAAE,MAAM,GAAE,MAAM,EAAO,YAqBvI;AAID,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,SAAI,EAAE,QAAQ,SAAI,EAAE,MAAM,UAAO,EAAE,MAAM,GAAE,MAAM,EAAO,EAAE,GAAG,GAAE,OAAmB,YAmDjJ;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,SAAI,6CAoCxD"}

types/Geometry/DrillParse/Face.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Face.d.ts","sourceRoot":"","sources":["../../../../src/Geometry/DrillParse/Face.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAI9D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,eAAe;IAE5B,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,KAAK,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,qBAAa,IAAI;IAEb,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,OAAO,CAAS;IACxB,UAAU,EAAE,KAAK,CAAC;IAClB,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,OAAO,CAAS;IAC7B,GAAG,EAAE,OAAO,CAAiB;IAC7B,MAAM,EAAE,OAAO,CAAQ;IACvB,SAAS,EAAE,MAAM,CAAC;gBACN,UAAU,CAAC,EAAE,eAAe;IAkBxC,IAAI,MAAM,WAKT;IACD,IAAI,MAAM,YAGT;IACD,IAAI,MAAM,YAGT;IACD,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE;IAiF1B,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,SAAO,EAAE,iBAAiB,GAAE,IAAI,EAAO,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC;KAAE;CAwHlH"}
+{"version":3,"file":"Face.d.ts","sourceRoot":"","sources":["../../../../src/Geometry/DrillParse/Face.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAI9D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,eAAe;IAE5B,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,KAAK,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,qBAAa,IAAI;IAEb,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,OAAO,CAAS;IACxB,UAAU,EAAE,KAAK,CAAC;IAClB,UAAU,EAAE,KAAK,CAAC;IAClB,WAAW,EAAE,OAAO,CAAS;IAC7B,GAAG,EAAE,OAAO,CAAiB;IAC7B,MAAM,EAAE,OAAO,CAAQ;IACvB,SAAS,EAAE,MAAM,CAAC;gBACN,UAAU,CAAC,EAAE,eAAe;IAkBxC,IAAI,MAAM,WAKT;IACD,IAAI,MAAM,YAGT;IACD,IAAI,MAAM,YAGT;IACD,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE;IAsF1B,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,SAAO,EAAE,iBAAiB,GAAE,IAAI,EAAO,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC;KAAE;CAwHlH"}

types/Geometry/SpaceParse/ClampSpaceParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClampSpaceParse.d.ts","sourceRoot":"","sources":["../../../../src/Geometry/SpaceParse/ClampSpaceParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAW,MAAM,OAAO,CAAC;AAGrC,OAAO,EAAE,mBAAmB,EAAgB,MAAM,2BAA2B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,WAAW;IAEtC,KAAK;IAiEX;;OAEG;IACH,IAAI,UAAU,WAGb;IACD,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAExB,gBAAgB;IAuChB,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAQnD,MAAM,CAAC,GAAG,EAAE,GAAG;IAIf,eAAe,yBAAgC;IACzC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAOjF;;;;;OAKG;IACG,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7E;;OAEG;YACW,mBAAmB;CAsCpC"}
+{"version":3,"file":"ClampSpaceParse.d.ts","sourceRoot":"","sources":["../../../../src/Geometry/SpaceParse/ClampSpaceParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAW,MAAM,OAAO,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAgB,MAAM,2BAA2B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAe5C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,WAAW;IAEtC,KAAK;IAiEX;;OAEG;IACH,IAAI,UAAU,WAGb;IACD,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAExB,gBAAgB;IAuChB,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAQnD,MAAM,CAAC,GAAG,EAAE,GAAG;IAIf,eAAe,yBAAgC;IACzC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAOjF;;;;;OAKG;IACG,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7E;;OAEG;YACW,mBAAmB;CA+CpC"}

types/GraphicsSystem/BoolOperateUtils.d.ts

@@ -8,6 +8,6 @@ export declare enum BoolOpeartionType {
     Union = 1,
     Subtract = 2
 }
-export declare function isTargetCurInOrOnSourceCur(sourceCur: Polyline | Circle | Ellipse, targetCur: Curve): boolean;
+export declare function isTargetCurInOrOnSourceCur(bigCurve: Polyline | Circle | Ellipse, smallCurve: Curve): boolean;
 export declare function IsPtsAllOutOrOnReg(sourceReg: Polyline | Circle, pts: Vector3[]): boolean;
 //# sourceMappingURL=BoolOperateUtils.d.ts.map

types/GraphicsSystem/BoolOperateUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoolOperateUtils.d.ts","sourceRoot":"","sources":["../../../src/GraphicsSystem/BoolOperateUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAG/D,oBAAY,iBAAiB;IAEzB,YAAY,IAAI;IAChB,KAAK,IAAI;IACT,QAAQ,IAAI;CACf;AAMD,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,EAAE,SAAS,EAAE,KAAK,WAkBlG;AA+BD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,WAO9E"}
+{"version":3,"file":"BoolOperateUtils.d.ts","sourceRoot":"","sources":["../../../src/GraphicsSystem/BoolOperateUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAG/D,oBAAY,iBAAiB;IAEzB,YAAY,IAAI;IAChB,KAAK,IAAI;IACT,QAAQ,IAAI;CACf;AAMD,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,EAAE,UAAU,EAAE,KAAK,WAkBlG;AA+BD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,WAO9E"}

types/GraphicsSystem/IntersectWith.d.ts

@@ -45,7 +45,7 @@ export declare function IntersectCircleAndCircle(cu1: Circle | Arc, cu2: Circle
  * @param {IntersectOption} extType 延伸选项
  * @returns 交点集合
  */
-export declare function IntersectCircleAndArc(circle: Circle, arc: Arc, extType: IntersectOption, tolerance?: number): any;
+export declare function IntersectCircleAndArc(circle: Circle, arc: Arc, extType: IntersectOption, tolerance?: number): IntersectResult[];
 /**
  * 计算圆弧与圆弧的交点
  *

types/GraphicsSystem/IntersectWith.d.ts.map

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

types/GraphicsSystem/ToolPath/FeedingToolPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FeedingToolPath.d.ts","sourceRoot":"","sources":["../../../../src/GraphicsSystem/ToolPath/FeedingToolPath.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAEzE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAG5E,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAarD;;GAEG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAE1C;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAkJnB,cAAc;IACd,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,UAAQ;IAmBpC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE;IAWpD,gBAAgB,CAAC,EAAE,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,mBAAmB,CAAC;KAAE,EAAE,QAAQ,EAAE,SAAS,GAAG,KAAK,EAAE;IA+C7G,OAAO,CAAC,aAAa;IA2BrB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAuCnB,aAAa,CAAC,EAAE,EAAE,KAAK;IAkBvB,eAAe,CAAC,EAAE,EAAE,KAAK;IAoBzB,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM;CAsHnF;AACD,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,KAAK;;kBAKT,WAAW;;;kBACP,WAAW;;EAwGzD"}
+{"version":3,"file":"FeedingToolPath.d.ts","sourceRoot":"","sources":["../../../../src/GraphicsSystem/ToolPath/FeedingToolPath.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAEzE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,KAAK,EAAE,MAAM,qCAAqC,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAG5E,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAarD;;GAEG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAE1C;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAuJnB,cAAc;IACd,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,UAAQ;IAmBpC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE;IAWpD,gBAAgB,CAAC,EAAE,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,mBAAmB,CAAC;KAAE,EAAE,QAAQ,EAAE,SAAS,GAAG,KAAK,EAAE;IA+C7G,OAAO,CAAC,aAAa;IA2BrB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAuCnB,aAAa,CAAC,EAAE,EAAE,KAAK;IAkBvB,eAAe,CAAC,EAAE,EAAE,KAAK;IAoBzB,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM;CAsHnF;AACD,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,KAAK;;kBAKT,WAAW;;;kBACP,WAAW;;EAwGzD"}

types/Production/Product.d.ts

@@ -143,7 +143,6 @@ export declare namespace Production {
     };
     function GetCabSize(brList: Board[]): Map<Board, Vector3>;
     function Data2Polyline(data: IContourData, isClose?: boolean): Polyline;
-    function Report(ens: Entity[], msg: string): void;
     function Get2DModeing(br: Board, offset: Vector3): I2DModeling[];
     function Get3DModeing(br: Board, offset: Vector3): I3DModeling[];
     function GetChaiDanFeedingPath(data: IChaiDanFeedingData): IContourData[];

types/Production/Product.d.ts.map

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

types/UI/Components/BBS/BBSCommon.d.ts

@@ -6,6 +6,7 @@ import { ObjectId } from '../../../DatabaseServices/ObjectId';
 import { ProcessingGroupRecord } from '../../../DatabaseServices/ProcessingGroup/ProcessingGroupRecord';
 import { LinesType } from '../../Store/BoardInterface';
 import { IBoardInfoOptions } from './BoardInfosList';
+import { BBSBoardData } from './LookOverBoardInfos';
 export interface SortBtnData {
     text: string;
     icon: IconName;
@@ -15,8 +16,8 @@ interface ITitleBannerProps {
     sortBtnData: SortBtnData[];
     style: any;
     handleOrder: Function;
-    AutoWidth: (title: [string, string]) => void;
     TitleResize: (e: React.PointerEvent<HTMLDivElement>, title: string) => void;
+    searchRes: BBSBoardData;
 }
 export declare class TitleBanner extends React.Component<ITitleBannerProps> {
     icon: IconName;
@@ -24,6 +25,7 @@ export declare class TitleBanner extends React.Component<ITitleBannerProps> {
     componentDidMount(): void;
     getBtnData: (data: string) => boolean;
     getWidthStyle: (title: string, index: number) => React.CSSProperties;
+    AutoWidth: (title: [string, string]) => void;
     render(): JSX.Element;
 }
 export declare enum PartsType {
@@ -94,10 +96,7 @@ export declare class BBSProcessGroupItem extends React.Component<IBBSProcessGrou
     private HandleAlertOnComfirm;
     private GetTemplatePgName;
 }
-interface IBBSRemarksComponentProps extends IBBSSealingComponentProps {
-    getCalcStyles: (key: string) => React.CSSProperties;
-}
-export declare class BBSRemarksComponent extends React.Component<IBBSRemarksComponentProps> {
+export declare class BBSRemarksComponent extends React.Component<IBBSSealingComponentProps> {
     render(): JSX.Element;
 }
 export {};

types/UI/Components/BBS/BBSCommon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BBSCommon.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/BBSCommon.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BBSCommon.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/BBSCommon.tsx"],"names":[],"mappings":"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"}

types/UI/Components/BBS/BoardInfosList.d.ts

@@ -14,7 +14,6 @@ export interface IBoardInfoListProps {
     processGroupData: Map<string, ObjectId[]>;
     style: React.CSSProperties;
     isSelect: boolean;
-    getCalcStyles: (key: string) => React.CSSProperties;
 }
 declare type GetBBSBoardInfoType<T> = {
     [P in (keyof T)]?: P extends EBoardKeyList.ProcessGroup ? ProcessingGroupRecord[] : T[P];

types/UI/Components/BBS/BoardInfosList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardInfosList.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/BoardInfosList.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAK7D,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iEAAiE,CAAC;AAGxG,OAAO,EAAE,kBAAkB,EAAa,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAMtF,MAAM,WAAW,mBAAmB;IAEhC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,qBAAqB,EAAE,KAAK,IAAI,CAAC;IACjI,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAC,aAAa,CAAC;CACvD;AAED,aAAK,mBAAmB,CAAC,CAAC,IAAI;KACzB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,CAAC,YAAY,GAAG,qBAAqB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CAC3F,CAAC;AAEF,MAAM,WAAW,iBAAkB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAE9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,qBACa,aAAc,SAAQ,KAAK,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE,CAAC;IAEvE,KAAK,EAAE,cAAc,CAAC;IACV,UAAU,EAAE,OAAO,CAAS;IACxC,OAAO,CAAC,WAAW,CAAkB;IACzB,OAAO,CAAC,MAAM,CAAoB;gBAClC,KAAK,KAAA;IAKjB,iBAAiB;IAUjB,oBAAoB;IAMpB,gCAAgC,CAAC,SAAS,EAAE,mBAAmB;IAK/D,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,UAAQ;IAgB5C,OAAO,CAAC,WAAW;IAcZ,MAAM;IA6Ib,SAAS,UAAW,KAAK,UAwEvB;IACF,aAAa,2BAA4B,MAAM,UAK7C;IACF,UAAU,eASR;IACF,aAAa,aAIX;CACL"}
+{"version":3,"file":"BoardInfosList.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/BoardInfosList.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAK7D,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iEAAiE,CAAC;AAGxG,OAAO,EAAE,kBAAkB,EAAa,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAMtF,MAAM,WAAW,mBAAmB;IAEhC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,qBAAqB,EAAE,KAAK,IAAI,CAAC;IACjI,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,aAAK,mBAAmB,CAAC,CAAC,IAAI;KACzB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,CAAC,YAAY,GAAG,qBAAqB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CAC3F,CAAC;AAEF,MAAM,WAAW,iBAAkB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAE9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,qBACa,aAAc,SAAQ,KAAK,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE,CAAC;IAEvE,KAAK,EAAE,cAAc,CAAC;IACV,UAAU,EAAE,OAAO,CAAS;IACxC,OAAO,CAAC,WAAW,CAAkB;IACzB,OAAO,CAAC,MAAM,CAAoB;gBAClC,KAAK,KAAA;IAKjB,iBAAiB;IAUjB,oBAAoB;IAMpB,gCAAgC,CAAC,SAAS,EAAE,mBAAmB;IAK/D,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,UAAQ;IAgB5C,OAAO,CAAC,WAAW;IAcZ,MAAM;IAkJb,SAAS,UAAW,KAAK,UAwEvB;IACF,aAAa,2BAA4B,MAAM,UAK7C;IACF,UAAU,eASR;IACF,aAAa,aAIX;CACL"}

types/UI/Components/BBS/BoardLIst.d.ts

@@ -5,15 +5,12 @@ import { ProcessingGroupRecord } from '../../../DatabaseServices/ProcessingGroup
 import { LinesType } from '../../Store/BoardInterface';
 import { SortBtnData } from './BBSCommon';
 import { IBoardInfoOptions } from './BoardInfosList';
-interface BoardData {
-    dataBr: Board[];
-    realBr: Board[];
-}
+import { BBSBoardData } from './LookOverBoardInfos';
 interface IBoardListProps {
     height: number;
     width: number;
     dragDivH: number;
-    searchRes: BoardData;
+    searchRes: BBSBoardData;
     selectedBrOnList: Board[];
     UpdateDisplayData: (dataSource?: Board[]) => void;
     isCtrlDown: boolean;
@@ -21,9 +18,7 @@ interface IBoardListProps {
     modifyBoardData: Map<Board, IBoardInfoOptions>;
     UpdateSeletctedBr: (index: number, findSameTypeBrDataKey?: string) => void;
     ModifyBoard: (br: Board, opts: IBoardInfoOptions) => void;
-    AutoWidth: (title: [string, string]) => void;
     TitleResize: (e: React.PointerEvent<HTMLDivElement>, title: string) => void;
-    getCalcStyles: (key: string) => React.CSSProperties;
 }
 export declare class BoardList extends React.Component<IBoardListProps> {
     sortBtnData: SortBtnData[];

types/UI/Components/BBS/BoardLIst.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardLIst.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/BoardLIst.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iEAAiE,CAAC;AAExG,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAe,MAAM,aAAa,CAAC;AACvD,OAAO,EAAiB,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEpE,UAAU,SAAS;IAEf,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,MAAM,EAAE,KAAK,EAAE,CAAC;CACnB;AAED,UAAU,eAAe;IAErB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,iBAAiB,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC;IAClD,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzC,eAAe,EAAE,GAAG,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IAC/C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3E,WAAW,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC1D,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC7C,WAAW,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5E,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,CAAC,aAAa,CAAC;CACvD;AAED,qBACa,SAAU,SAAQ,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC;IAG/C,WAAW,EAAE,WAAW,EAAE,CAUpC;IACF,OAAO,CAAC,OAAO,CAAS;IACxB,MAAM;IA0DN,QAAQ,MAAO,MAAM,GAAG,MAAM,KAAK,MAAM,GAAG,MAAM,OAAO,OAAO,YAM9D;IAEF,UAAU,YAAa,MAAM,UAoD3B;IAEF,aAAa,UAAW,MAAM,UAAU,KAAK,aAAa,MAAM,SAAS,MAAM,GAAG,SAAS,GAAG,qBAAqB,EAAE,UA4BnH;IACF,OAAO,CAAC,YAAY,CAelB;CACL"}
+{"version":3,"file":"BoardLIst.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/BoardLIst.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iEAAiE,CAAC;AAExG,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAe,MAAM,aAAa,CAAC;AACvD,OAAO,EAAiB,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,UAAU,eAAe;IAErB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,YAAY,CAAC;IACxB,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAC1B,iBAAiB,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC;IAClD,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzC,eAAe,EAAE,GAAG,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IAC/C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3E,WAAW,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC1D,WAAW,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/E;AAED,qBACa,SAAU,SAAQ,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC;IAG/C,WAAW,EAAE,WAAW,EAAE,CAUpC;IACF,OAAO,CAAC,OAAO,CAAS;IACxB,MAAM;IAyDN,QAAQ,MAAO,MAAM,GAAG,MAAM,KAAK,MAAM,GAAG,MAAM,OAAO,OAAO,YAM9D;IAEF,UAAU,YAAa,MAAM,UAoD3B;IAEF,aAAa,UAAW,MAAM,UAAU,KAAK,aAAa,MAAM,SAAS,MAAM,GAAG,SAAS,GAAG,qBAAqB,EAAE,UA4BnH;IACF,OAAO,CAAC,YAAY,CAelB;CACL"}

types/UI/Components/BBS/LookOverBoardInfos.d.ts

@@ -5,7 +5,7 @@ import { ObjectId } from "../../../DatabaseServices/ObjectId";
 import { IHardwareType } from "../../../Production/Product";
 import { EFindType } from "../../Store/BoardFindInterface";
 import { IBoardInfoOptions } from "./BoardInfosList";
-interface BoardData {
+export interface BBSBoardData {
     dataBr: Board[];
     realBr: Board[];
 }
@@ -24,12 +24,12 @@ export declare const ListItemSelectEventEmitter: ListItemSelectEvent;
  */
 export declare class LookOverBoardInfosModal extends React.Component<LookOverBoardInfosModalProps, LookOverBoardInfosModalState> {
     dragDivH: number;
-    dataList: BoardData;
+    dataList: BBSBoardData;
     drillCount: ICountType[];
     hardwareCount: ICountType[];
     areaCount: ICountType<Board>[];
     sealCount: ICountType[];
-    searchRes: BoardData;
+    searchRes: BBSBoardData;
     searchingStr: string;
     private boardDataInArray;
     private removeFuncs;
@@ -65,9 +65,6 @@ export declare class LookOverBoardInfosModal extends React.Component<LookOverBoa
     private FilterBr;
     ModifyBoard: (br: Board, opts: IBoardInfoOptions) => void;
     TitleResize: (e: React.PointerEvent<HTMLDivElement>, title: string) => void;
-    AutoWidth: (title: [string, string]) => void;
-    SetTitleWidthMap: (title: string, value: number) => void;
-    getCalcStyles: (key: string) => React.CSSProperties;
     Modify(): void;
     CalcArea: () => string;
     HandleExportCSV: () => void;

types/UI/Components/BBS/LookOverBoardInfos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LookOverBoardInfos.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/LookOverBoardInfos.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"LookOverBoardInfos.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/BBS/LookOverBoardInfos.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAE,UAAU,EAA0B,MAAM,2DAA2D,CAAC;AAa/G,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAI/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAS9D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAS3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,MAAM,WAAW,YAAY;IAEzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,MAAM,EAAE,KAAK,EAAE,CAAC;CACnB;AACD,UAAU,4BAA4B;IAElC,SAAS,EAAE,CAAC,KAAK,GAAG,aAAa,CAAC,EAAE,CAAC;CACxC;AAGD,cAAM,mBAAmB;IAGrB,qBAAqB;CAIxB;AACD,UAAU,4BAA4B;IAElC,QAAQ,EAAE,MAAM,CAAC;CACpB;AACD,eAAO,MAAM,0BAA0B,qBAA0B,CAAC;AAMlE;;GAEG;AACH,qBACa,uBAAwB,SAAQ,KAAK,CAAC,SAAS,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;IAEpH,QAAQ,EAAE,MAAM,CAAa;IAE7B,QAAQ,EAAE,YAAY,CAA8B;IAExC,UAAU,EAAE,UAAU,EAAE,CAAM;IAC9B,aAAa,EAAE,UAAU,EAAE,CAAM;IACjC,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,CAAM;IACpC,SAAS,EAAE,UAAU,EAAE,CAAM;IAE7B,SAAS,EAAE,YAAY,CAAiB;IAExC,YAAY,SAAM;IAE9B,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,WAAW,CAAkB;IAErC,eAAe,EAAE,GAAG,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAa;IAE/C,gBAAgB,EAAE,KAAK,EAAE,CAAM;IAE/B,qBAAqB,EAAE,MAAM,CAAC;IAE9B,UAAU,EAAE,OAAO,CAAS;IACxC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAa;IAErD,SAAS,kCAAqC;gBAElC,CAAC,KAAA;IAOb,yBAAyB;IAMzB,iBAAiB,gBAAiB,KAAK,EAAE,UAMvC;IAEF,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,GAAG,aAAa,CAAC,EAAE;IAShD,IAAI,SAAS,IAAI,KAAK,EAAE,CAGvB;IACD,sBAAsB;IA+DtB,SAAS,aAIP;IAGF,iBAAiB;IAsFjB,oBAAoB;IAOd,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,SAAS,CAAC;KAAE;IAkCrD,2BAA2B,aAqIzB;IAEF,sBAAsB,OAAQ,KAAK,cAkCjC;IAKF,UAAU,aAsBR;IAEF,SAAS,MAAO,MAAM,aAAa,MAAM,EAAE,aAUzC;IAEF,cAAc,QAAS,MAAM,cAY3B;IAKF,eAAe,aAKb;IACF,YAAY,aAGV;IAGF,OAAO,CAAC,WAAW,CAKjB;IAEF,kBAAkB,cAAe,KAAK,EAAE,UAUtC;IAEF,iBAAiB,WAAkB,MAAM,0BAA0B,MAAM,oCA2BtE;IAEH,OAAO,CAAC,gBAAgB,CAUtB;IAEF,OAAO,CAAC,QAAQ,CAwFd;IACF,WAAW,OAAQ,KAAK,QAAQ,iBAAiB,UAwE/C;IAEF,WAAW,MAAO,kBAAkB,CAAC,cAAc,CAAC,SAAS,MAAM,UAyCjE;IAGF,MAAM;IAWN,QAAQ,eAMN;IAEF,eAAe,aAkDb;IAKF,MAAM;CAiIT"}

types/UI/Components/Board/BoardCommon.d.ts

@@ -115,6 +115,7 @@ interface IDrillTypeSelect {
 export declare class DrillTypeSelectCom extends React.Component<IDrillTypeSelect, {
     isDanger: boolean;
 }> {
+    _InvalidDrillBoardList: Board[];
     constructor(props: any);
     get Options(): string[];
     private editorDrilling;

types/UI/Components/Board/BoardCommon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardCommon.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/Board/BoardCommon.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BoardCommon.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/Board/BoardCommon.tsx"],"names":[],"mappings":"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"}

types/UI/Components/Board/BoardFindModify.d.ts

@@ -2,12 +2,14 @@ import * as React from 'react';
 import { BoardFindStore } from '../../Store/BoardFindModifyStore';
 interface IBoardFindState {
     userInputName: string;
+    hardwareInput: string;
 }
 export default class BoardFindModifyModal extends React.Component<{
     store?: BoardFindStore;
 }, IBoardFindState> {
     private event;
     _brNameList: [string, boolean][];
+    _hardwareNameList: [string, boolean][];
     private showShops;
     constructor(props: any);
     componentDidMount(): void;
@@ -17,7 +19,9 @@ export default class BoardFindModifyModal extends React.Component<{
     private handleSelectAllDrillOrSeal;
     private handleIsSelectAll;
     private getBoardOption;
+    private getHardWareOption;
     private handleApplyBrName;
+    private handleApplyBrHardWare;
     private handleSelectGoods;
     render(): JSX.Element;
 }

types/UI/Components/Board/BoardFindModify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardFindModify.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/Board/BoardFindModify.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAUlE,UAAU,eAAe;IAErB,aAAa,EAAE,MAAM,CAAC;CACzB;AAID,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,KAAK,CAAC,SAAS,CAAC;IAAE,KAAK,CAAC,EAAE,cAAc,CAAC;CAAE,EAAE,eAAe,CAAC;IAC3G,OAAO,CAAC,KAAK,CAAW;IACZ,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAG1C;IACF,OAAO,CAAC,SAAS,CAAyB;gBAC9B,KAAK,KAAA;IAOjB,iBAAiB;IAYjB,oBAAoB;IAQpB,OAAO,CAAC,eAAe,CAUrB;IACF,OAAO,CAAC,mBAAmB,CAUzB;IACF,OAAO,CAAC,0BAA0B,CAchC;IACF,OAAO,CAAC,iBAAiB,CAGvB;YACY,cAAc;IAQ5B,OAAO,CAAC,iBAAiB,CAYvB;IACF,OAAO,CAAC,iBAAiB,CAOvB;IACF,MAAM;CAiZT"}
+{"version":3,"file":"BoardFindModify.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/Board/BoardFindModify.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAUlE,UAAU,eAAe;IAErB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACzB;AAID,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,KAAK,CAAC,SAAS,CAAC;IAAE,KAAK,CAAC,EAAE,cAAc,CAAC;CAAE,EAAE,eAAe,CAAC;IAC3G,OAAO,CAAC,KAAK,CAAW;IACZ,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAG1C;IACU,iBAAiB,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAEhD;IACF,OAAO,CAAC,SAAS,CAAyB;gBAC9B,KAAK,KAAA;IAQjB,iBAAiB;IAYjB,oBAAoB;IAQpB,OAAO,CAAC,eAAe,CAUrB;IACF,OAAO,CAAC,mBAAmB,CAUzB;IACF,OAAO,CAAC,0BAA0B,CAchC;IACF,OAAO,CAAC,iBAAiB,CAGvB;YACY,cAAc;YAQd,iBAAiB;IAQ/B,OAAO,CAAC,iBAAiB,CAYvB;IACF,OAAO,CAAC,qBAAqB,CAY3B;IACF,OAAO,CAAC,iBAAiB,CAOvB;IACF,MAAM;CA4eT"}

types/UI/Components/Board/BoardModalType.d.ts

@@ -1,3 +1,7 @@
+/**
+ * 实际上这里存储了所有界面配置的Key
+ * UserConfigKey
+ */
 export declare enum BoardModalType {
     LR = "lr",
     TB = "tb",
@@ -49,6 +53,7 @@ export declare enum BoardModalType {
     KJLImportConfig = "KJLMaterialMap",
     BBSEditor = "BBSEditor",
     BatchCurtail = "curtail",
-    BatchModifyPanel = "BatchModifyPanel"
+    BatchModifyPanel = "BatchModifyPanel",
+    Sealing = "Sealing"
 }
 //# sourceMappingURL=BoardModalType.d.ts.map

types/UI/Components/Board/BoardModalType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardModalType.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/Board/BoardModalType.ts"],"names":[],"mappings":"AACA,oBAAY,cAAc;IAEtB,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,UAAU;IACZ,IAAI,WAAW;IACf,EAAE,OAAO;IACT,GAAG,YAAY;IACf,OAAO,mBAAmB;IAC1B,oBAAoB,yBAAyB;IAC7C,EAAE,WAAW;IACb,KAAK,aAAa;IAClB,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,eAAe,oBAAoB;IACnC,EAAE,WAAW;IACb,IAAI,SAAS;IACb,GAAG,cAAc;IACjB,GAAG,eAAe;IAClB,IAAI,SAAS;IACb,EAAE,eAAe;IACjB,WAAW,gBAAgB;IAC3B,UAAU,eAAe;IACzB,qBAAqB,0BAA0B;IAC/C,qBAAqB,0BAA0B;IAC/C,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,mBAAmB,wBAAwB;IAC3C,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,eAAe,oBAAoB;IACnC,gBAAgB,qBAAqB;IACrC,eAAe,mBAAmB;IAClC,SAAS,cAAc;IACvB,YAAY,YAAY;IACxB,gBAAgB,qBAAqB;CACxC"}
+{"version":3,"file":"BoardModalType.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/Board/BoardModalType.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,oBAAY,cAAc;IAEtB,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,UAAU;IACZ,IAAI,WAAW;IACf,EAAE,OAAO;IACT,GAAG,YAAY;IACf,OAAO,mBAAmB;IAC1B,oBAAoB,yBAAyB;IAC7C,EAAE,WAAW;IACb,KAAK,aAAa;IAClB,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,eAAe,oBAAoB;IACnC,EAAE,WAAW;IACb,IAAI,SAAS;IACb,GAAG,cAAc;IACjB,GAAG,eAAe;IAClB,IAAI,SAAS;IACb,EAAE,eAAe;IACjB,WAAW,gBAAgB;IAC3B,UAAU,eAAe;IACzB,qBAAqB,0BAA0B;IAC/C,qBAAqB,0BAA0B;IAC/C,WAAW,gBAAgB;IAC3B,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,mBAAmB,wBAAwB;IAC3C,eAAe,oBAAoB;IACnC,UAAU,eAAe;IACzB,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,eAAe,oBAAoB;IACnC,gBAAgB,qBAAqB;IACrC,eAAe,mBAAmB;IAClC,SAAS,cAAc;IACvB,YAAY,YAAY;IACxB,gBAAgB,qBAAqB;IACrC,OAAO,YAAY;CACtB"}

types/UI/Components/Board/InvalidDrillBoardModal.d.ts

@@ -0,0 +1,14 @@
+import React from "react";
+import { Board } from "../../../DatabaseServices/Entity/Board";
+interface BoardProps {
+    invalidDrillBoardList: Board[];
+    invalidDrillList: string[];
+}
+export declare class InvalidDrillBoardModal extends React.Component<BoardProps, {}> {
+    _DrillOption: string[];
+    _SelectOption: Map<string, string>;
+    componentWillMount(): void;
+    render(): JSX.Element;
+}
+export {};
+//# sourceMappingURL=InvalidDrillBoardModal.d.ts.map

types/UI/Components/Board/InvalidDrillBoardModal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"InvalidDrillBoardModal.d.ts","sourceRoot":"","sources":["../../../../../src/UI/Components/Board/InvalidDrillBoardModal.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAO/D,UAAU,UAAU;IAEhB,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC/B,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,qBACa,sBAAuB,SAAQ,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC;IAEvE,YAAY,EAAE,MAAM,EAAE,CAA6C;IACnE,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE/C,kBAAkB;IAMlB,MAAM;CA2FT"}