build-dxf 0.1.60 → 0.1.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.60",
+  "version": "0.1.61",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -5143,8 +5143,8 @@ class LineGroupType {
    * @param type 
    * @returns 
    */
-  static set(line, id, type) {
-    if (this.hasId(line, id) || this.hasType(line, type)) return;
+  static set(line, id, type, repeat = false) {
+    if (this.hasId(line, id) || !repeat && this.hasType(line, type)) return;
     if (typeof line.userData.groupId === "undefined") {
       line.userData.groupId = id;
       line.userData.groupType = type;
@@ -5162,14 +5162,27 @@ class LineGroupType {
     if (line.userData.groupType == type) return line.userData.groupId;
     return line.userData?.groups?.find((item) => item.type === type)?.id;
   }
+  /** 通过类型获取所有id
+   * @param line 
+   * @param type 
+   * @returns 
+   */
+  static getIdsByType(line, type) {
+    const ids = [];
+    if (line.userData.groupType == type) ids.push(line.userData.groupId);
+    line.userData?.groups?.forEach((group2) => {
+      group2.type === type && ids.push(group2.id);
+    });
+    return ids;
+  }
   /** 通过类型获取所有组
    * @param lines 
    * @param type 
    */
   static getGroupsByType(lines, type) {
     return lines.reduce((map, line) => {
-      const id = LineGroupType.getIdByType(line, type);
-      if (id) map.append(id, line);
+      const ids = LineGroupType.getIdsByType(line, type);
+      if (ids) ids.forEach((id) => map.append(id, line));
       return map;
     }, new ArrayMap()).valueArray;
   }
@@ -5328,7 +5341,7 @@ class LineGroupType {
     }
     const groups = line.userData?.groups;
     if (groups) {
-      for (let i = 0; i < groups.length; i++) {
+      for (let i = groups.length - 1; i >= 0; i--) {
         const element = groups[i];
         if (element.type === type) {
           groups.splice(i, 1);
@@ -6105,6 +6118,212 @@ function getWinDrawData(doubleWallGroup, wall, lines = []) {
   });
   return windows;
 }
+function createGeometry(points, options) {
+  points = points.map((p2) => p2 instanceof Point ? new THREE.Vector2(p2.x, p2.y) : p2);
+  const shape = new THREE.Shape(points);
+  const extrudeGeometry = new THREE.ExtrudeGeometry(shape, {
+    bevelEnabled: false,
+    ...options
+  });
+  return extrudeGeometry;
+}
+class ExtrudeMesh extends THREE.Mesh {
+  geometry;
+  options;
+  constructor(points, options, material) {
+    const geometry = createGeometry(points, options);
+    super(geometry, material);
+    this.geometry = geometry;
+    this.options = options;
+  }
+  setPoints(points, options = this.options) {
+    const geometry = createGeometry(points, options);
+    this.geometry = geometry;
+  }
+}
+class BayWindowHelper {
+  /** 获取绘制数据
+   * @param lines 
+   * @returns 
+   */
+  static getDrawData(lines) {
+    lines = LineSegmentUndirectedGraph.breakpointMerging(lines.map((line) => line.clone()), mergeLineUserData);
+    if (lines.length === 4) {
+      let bayWindowLine = null;
+      let windowLine = null;
+      let deptLine = null;
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.userData.isBayWindow) bayWindowLine = line;
+        else if (line.userData.isWindow && line.userData.drawWindow) windowLine = line;
+        else deptLine = line;
+      }
+      if (bayWindowLine && windowLine && deptLine) {
+        const { width, height, groundClearance } = windowLine.userData.drawWindow[0];
+        const direction = Point.zero();
+        if (deptLine.sameEndpointAsEnd(bayWindowLine)) {
+          deptLine.start.direction(deptLine.end, direction);
+        } else {
+          deptLine.end.direction(deptLine.start, direction);
+        }
+        return {
+          height1: bayWindowLine.userData.topClearance ?? 0,
+          height2: height,
+          height3: groundClearance,
+          depth: deptLine.length(),
+          windowWidth: width,
+          windowHeight: height,
+          bayWindowLine,
+          windowLine,
+          deptLine,
+          direction
+        };
+      }
+    }
+    return null;
+  }
+  /** 获取绘制数据
+   * @param lines 
+   * @returns 
+   */
+  static getDrawData2(lines) {
+    lines = LineSegmentUndirectedGraph.breakpointMerging(lines.map((line) => line.clone()), mergeLineUserData);
+    let bayWindowLine = null;
+    let windowLine = null;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      if (line.userData.isBayWindow) bayWindowLine = line;
+      else if (line.userData.isWindow && line.userData.drawWindow) windowLine = line;
+    }
+    if (bayWindowLine && windowLine) {
+      const { width, height, groundClearance } = windowLine.userData.drawWindow[0];
+      const direction = Point.zero();
+      return {
+        height1: bayWindowLine.userData.topClearance ?? 0,
+        height2: height,
+        height3: groundClearance,
+        windowWidth: width,
+        windowHeight: height,
+        direction
+      };
+    }
+    return null;
+  }
+  /** 获取所有绘制数据
+   * @param lineSegments 
+   * @returns 
+   */
+  static getDrawDataAll(lineSegments) {
+    const groups = LineGroupType.getGroupsByType(lineSegments, "bayWindow");
+    const drawDataList = groups.map(this.getDrawData);
+    return groups.map((group2, indxe) => ({
+      group: group2,
+      drawData: drawDataList[indxe]
+    })).filter((item) => item.drawData);
+  }
+  /** 绘制数据转模型
+   * @param drawData 
+   * @returns 
+   */
+  static drawDataToModel(drawData) {
+    const pos = drawData.bayWindowLine.center, dirct = drawData.bayWindowLine.direction(), length = drawData.bayWindowLine.length(), bayWindowLine = Point.zero().expandAsLine(dirct, length).directionMove(dirct.multiplyScalar(-1), length * 0.5), winGroup = new THREE.Group(), material = new THREE.MeshBasicMaterial({ color: 16777215 });
+    winGroup.position.set(pos.x, pos.y, 0);
+    const rectangle = bayWindowLine.expandToRectangle(DEFAULT_WALL_WIDTH), extrudeMesh = new ExtrudeMesh(rectangle.points, { depth: drawData.height3 }, material);
+    winGroup.add(extrudeMesh);
+    const rectangle2 = bayWindowLine.clone().directionMove(drawData.direction, drawData.depth).expandToRectangle(DEFAULT_WALL_WIDTH), extrudeMesh2 = new ExtrudeMesh(rectangle2.points, { depth: drawData.height2 }, new THREE.MeshPhongMaterial({ color: 16777215, transparent: true, opacity: 0.2 }));
+    extrudeMesh2.position.z = drawData.height3;
+    winGroup.add(extrudeMesh2);
+    const rectangle3 = bayWindowLine.start.expandAsLine(drawData.direction, drawData.depth).directionMove(drawData.direction, -0.06).expandToRectangle(DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh3 = new ExtrudeMesh(rectangle3.points, { depth: drawData.height2 }, material);
+    extrudeMesh3.position.z = drawData.height3;
+    winGroup.add(extrudeMesh3);
+    const rectangle4 = bayWindowLine.end.expandAsLine(drawData.direction, drawData.depth).directionMove(drawData.direction, -0.06).expandToRectangle(DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh4 = new ExtrudeMesh(rectangle4.points, { depth: drawData.height2 }, material);
+    extrudeMesh4.position.z = drawData.height3;
+    winGroup.add(extrudeMesh4);
+    const extrudeMesh5 = new ExtrudeMesh(rectangle.points, { depth: drawData.height1 }, material);
+    extrudeMesh5.position.z = drawData.height3 + drawData.height2;
+    winGroup.add(extrudeMesh5);
+    const rectangle6 = bayWindowLine.clone().directionMove(drawData.direction, drawData.depth * 0.5).expandToRectangle(drawData.depth - DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh6 = new ExtrudeMesh(rectangle6.points, { depth: 1e-3 }, material);
+    extrudeMesh6.position.z = drawData.height3;
+    winGroup.add(extrudeMesh6);
+    const extrudeMesh7 = new ExtrudeMesh(rectangle6.points, { depth: 1e-3 }, material);
+    extrudeMesh7.position.z = drawData.height3 + drawData.height2;
+    winGroup.add(extrudeMesh7);
+    return winGroup;
+  }
+}
+class WallGroupManager {
+  [Symbol.iterator]() {
+    return this.groups[Symbol.iterator]();
+  }
+  groups = [];
+  add(group2) {
+    this.groups.push(group2);
+  }
+  forEach(fun) {
+    for (let i = 0; i < this.groups.length; i++) {
+      fun(this.groups[i], i);
+    }
+  }
+  map(fun) {
+    const list = [];
+    for (let i = 0; i < this.groups.length; i++) {
+      list.push(fun(this.groups[i], i));
+    }
+    return list;
+  }
+  /** 查找符合条件的组
+   * @param fun 
+   * @returns 
+   */
+  findGroup(fun) {
+    for (let i = 0; i < this.groups.length; i++) {
+      const group2 = this.groups[i];
+      if (fun(group2)) return group2;
+    }
+  }
+  /** 查找所有符合条件的组
+   * @param fun 
+   * @returns 
+   */
+  findGroups(fun) {
+    const list = [];
+    for (let i = 0; i < this.groups.length; i++) {
+      const group2 = this.groups[i];
+      if (fun(group2)) list.push(group2);
+    }
+    return list;
+  }
+  static fromByLines(lineSegments) {
+    const wallGroupManager = new WallGroupManager();
+    const removeLines = [];
+    BayWindowHelper.getDrawDataAll(lineSegments).forEach(({ group: group2, drawData }) => {
+      wallGroupManager.add({
+        type: "bayWindow",
+        lines: group2,
+        data: drawData
+      });
+      removeLines.push(...group2);
+    });
+    const doors = lineSegments.filter((line) => line.userData.isDoor);
+    wallGroupManager.add({ type: "door", lines: doors });
+    removeLines.push(...doors);
+    const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall");
+    doubleWalls.forEach((doubleWall) => {
+      wallGroupManager.add({ type: "doubleWall", lines: doubleWall });
+      removeLines.push(...doubleWall);
+    });
+    const set2 = new Set(removeLines), walls = [], windowLines = [], balconyRailingLines = [];
+    lineSegments.filter((line) => !set2.has(line)).forEach((line) => {
+      if (line.userData.isWindow) windowLines.push(line);
+      else if (line.userData.isBalconyRailing) balconyRailingLines.push(line);
+      else walls.push(line);
+    });
+    walls.length && wallGroupManager.add({ type: "wall", lines: walls });
+    windowLines.length && wallGroupManager.add({ type: "window", lines: windowLines });
+    balconyRailingLines.length && wallGroupManager.add({ type: "balconyRailing", lines: balconyRailingLines });
+    return wallGroupManager;
+  }
+}
 class Group {
   type = "";
   userData = { color: "#fff" };
@@ -6210,7 +6429,14 @@ class CAD {
   /** 添加组并执行偏移
    * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
    */
-  addGroupAndOffset(lines, joinType = "jtMiter", endType = "etOpenButt", scale2 = 1e5) {
+  addGroupAndOffset(lines, option) {
+    const {
+      offsetHalfWidth = DEFAULT_WALL_WIDTH * 0.5,
+      joinType = "jtMiter",
+      endType = "etOpenButt",
+      groupName = "groupOffset",
+      scale: scale2 = 1e5
+    } = option ?? {};
     const groups = LineSegment.groupByPoint(lines);
     const polygons = groups.flatMap((group2) => Polygon.multipleFromByLines(group2));
     const offset2 = new ClipperLib.ClipperOffset(2, 0.25);
@@ -6224,13 +6450,13 @@ class CAD {
         ClipperLib.EndType[endType]
       );
     }
-    offset2.Execute(solutions, DEFAULT_WALL_WIDTH / 2 * scale2);
+    offset2.Execute(solutions, offsetHalfWidth * scale2);
     solutions = solutions.map((solution) => solution.map((p2) => Point.from(p2).multiplyScalar(1 / scale2)));
     solutions.forEach((solution) => {
       const polygon2 = new Polygon(solution);
       const lines2 = LineSegment.brokenLineMerging(polygon2.toLines(true), mergeLineUserData);
       Point.adsorb(lines2.flatMap((line) => line.points));
-      this.addGroup(lines2, "groupOffset", { polygon: polygon2 });
+      this.addGroup(lines2, groupName, { polygon: polygon2 });
     });
     this.needUpdate = true;
     return this;
@@ -6717,6 +6943,15 @@ class DxfDrawPlugin {
         });
       }
     });
+    cad.addDrawHandler({
+      type: ["balconyRailing"],
+      handler({ group: group2, setColor, drawLine }) {
+        group2.lines.forEach((line) => {
+          setColor("green");
+          drawLine(line.start, line.end);
+        });
+      }
+    });
   }
 }
 class DxfDataPlugin {
@@ -6728,17 +6963,9 @@ class DxfDataPlugin {
    * @param cad 
    */
   static initData(cad, lines) {
-    const lineSegments = lines, doubleWall = [], wall = [], doors = [], bayWindows = [];
-    for (let i = 0; i < lineSegments.length; i++) {
-      const line = lineSegments[i];
-      if (line.userData.isDoor) doors.push(line);
-      else if (line.userData.isBayWindow) bayWindows.push(line);
-      else if (LineGroupType.hasType(line, "doubleWall")) doubleWall.push(line);
-      else wall.push(line);
-    }
-    const doubleWallGroup = LineGroupType.getGroupsByType(doubleWall, "doubleWall"), windows = getWinDrawData(doubleWallGroup, wall, lineSegments);
-    const quadtree = createQuadtree([...wall, ...doubleWall]);
-    doors.forEach((line) => {
+    const wallGroupManager = WallGroupManager.fromByLines(lines), doubleWallGroups = wallGroupManager.findGroups((group2) => group2.type === "doubleWall"), balconyRailingGroups = wallGroupManager.findGroups((group2) => group2.type === "balconyRailing"), doorGroups = wallGroupManager.findGroups((group2) => group2.type === "door"), jointGroups = wallGroupManager.findGroups((group2) => group2.type === "wall" || group2.type === "bayWindow" || group2.type === "window"), doubleWalls = doubleWallGroups.map((group2) => group2.lines), jointLines = jointGroups.map((group2) => group2.lines).flat(2), { bayWindowLines, wallLines } = jointLines.reduce((opt, line) => (line.userData.isBayWindow ? opt.bayWindowLines.push(line) : opt.wallLines.push(line), opt), { bayWindowLines: [], wallLines: [] }), doorLines = doorGroups.map((group2) => group2.lines).flat(2), balconyRailingLines = balconyRailingGroups.map((group2) => group2.lines).flat(2), windowLines = getWinDrawData(doubleWalls, wallLines, lines);
+    const quadtree = createQuadtree([...wallLines, ...doubleWalls.flat(2)]);
+    [...doorLines, ...balconyRailingLines].forEach((line) => {
       const startList = quadtree.queryPoint(line.start).filter((item) => item.line !== line && item.line.vertical(line, 35)), endList = quadtree.queryPoint(line.end).filter((item) => item.line !== line && item.line.vertical(line, 35)), direct = line.direction();
       if (startList.length && !startList.some((item) => LineGroupType.hasType(item.line, "doubleWall"))) {
         line.start.add(direct.clone().multiplyScalar(DEFAULT_WALL_WIDTH * 0.5));
@@ -6747,12 +6974,27 @@ class DxfDataPlugin {
         line.end.add(direct.clone().multiplyScalar(-DEFAULT_WALL_WIDTH * 0.5));
       }
     });
-    cad.addGroupAndOffset(wall);
-    cad.addGroups(doubleWallGroup, "doubleWall");
+    cad.addGroupAndOffset(wallLines);
+    cad.addGroups(doubleWalls, "doubleWall");
     cad.unionGroupAll();
-    cad.addGroup(doors, "door");
-    cad.addGroup(windows, "window");
-    cad.addGroup(bayWindows, "bayWindow");
+    const offsetWidth = 0.05;
+    cad.addGroupAndOffset(balconyRailingLines, {
+      offsetHalfWidth: offsetWidth * 0.5,
+      groupName: "balconyRailing"
+    });
+    cad.addGroup(
+      balconyRailingLines.flatMap((line) => {
+        const dirct = line.normal(), removeDirct = line.direction(), length = line.length(), newLine = line.start.expandAsLine(dirct, offsetWidth).directionMove(dirct.multiplyScalar(-1), offsetWidth * 0.5), distance2 = length / 4, count = Math.floor(length / distance2), lines2 = [];
+        for (let i = 1; i <= count; i++) {
+          lines2.push(newLine.clone().directionMove(removeDirct, i * distance2));
+        }
+        return lines2;
+      }),
+      "balconyRailing"
+    );
+    cad.addGroup(doorLines, "door");
+    cad.addGroup(windowLines, "window");
+    cad.addGroup(bayWindowLines, "bayWindow");
   }
   install(cad) {
     DxfDataPlugin.initData(cad, this.lines);
@@ -7014,11 +7256,12 @@ function buildBayWindowGroup(lines, clear = true) {
   const bayWindowLines = lines.filter((line) => line.userData.isBayWindow), groupedLineSet = /* @__PURE__ */ new Set();
   const removeSet = findDiscretePointLine2(lines, null, true);
   const lines_ = lines.filter((line) => !removeSet.has(line));
+  lines.forEach((line) => LineGroupType.removeByType(line, "bayWindow"));
   bayWindowLines.forEach((bayWindowLine) => {
     let { circles } = maxiCircles.miniCircle(lines_, { circleEdges: [bayWindowLine] });
     circles = circles.filter((group2) => group2.some((line) => line.userData.isWindow && LineGroupType.hasType(line, "bayWindow")));
     if (circles.length === 0 && bayWindowLine.userData?.outSize) {
-      const direct = Point.from(bayWindowLine.userData.outSize.direction), point2 = bayWindowLine.center.add(direct.multiplyScalar(1e-8));
+      const direct = Point.from(bayWindowLine.userData.outSize.direction), point2 = bayWindowLine.center.add(direct.multiplyScalar(1e-8)), bwCenter = bayWindowLine.center;
       circles.push([bayWindowLine]);
       const paths = bayWindowLine.points.map((p2) => {
         const path = /* @__PURE__ */ new Set();
@@ -7030,7 +7273,9 @@ function buildBayWindowGroup(lines, clear = true) {
           exitPoint: p2,
           grid: lines
         });
-        return [...path];
+        return [...path].filter((line) => {
+          return line.center.direction(bwCenter).dot(direct) > 1e-9;
+        });
       }).filter((path) => path.length);
       circles[0].push(...paths.flat(2));
       if (paths.length === 2) {
@@ -7063,7 +7308,7 @@ function buildBayWindowGroup(lines, clear = true) {
       const group2 = circles[0];
       group2.forEach((line) => {
         clear && LineGroupType.clear(line);
-        if (!LineGroupType.replace(line, id, "bayWindow")) LineGroupType.set(line, id, "bayWindow");
+        LineGroupType.set(line, id, "bayWindow", true);
         groupedLineSet.add(line);
       });
     } else clear && LineGroupType.clear(bayWindowLine);
@@ -7925,158 +8170,6 @@ class BoundExt {
     };
   }
 }
-function createGeometry(points, options) {
-  points = points.map((p2) => p2 instanceof Point ? new THREE.Vector2(p2.x, p2.y) : p2);
-  const shape = new THREE.Shape(points);
-  const extrudeGeometry = new THREE.ExtrudeGeometry(shape, {
-    bevelEnabled: false,
-    ...options
-  });
-  return extrudeGeometry;
-}
-class ExtrudeMesh extends THREE.Mesh {
-  geometry;
-  options;
-  constructor(points, options, material) {
-    const geometry = createGeometry(points, options);
-    super(geometry, material);
-    this.geometry = geometry;
-    this.options = options;
-  }
-  setPoints(points, options = this.options) {
-    const geometry = createGeometry(points, options);
-    this.geometry = geometry;
-  }
-}
-class BayWindowHelper {
-  /** 获取绘制数据
-   * @param lines 
-   * @returns 
-   */
-  static getDrawData(lines) {
-    lines = LineSegmentUndirectedGraph.breakpointMerging(lines.map((line) => line.clone()), mergeLineUserData);
-    if (lines.length === 4) {
-      let bayWindowLine = null;
-      let windowLine = null;
-      let deptLine = null;
-      for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        if (line.userData.isBayWindow) bayWindowLine = line;
-        else if (line.userData.isWindow && line.userData.drawWindow) windowLine = line;
-        else deptLine = line;
-      }
-      if (bayWindowLine && windowLine && deptLine) {
-        const { width, height, groundClearance } = windowLine.userData.drawWindow[0];
-        const direction = Point.zero();
-        if (deptLine.sameEndpointAsEnd(bayWindowLine)) {
-          deptLine.start.direction(deptLine.end, direction);
-        } else {
-          deptLine.end.direction(deptLine.start, direction);
-        }
-        return {
-          height1: bayWindowLine.userData.topClearance ?? 0,
-          height2: height,
-          height3: groundClearance,
-          depth: deptLine.length(),
-          windowWidth: width,
-          windowHeight: height,
-          bayWindowLine,
-          windowLine,
-          deptLine,
-          direction
-        };
-      }
-    }
-    return null;
-  }
-  /** 获取所有绘制数据
-   * @param lineSegments 
-   * @returns 
-   */
-  static getDrawDataAll(lineSegments) {
-    const groups = LineGroupType.getGroupsByType(lineSegments, "bayWindow");
-    const drawDataList = groups.map(this.getDrawData);
-    return groups.map((group2, indxe) => ({
-      group: group2,
-      drawData: drawDataList[indxe]
-    })).filter((item) => item.drawData);
-  }
-  /** 绘制数据转模型
-   * @param drawData 
-   * @returns 
-   */
-  static drawDataToModel(drawData) {
-    const pos = drawData.bayWindowLine.center, dirct = drawData.bayWindowLine.direction(), length = drawData.bayWindowLine.length(), bayWindowLine = Point.zero().expandAsLine(dirct, length).directionMove(dirct.multiplyScalar(-1), length * 0.5), winGroup = new THREE.Group(), material = new THREE.MeshBasicMaterial({ color: 16777215 });
-    winGroup.position.set(pos.x, pos.y, 0);
-    const rectangle = bayWindowLine.expandToRectangle(DEFAULT_WALL_WIDTH), extrudeMesh = new ExtrudeMesh(rectangle.points, { depth: drawData.height3 }, material);
-    winGroup.add(extrudeMesh);
-    const rectangle2 = bayWindowLine.clone().directionMove(drawData.direction, drawData.depth).expandToRectangle(DEFAULT_WALL_WIDTH), extrudeMesh2 = new ExtrudeMesh(rectangle2.points, { depth: drawData.height2 }, new THREE.MeshPhongMaterial({ color: 16777215, transparent: true, opacity: 0.2 }));
-    extrudeMesh2.position.z = drawData.height3;
-    winGroup.add(extrudeMesh2);
-    const rectangle3 = bayWindowLine.start.expandAsLine(drawData.direction, drawData.depth).directionMove(drawData.direction, -0.06).expandToRectangle(DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh3 = new ExtrudeMesh(rectangle3.points, { depth: drawData.height2 }, material);
-    extrudeMesh3.position.z = drawData.height3;
-    winGroup.add(extrudeMesh3);
-    const rectangle4 = bayWindowLine.end.expandAsLine(drawData.direction, drawData.depth).directionMove(drawData.direction, -0.06).expandToRectangle(DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh4 = new ExtrudeMesh(rectangle4.points, { depth: drawData.height2 }, material);
-    extrudeMesh4.position.z = drawData.height3;
-    winGroup.add(extrudeMesh4);
-    const extrudeMesh5 = new ExtrudeMesh(rectangle.points, { depth: drawData.height1 }, material);
-    extrudeMesh5.position.z = drawData.height3 + drawData.height2;
-    winGroup.add(extrudeMesh5);
-    const rectangle6 = bayWindowLine.clone().directionMove(drawData.direction, drawData.depth * 0.5).expandToRectangle(drawData.depth - DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh6 = new ExtrudeMesh(rectangle6.points, { depth: 1e-3 }, material);
-    extrudeMesh6.position.z = drawData.height3;
-    winGroup.add(extrudeMesh6);
-    const extrudeMesh7 = new ExtrudeMesh(rectangle6.points, { depth: 1e-3 }, material);
-    extrudeMesh7.position.z = drawData.height3 + drawData.height2;
-    winGroup.add(extrudeMesh7);
-    return winGroup;
-  }
-}
-class WallGroupManager {
-  [Symbol.iterator]() {
-    return this.groups[Symbol.iterator]();
-  }
-  groups = [];
-  add(group2) {
-    this.groups.push(group2);
-  }
-  static fromByLines(lineSegments) {
-    const wallGroupManager = new WallGroupManager();
-    const removeLines = [];
-    BayWindowHelper.getDrawDataAll(lineSegments).forEach(({ group: group2, drawData }) => {
-      wallGroupManager.add({
-        type: "bayWindow",
-        lines: group2,
-        data: drawData
-      });
-      removeLines.push(...group2);
-    });
-    const doors = lineSegments.filter((line) => line.userData.isDoor);
-    wallGroupManager.add({ type: "door", lines: doors });
-    removeLines.push(...doors);
-    const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall");
-    doubleWalls.forEach((doubleWall) => {
-      wallGroupManager.add({ type: "doubleWall", lines: doubleWall });
-      removeLines.push(...doubleWall);
-    });
-    const set2 = new Set(removeLines);
-    const walls = lineSegments.filter((line) => !set2.has(line));
-    wallGroupManager.add({ type: "wall", lines: walls.filter((line) => !line.userData.isWindow) });
-    wallGroupManager.add({ type: "window", lines: walls.filter((line) => line.userData.isWindow) });
-    return wallGroupManager;
-  }
-  forEach(fun) {
-    for (let i = 0; i < this.groups.length; i++) {
-      fun(this.groups[i], i);
-    }
-  }
-  map(fun) {
-    const list = [];
-    for (let i = 0; i < this.groups.length; i++) {
-      list.push(fun(this.groups[i], i));
-    }
-    return list;
-  }
-}
 class HandlerFlow {
   handlerMap = new ArrayMap();
   addHandler(handler) {
@@ -8099,6 +8192,7 @@ class ThreeVJiaJson extends HandlerFlow {
     this.addHandler({ type: "wall", handle: this.wallHandle.bind(this) });
     this.addHandler({ type: "door", handle: this.doorHandle.bind(this) });
     this.addHandler({ type: "window", handle: this.windowHandle.bind(this) });
+    this.addHandler({ type: "balconyRailing", handle: this.balconyRailing.bind(this) });
   }
   /** 双线墙处理
    * @param param0 
@@ -8186,12 +8280,23 @@ class ThreeVJiaJson extends HandlerFlow {
         height3: data?.height3,
         depth: data?.depth,
         windowWidth: data?.windowWidth,
-        windowHeight: data?.windowHeight
+        windowHeight: data?.windowHeight,
         // direction: data?.direction.toJson2D(),
+        pictures: [
+          "https://image.cnyang.cn/pano/PJ1772163638nmb/image/1527725175900.jpg",
+          "https://image.cnyang.cn/pano/PJ1772163638nmb/image/1527725221900.jpg"
+        ]
       });
     }
     return [];
   }
+  /** 阳台护栏
+   * @param param0 
+   * @returns 
+   */
+  balconyRailing({ lines }) {
+    return lines;
+  }
   /** 装换
    * @returns 
    */
@@ -17924,7 +18029,7 @@ class ThreeVJia extends Component {
   updateData() {
     if (!this.neededUpdate) return;
     const angleCorrectionDxf = this.parent?.findComponentByName("CorrectionDxf");
-    this.cacheJson = lineDataToThreeVJiaJson(angleCorrectionDxf.getLineSegments(), angleCorrectionDxf.angle).toJson();
+    this.cacheJson = lineDataToThreeVJiaJson(angleCorrectionDxf.getLineSegments(), 0).toJson();
     this.neededUpdate = false;
   }
   /** 转为json

package/src/utils/DxfSystem/utils/BayWindowHelper.d.ts

@@ -14,12 +14,25 @@ export interface IDrawBayWindowData {
     deptLine: LineSegment;
     direction: Point;
 }
+export interface IDrawBayWindowData2 {
+    height1: number;
+    height2: number;
+    height3: number;
+    windowWidth: number;
+    windowHeight: number;
+    direction: Point;
+}
 export declare class BayWindowHelper {
     /** 获取绘制数据
      * @param lines
      * @returns
      */
     static getDrawData(lines: LineSegment<LineUserData>[]): IDrawBayWindowData | null;
+    /** 获取绘制数据
+     * @param lines
+     * @returns
+     */
+    static getDrawData2(lines: LineSegment<LineUserData>[]): IDrawBayWindowData2 | null;
     /** 获取所有绘制数据
      * @param lineSegments
      * @returns

package/src/utils/DxfSystem/utils/CAD.d.ts

@@ -65,7 +65,13 @@ export declare class CAD {
     /** 添加组并执行偏移
      * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
      */
-    addGroupAndOffset(lines: LineSegmentType[], joinType?: JoinType, endType?: EndType, scale?: number): this;
+    addGroupAndOffset(lines: LineSegmentType[], option?: {
+        offsetHalfWidth?: number;
+        joinType?: JoinType;
+        endType?: EndType;
+        groupName?: string;
+        scale?: number;
+    }): this;
     /**
      * 合并所有组
      */

package/src/utils/DxfSystem/utils/LineGroupType.d.ts

@@ -17,13 +17,19 @@ export declare class LineGroupType {
      * @param type
      * @returns
      */
-    static set(line: LineSegment<LineUserData>, id: string, type: string): void;
+    static set(line: LineSegment<LineUserData>, id: string, type: string, repeat?: boolean): void;
     /** 通过类型获取id
      * @param line
      * @param type
      * @returns
      */
     static getIdByType(line: LineSegment<LineUserData>, type: string): string | undefined;
+    /** 通过类型获取所有id
+     * @param line
+     * @param type
+     * @returns
+     */
+    static getIdsByType(line: LineSegment<LineUserData>, type: string): string[];
     /** 通过类型获取所有组
      * @param lines
      * @param type

package/src/utils/DxfSystem/utils/WallGroupManager.d.ts

@@ -9,7 +9,17 @@ export declare class WallGroupManager {
     [Symbol.iterator](): ArrayIterator<IGroup<any>>;
     private groups;
     add(group: IGroup): void;
-    static fromByLines(lineSegments: LineSegment[]): WallGroupManager;
     forEach(fun: (group: IGroup, index: number) => void): void;
     map<T = any>(fun: (group: IGroup, index: number) => T): T[];
+    /** 查找符合条件的组
+     * @param fun
+     * @returns
+     */
+    findGroup(fun: (group: IGroup) => boolean): IGroup<any> | undefined;
+    /** 查找所有符合条件的组
+     * @param fun
+     * @returns
+     */
+    findGroups(fun: (group: IGroup) => boolean): IGroup<any>[];
+    static fromByLines(lineSegments: LineSegment[]): WallGroupManager;
 }

package/src/utils/DxfSystem/utils/lineDataToThreeVJiaJson.d.ts

@@ -22,6 +22,7 @@ type Hole = {
     depth?: number;
     windowWidth?: number;
     windowHeight?: number;
+    pictures?: string[];
 };
 type Wall = {
     ID: number;
@@ -76,6 +77,11 @@ export declare class ThreeVJiaJson extends HandlerFlow<ThreeVJiaJsonObject> {
      * @returns
      */
     bayWindowHandle({ lines, data }: IGroup<IDrawBayWindowData>, option?: ThreeVJiaJsonObject): never[];
+    /** 阳台护栏
+     * @param param0
+     * @returns
+     */
+    balconyRailing({ lines }: IGroup<IDrawBayWindowData>): LineSegment<LineUserData>[];
     /** 装换
      * @returns
      */