build-dxf 0.1.8 → 0.1.9

package/src/build.js

@@ -1558,7 +1558,8 @@ class LineSegment {
     const [q1, q2] = this.points;
     const dir = new Point(q2.x - q1.x, q2.y - q1.y);
     if (dir.x === 0 && dir.y === 0) {
-      throw new Error("投影目标线段的两个点不能重合");
+      console.error("投影目标线段的两个点不能重合");
+      return new LineSegment();
     }
     const projectPoint = (point) => {
       const pq = new Point(point.x - q1.x, point.y - q1.y);
@@ -3079,7 +3080,7 @@ class LineGroupType {
     return false;
   }
   /**
-   * 获取所有线段的交集类型（所有线段都包含的类型）
+   * 通过类型移除
    * @param line 
    * @param id 
    * @returns 
@@ -3935,6 +3936,10 @@ function buildDoubleWallGroup(lines, doorLines = [], grouped = true, clearIntern
   let { newLines, rings } = findLargestCircle(lines), ringsSet = new Set(rings.flat());
   if (grouped) {
     const grid = new PointVirtualGrid(), internalEdges = /* @__PURE__ */ new Set();
+    lines.forEach((line) => {
+      LineGroupType.removeByType(line, "doubleWall");
+      LineGroupType.removeByType(line, "wall");
+    });
     newLines.forEach((line) => !ringsSet.has(line) && grid.insert(line.center, line));
     doorLines.forEach((line) => grid.insert(line.center, line));
     const id = uuid();
@@ -3944,15 +3949,13 @@ function buildDoubleWallGroup(lines, doorLines = [], grouped = true, clearIntern
     rings.forEach((group2) => {
       const id2 = uuid();
       group2.forEach((line) => {
-        if (!LineGroupType.replace(line, id2, "doubleWall")) LineGroupType.set(line, id2, "doubleWall");
-        LineGroupType.removeByType(line, "wall");
+        LineGroupType.set(line, id2, "doubleWall");
       });
       clearInternalLine && grid.queryPolygon(Polygon.fromByLines(group2)).forEach((res) => internalEdges.add(res.userData));
     });
     newLines.forEach((line) => {
       if (ringsSet.has(line) || LineGroupType.hasType(line, "bayWindow")) return;
       LineGroupType.set(line, "default", "wall");
-      LineGroupType.removeByType(line, "doubleWall");
     });
     newLines = newLines.filter((line) => !internalEdges.has(line));
     const newDoorLines = doorLines.filter((line) => !internalEdges.has(line));
@@ -4854,7 +4857,7 @@ class Group {
   }
 }
 const defaultWallWidth = 0.12;
-const units$1 = {
+const units = {
   Unitless: 1,
   // 无单位，1米 = 1（无单位）
   Inches: 39.37007874015748,
@@ -5091,7 +5094,7 @@ class CAD {
   toDrawData(unit = "Millimeters") {
     if (!this.needUpdate && this._cachedDrawData) return this._cachedDrawData;
     this.needUpdate = false;
-    const lines = this.groups.flatMap((group2) => group2.lines), s = units$1[unit], expansionWidth = 2, box = Box2.fromByLineSegment(...lines).expansion(expansionWidth), center = box.center, data = {
+    const lines = this.groups.flatMap((group2) => group2.lines), s = units[unit], expansionWidth = 2, box = Box2.fromByLineSegment(...lines).expansion(expansionWidth), center = box.center, data = {
       unit,
       lines: [],
       arcs: [],
@@ -5653,7 +5656,7 @@ class BoundExt {
     };
   }
 }
-const PRE_PROCESSOR = {
+const PRE_PROCESSOR$1 = {
   DoorsAnalysis(lines) {
     return lines;
   },
@@ -5704,7 +5707,7 @@ const PRE_PROCESSOR = {
 };
 class CorrectionDxf extends Component {
   static name = "CorrectionDxf";
-  static PRE_PROCESSOR = PRE_PROCESSOR;
+  static PRE_PROCESSOR = PRE_PROCESSOR$1;
   width = 0.04;
   originalData = [];
   data = [];
@@ -5735,8 +5738,8 @@ class CorrectionDxf extends Component {
     return this;
   }
   onAddFromParent(parent) {
-    parent.Dxf.addEventListener("lineOffset", () => {
-      this.trajectory && this.addPreProcessor(PRE_PROCESSOR.BoundExt);
+    parent.Dxf.addEventListener("cadChange", () => {
+      this.trajectory && this.addPreProcessor(PRE_PROCESSOR$1.BoundExt);
       const lines = parent.Dxf.getLineSegments(true);
       this.set(lineDataToOriginalData(lines, parent.Dxf.originalZAverage), {
         trajectory: this.trajectory ?? void 0
@@ -5829,6 +5832,11 @@ class CorrectionDxf extends Component {
       originalData: this.originalData,
       data: this.data
     });
+    let lines = this.getLineSegments(true);
+    const doors = lines.filter((line) => line.userData.isDoor);
+    lines = lines.filter((line) => !line.userData.isDoor);
+    lines = buildDoubleWallGroup(lines, doors);
+    lines.push(...doors);
     this.cad = new CAD().usePlugin(new DxfDataPlugin(this.getLineSegments(true))).usePlugin(new DxfDrawPlugin());
     const { angle, referenceLine } = CAD.obliquity(this.cad);
     this.cad.rotateAndResetOrigin(angle);
@@ -5910,457 +5918,407 @@ function closedPathArea(points) {
   }
   return Math.abs(area) / 2;
 }
-const units = {
-  Unitless: 1,
-  // 无单位，1米 = 1（无单位）
-  Inches: 39.37007874015748,
-  // 英寸，1米 = 39.37007874015748英寸
-  Feet: 3.280839895013123,
-  // 英尺，1米 = 3.280839895013123英尺
-  Miles: 6213711922373339e-19,
-  // 英里，1米 = 0.0006213711922373339英里
-  Millimeters: 1e3,
-  // 毫米，1米 = 1000毫米
-  Centimeters: 100,
-  // 厘米，1米 = 100厘米
-  Meters: 1,
-  // 米，1米 = 1米
-  Kilometers: 1e-3,
-  // 千米，1米 = 0.001千米
-  Microinches: 3937007874015748e-8,
-  // 微英寸，1米 = 39370078.74015748微英寸
-  Mils: 39370.07874015748,
-  // 密耳，1米 = 39370.07874015748密耳
-  Yards: 1.0936132983377078,
-  // 码，1米 = 1.0936132983377078码
-  Angstroms: 1e10,
-  // 埃，1米 = 10^10埃
-  Nanometers: 1e9,
-  // 纳米，1米 = 10^9纳米
-  Microns: 1e6,
-  // 微米，1米 = 10^6微米
-  Decimeters: 10,
-  // 分米，1米 = 10分米
-  Decameters: 0.1,
-  // 十米，1米 = 0.1十米
-  Hectometers: 0.01,
-  // 百米，1米 = 0.01百米
-  Gigameters: 1e-9,
-  // 吉米，1米 = 10^-9吉米
-  "Astronomical units": 6684587122268445e-27,
-  // 天文单位，1米 = 0.000000000006684587122268445天文单位
-  "Light years": 10570008340246154e-32,
-  // 光年，1米 ≈ 0.00000000000000010570008340246154光年
-  Parsecs: 3240779289666404e-32
-  // 秒差距，1米 ≈ 0.00000000000000003240779289666404秒差距
-};
-function pathToLines(path) {
-  const lineSegments = [];
-  for (let i = 0; i < path.length; i++) {
-    lineSegments.push(new LineSegment(
-      path[i].clone(),
-      path[(i + 1) % path.length].clone()
-    ));
-  }
-  return lineSegments;
-}
-function linesToPath(lineSegments) {
-  return lineSegments.flatMap((line, index2) => {
-    if (index2 === lineSegments.length - 1) [...line.points, lineSegments[0].points[0]];
-    return [line.points[0]];
-  });
-}
-class Dxf extends Component {
-  static name = "Dxf";
-  shortLine = 0.04;
-  width = 0.04;
-  scale = 1;
-  originalData = [];
-  data = [];
-  originalBox = new Box2(0, 0, 0, 0);
-  box = new Box2(0, 0, 0, 0);
-  pointsGroups = [];
-  wallsGroup = [];
-  doors = [];
-  doorLineSegment = [];
-  verticalReferenceLine;
-  lineSegments = [];
-  originalZAverage = 0;
-  static EndType = {
-    etOpenSquare: 0,
-    etOpenRound: 1,
-    etOpenButt: 2
-    // etClosedLine: 3,
-    // etClosedPolygon: 4
-  };
-  static JoinType = {
-    jtSquare: 0,
-    jtRound: 1,
-    jtMiter: 2
-  };
-  /** 原始数据组
-   */
-  get lines() {
-    return this.lineSegments;
-  }
-  /**初始化
-   * @param width 墙体宽度
-   * @param scale 缩放比例
-   */
-  constructor(width = DEFAULT_WALL_WIDTH, scale = 1) {
-    super();
-    this.width = width;
-    this.scale = scale;
-    this.shortLine = width * 0.4;
-  }
-  /** 预处理数据
-   * @param data 
-   */
-  preprocessing(data) {
-    let { lineSegments, verticalReferenceIndex, originalZAverage } = originalDataToLineData(data);
-    this.originalZAverage = originalZAverage;
-    if (verticalReferenceIndex === -1) {
-      const line = findVerticalReference(lineSegments);
-      verticalReferenceIndex = lineSegments.indexOf(line);
-    }
-    const verticalReferenceLine = lineSegments[verticalReferenceIndex];
-    verticalReferenceLine.userData.isVerticalReferenceLine = true;
-    data[verticalReferenceIndex].isVerticalReferenceLine = true;
-    this.verticalReferenceLine = verticalReferenceLine;
-    this.dispatchEvent({
-      type: "preprocessing",
-      data,
-      setData(originalDataItem) {
-        lineSegments = originalDataItem.map(({ start, end, ...opt }) => {
-          const lineSegment = new LineSegment(Point.from(start), Point.from(end));
-          lineSegment.userData = opt;
-          return lineSegment;
-        });
-        data = originalDataItem;
-      }
-    });
-    return { lineSegments, data };
-  }
-  /** 设置
-   * @param data 房屋结构数据，node环境可以为路径
-   * @param width 墙体宽度
-   * @param scale 缩放比例
-   * @param axisAlignmentCorrection 需要执行轴对称垂直纠正
-   * @param option 
-   * @returns 
-   */
-  async set(data, width = this.width, scale = this.scale) {
-    if (typeof data === "string") {
-      if (typeof global !== "undefined") {
-        const packageName = "fs";
-        const { default: fs2 } = await import(
-          /* @vite-ignore */
-          packageName
-        );
-        const buffer = fs2.readFileSync(data);
-        const json = JSON.parse(buffer.toString("utf-8"));
-        return this.set(json, width, scale);
+function findRingEdges(lines) {
+  const lineUG = new LineSegmentUndirectedGraph(lines), unionFindSet = new UnionFindSet(lineUG.size), visited = /* @__PURE__ */ new Set(), ringEdges = [];
+  function dfs(n1) {
+    visited.add(n1);
+    const neighbors = lineUG.getNeighbors(n1);
+    neighbors?.forEach((n2) => {
+      if (visited.has(n2)) return;
+      if (unionFindSet.find(n1) === unionFindSet.find(n2)) {
+        const line = lineUG.getLine(n1, n2);
+        ringEdges.push(line);
       } else {
-        throw new Error("非node环境不允许使用路径");
+        unionFindSet.union(n1, n2);
       }
-    }
-    if (data.length === 0) return;
-    this.scale = scale;
-    this.width = width;
-    this.doorLineSegment.length = 0;
-    if (data.length === 0) {
-      this.lineSegments = [];
-      this.originalData = data;
-    } else {
-      const res = this.preprocessing(data);
-      data = res.data;
-      this.lineSegments = res.lineSegments;
-      this.originalData = data;
-    }
-    const zList = [];
-    this.data = data.map(({ start, end, insetionArr, isDoor = false }, index2) => {
-      zList.push(start.z ?? 0, end.z ?? 0);
-      const lineSegment = this.lineSegments[index2];
-      return [
-        lineSegment.points[0],
-        lineSegment.points[1],
-        (insetionArr ?? []).map((i) => i.index),
-        isDoor,
-        index2
-      ];
-    });
-    this.originalZAverage = zList.reduce((count, num) => count + num, 0) / zList.length;
-    this.computedOriginalSize(data, this.originalBox);
-    this.dispatchEvent({
-      type: "setDta",
-      originalData: this.originalData,
-      data: this.data
-    });
-    this.createGroups();
-    this.computedSize();
-    this.dispatchEvent({
-      type: "createGroup",
-      groups: this.pointsGroups
     });
   }
-  /** 创建分组
-   * @description 根据相交数组insetionArr, 把相交的线段，划分到一组内，方便后续路径查找合并使用
-   * @returns 
-   */
-  createGroups() {
-    const groups = [], visited = /* @__PURE__ */ new Set(), doorSet = /* @__PURE__ */ new Set(), doorVisitedRecord = /* @__PURE__ */ new Map();
-    const dfs = (index2, group2, preIndex = -1) => {
-      if (!this.data[index2]) return;
-      const [start, end, insetionArr, isDoor] = this.data[index2];
-      if (this.lineSegments[index2]?.userData.isBayWindow) return;
-      visited.add(index2);
-      if (isDoor) {
-        if (!doorVisitedRecord.has(index2)) doorVisitedRecord.set(index2, []);
-        doorVisitedRecord.get(index2)?.push(preIndex);
-        return doorSet.add(this.data[index2]);
-      }
-      group2.push([start, end]);
-      insetionArr.forEach((i) => {
-        if (!visited.has(i)) {
-          dfs(i, group2, index2);
-        }
-      });
-    };
-    this.data.forEach((_, index2) => {
-      if (this.lineSegments[index2]?.userData.isBayWindow) return;
-      if (!visited.has(index2)) {
-        const group2 = [];
-        dfs(index2, group2);
-        groups.push(group2);
-      }
-    });
-    this.doors = [...doorSet];
-    this.pointsGroups = groups;
-    return groups;
+  lineUG.forEach((n1) => {
+    if (visited.has(n1)) return;
+    dfs(n1);
+  });
+  return ringEdges;
+}
+function findMinRing(lines, ringEdges) {
+  const grid = createPointVirtualGrid(lines), temLine = new LineSegment(), queryLine = new LineSegment(), rings = [], visited = /* @__PURE__ */ new Set();
+  function getDirect(line, preDirect) {
+    const center = line.center, direct = line.normal();
+    temLine.start.copy(center);
+    temLine.end.copy(center).add(direct.clone().multiplyScalar(1));
+    const point = preDirect.getIntersection(temLine);
+    temLine.end.copy(point);
+    return temLine.clone();
   }
-  /** 计算当前墙体数据的边界框
-   * @description 根据分组数据pointsGroups，计算包围盒， pointsGroups数据为缩放后数据。
-   * @description 可通过box属性查看计算结果。
-   * @returns 
-   */
-  computedSize() {
-    const xArr = this.pointsGroups.flatMap((points) => points.flatMap((p) => [p[0].x, p[1].x]));
-    const yArr = this.pointsGroups.flatMap((points) => points.flatMap((p) => [p[0].y, p[1].y]));
-    const minX = Math.min(...xArr);
-    const minY = Math.min(...yArr);
-    const maxX = Math.max(...xArr);
-    const maxY = Math.max(...yArr);
-    this.box.set(minX, minY, maxX, maxY);
-    return this.box;
-  }
-  /** 线路拓扑
-   * @description 处理线路拓扑，使线路有序链接，形成长路径
-   * @param lines 
-   */
-  lineTopology(lines) {
-    const visited = [];
-    function dfs(index2, linePath) {
-      const [_0, a2] = lines[index2];
-      visited[index2] = true;
-      linePath.push(a2);
-      for (let i = 0; i < lines.length; i++) {
-        const [b1, _1] = lines[i];
-        if (!visited[i]) {
-          if (Math.abs(a2.x - b1.x) < 1e-6 && Math.abs(a2.y - b1.y) < 1e-6) {
-            return dfs(i, linePath);
-          }
-        }
-      }
-    }
-    const linePaths = [];
-    for (let i = 0; i < lines.length; i++) {
-      if (!visited[i]) {
-        const linePath = [lines[i][0]];
-        dfs(i, linePath);
-        linePaths.push(linePath);
+  function find(edge, line, point, preLine, preDirect, path, isPreDirect = true) {
+    if (path.length > lines.length) return;
+    if (visited.has(line)) return;
+    visited.add(line);
+    let direct;
+    const otherPoint = line.getAnotherPoint(point);
+    if (isPreDirect) {
+      if (line.vertical(preLine)) direct = getDirect(line, preDirect);
+      else {
+        const center = line.center, x = center.distance(preDirect.start), d0 = center.direction(preDirect.start);
+        direct = preDirect.directionMove(d0, x);
       }
-    }
-    return linePaths;
-  }
-  /** 合并方向相同的线段
-   * @param lines 
-   * @param errAngle 
-   */
-  mergeSameDirectionLine(lines, errAngle = 3) {
-    if (lines[0].includedAngle(lines[lines.length - 1]) < 0.1) {
-      const line = lines.pop();
-      line.end.copy(lines[0].end);
-      lines.splice(0, 1, line);
-    }
-    const filterLines = [lines[0]];
-    for (let i = 1; i < lines.length; i++) {
-      const line = lines[i];
-      const preLine = lines[i - 1];
-      if (preLine.includedAngle(line) < errAngle) {
-        preLine.end.copy(line.end);
-      } else {
-        filterLines.push(line);
+    } else direct = preDirect;
+    let result = grid.queryPoint(otherPoint, true);
+    if (result.length === 1) {
+      const item = result[0], nextLine = item.userData, otherPoint1 = nextLine.getAnotherPoint(item.point), d0 = otherPoint1.direction(item.point);
+      if (edge === nextLine) return path;
+      if (nextLine.vertical(line)) {
+        const d1 = otherPoint.direction(point), center = nextLine.center, isSameDirection = d0.angleBetween(direct.direction()) < 1e-9;
+        direct.start.copy(center);
+        direct.end.copy(center).add(d1.multiplyScalar(0.02));
+        if (isSameDirection) direct.end.rotate(direct.start, Math.PI);
+        path.push(nextLine);
+        if (find(edge, nextLine, item.point, line, direct, path, false)) return path;
       }
-    }
-    return filterLines;
-  }
-  /** etOpenRound 去除毛刺
-   * @description 检查连续的短线段数量，去除合并后产生的毛刺
-   */
-  squareRemoveBurr(path) {
-    if (path.length < 3) return path;
-    const filterLines = [path[0]];
-    for (let i = 1; i < path.length; i++) {
-      const prev = path[i - 1];
-      const curr = path[i];
-      const len = prev.distance(curr);
-      if (len < this.width * 0.5) {
-        let count = 0;
-        for (let j = i + 1; j < path.length; j++) {
-          const prev2 = path[j - 1];
-          const curr2 = path[j];
-          const len2 = prev2.distance(curr2);
-          if (len2 < this.width * 0.8) count++;
-          else break;
-        }
-        if (count === 0 && i + count === path.length - 1) ;
-        else if (i == 1 && count === 1) ;
-        else if (count === 3) {
-          filterLines.push(path[i + 1]);
-          i += count;
-        } else if (count === 5) {
-          filterLines.push(path[i + 2]);
-          i += count;
-        } else {
-          filterLines.push(curr);
+    } else {
+      queryLine.start.copy(direct.start).add(direct.direction().multiplyScalar(5e-3));
+      const lines2 = [line, ...result.map((item) => {
+        const line2 = item.userData;
+        line2.length();
+        return line2;
+      })];
+      for (let i = 0; i < result.length; i++) {
+        const item = result[i], nextLine = item.userData;
+        if (edge === nextLine) return path;
+        if (result.length === 4 && nextLine.parallel(line)) continue;
+        queryLine.end.copy(nextLine.center);
+        if (!lines2.some((line1) => {
+          if (line1 === nextLine) return false;
+          return line1.intersectLineSegment(queryLine);
+        })) {
+          path.push(nextLine);
+          return find(edge, nextLine, item.point, line, direct, path);
         }
-      } else {
-        filterLines.push(curr);
       }
     }
-    return filterLines;
   }
-  /**
-   * 线段矫直, 线段中心突刺
-   * @description 突变长度小于墙体宽度，该线段可能为突起线段，
-   * @description 判断后续第2线段与上一条线段是否方向相同，相同就为突刺
-   */
-  lineSegmentStraightening(path) {
-    for (let i = 0; i < path.length; i++) {
-      const p1 = path[i];
-      const p2 = path[(i + 1) % path.length];
-      if (p1.distance(p2) > this.shortLine) {
-        path.push(...path.slice(0, i + 1));
-        path.splice(0, i + 1);
-        break;
-      }
-    }
-    const lines = this.mergeSameDirectionLine(pathToLines(path)), filterLines = [lines[0]];
-    for (let i = 1; i < lines.length; i++) {
-      const line = lines[i];
-      const preLine = lines[(lines.length + i - 1) % lines.length];
-      if (line.length() > this.width * 0.9) {
-        filterLines.push(line);
-        continue;
+  for (let i = 0; i < ringEdges.length; i++) {
+    const line = ringEdges[i], center = line.center, startList = grid.queryPoint(line.start, true), endList = grid.queryPoint(line.end, true), minList = startList.length < endList.length ? startList : endList, directList = [], list = minList.filter((item) => {
+      if (minList.length === 3 && item.userData?.parallel(line)) return false;
+      const otherPoint = item.userData?.getAnotherPoint(item.point);
+      directList.push(otherPoint.direction(item.point));
+      return true;
+    });
+    const ringList = [];
+    for (let i2 = 0; i2 < list.length; i2++) {
+      const item = list[i2];
+      let direct = directList[i2];
+      if (item.userData?.parallel(line)) {
+        const otherIndex = i2 ? 0 : 1, other = directList[otherIndex];
+        direct = other.clone().multiplyScalar(-1);
       }
-      const line1 = lines[i + 1];
-      if (line1 && line1.length() > this.width * 0.9) {
-        filterLines.push(line);
-        filterLines.push(line1);
-        i = i + 1;
-        continue;
+      visited.clear();
+      const directLine = new LineSegment(center.clone(), center.clone().add(direct.clone().multiplyScalar(0.2)));
+      const path = find(line, item.userData, item.point, line, directLine, [line, item.userData]);
+      if (path) {
+        ringList.push([...path]);
       }
-      const line2 = lines[i + 2];
-      if (line2 && preLine.includedAngle(line2) < 2) {
-        i = i + 2;
-        filterLines.push(line2);
-      } else filterLines.push(line);
     }
-    return filterLines.length > 3 ? linesToPath(this.mergeSameDirectionLine(filterLines)) : [];
-  }
-  /**
-   * 移除短线段
-   * @todo 根据线段两端线段长度，选取参照物_|▔▔
-   * @param path 
-   */
-  removeShortLine(path, shortLine = this.shortLine) {
-    const lines = pathToLines(path), filterLines = [], PI_12 = Math.PI / 180;
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i], len = line.length(), currentIndex = i;
-      if (len > shortLine || filterLines.length === 0) {
-        filterLines.push(line);
-        continue;
-      }
-      let nextline = lines[++i];
-      const preLine = filterLines[filterLines.length - 1], d1 = preLine.direction();
-      while (i < lines.length) {
-        const angle = d1.angleBetween(nextline.direction()) / PI_12;
-        if (nextline.length() <= shortLine || angle < 4 || angle > 180 - 4) {
-          nextline = lines[++i];
-        } else break;
-      }
-      if (!nextline) continue;
-      const targetLine = lines[i - 1];
-      if (preLine.length() > targetLine.length()) {
-        const intersectPoint = preLine.getIntersection(nextline);
-        if (intersectPoint) {
-          const p0 = preLine.points[1].clone(), p1 = nextline.points[0].clone();
-          preLine.points[1].copy(intersectPoint);
-          nextline.points[0].copy(intersectPoint);
-          if (preLine.length() < this.width) {
-            preLine.points[1].copy(p0);
-            nextline.points[0].copy(p0);
-          } else if (nextline.length() < this.width) {
-            preLine.points[1].copy(p1);
-            nextline.points[0].copy(p1);
-          }
-        } else {
-          preLine.points[1].copy(nextline.points[0]);
-        }
-        filterLines.push(nextline);
-      } else {
-        i = currentIndex;
-      }
+    if (ringList.length === 2) {
+      const set2 = new Set(ringList[0]);
+      const count = ringList[1].filter((line2) => set2.has(line2)).length;
+      if (count > 1) ringList.splice(0, 2, ringList[0].length < ringList[1].length ? ringList[0] : ringList[1]);
     }
-    return filterLines.length > 3 ? linesToPath(filterLines) : [];
+    rings.push(...ringList);
   }
-  /** 线偏移
-   * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
-   */
-  lineOffset(endType = Dxf.EndType.etOpenSquare, joinType = Dxf.JoinType.jtMiter, scale = 1e4) {
-    let solutions = new ClipperLib.Paths();
-    const offset = new ClipperLib.ClipperOffset(20, 0.25);
-    this.pointsGroups.forEach((points) => {
-      const linePaths = this.lineTopology(points).map((linePath) => linePath.map((p) => p.clone().mutiplyScalar(scale)));
-      offset.AddPaths(linePaths, joinType, endType);
-    });
-    offset.Execute(solutions, this.width / 2 * scale);
-    this.wallsGroup = solutions.map((ps2) => {
-      let path = ps2.map((p) => Point.from(p).divisionScalar(scale));
-      path = this.lineSegmentStraightening(path);
-      if (endType == Dxf.EndType.etOpenSquare) path = this.squareRemoveBurr(path);
-      return path;
-    }).filter((points) => points.length > 4 || closedPathArea(points) > 0.2);
-    this.dispatchEvent({
-      type: "lineOffset",
-      wallsGroup: this.wallsGroup
+  return rings;
+}
+function ringsDeduplication(rings) {
+  const map = new ArrayMap(), newRings = [];
+  rings.forEach((ring) => map.append(ring.length, ring));
+  for (const rings2 of map.values()) {
+    const lineIndexGenerator = new LineIndexGenerator(rings2.flat());
+    const ringMap = new ArrayMap();
+    rings2.map((ring) => {
+      const key = ring.map((line) => lineIndexGenerator.getIndex(line)).sort((a, b) => a - b).join(",");
+      ringMap.append(key, ring);
     });
-    return this.wallsGroup;
+    ringMap.forEach((list) => newRings.push(list[0]));
   }
-  /** 垂直纠正
-   * @param option 
-   */
-  async axisAlignCorr(option) {
-    if (this.verticalReferenceLine) {
-      const lines = this.getLineSegments();
+  return newRings;
+}
+function findMaxRing(lines, ringEdges) {
+  const rings = findMinRing(lines, ringEdges), visited = /* @__PURE__ */ new Map(), unionFindSet = new UnionFindSet(rings.length), internalEdges = [];
+  rings.forEach((ring, index2) => {
+    for (let i = 0; i < ring.length; i++) {
+      const line = ring[i];
+      if (visited.has(line)) unionFindSet.union(index2, visited.get(line));
+      else visited.set(line, index2);
+    }
+  });
+  const countMap = new CountMap();
+  const groups = unionFindSet.getAllSets().valueArray.map((list) => {
+    let group2 = list.map((i) => rings[i]);
+    if (group2.length === 1) return group2[0];
+    countMap.clear();
+    group2 = ringsDeduplication(group2);
+    group2.forEach((lines2) => lines2.forEach((line) => countMap.set(line)));
+    const ring = countMap.reduce((lines2, count, line) => {
+      if (count === 1) lines2.push(line);
+      else internalEdges.push(line);
+      return lines2;
+    }, []);
+    return ring;
+  });
+  return {
+    internalEdges,
+    rings: groups
+  };
+}
+function findClosedPolygons(lines) {
+  const linesGroup = LineSegment.groupByPath(lines), rings = [], internalEdges = [];
+  linesGroup.forEach((lines2, _) => {
+    try {
+      let ringEdges = findRingEdges(lines2);
+      const result = findMaxRing(lines2, ringEdges);
+      rings.push(...result.rings);
+      internalEdges.push(...result.internalEdges);
+    } catch (error) {
+      console.warn("环查找出现异常：", error.message);
+    }
+  });
+  const internalEdgesSet = /* @__PURE__ */ new Set([...internalEdges]);
+  const groupsSet = /* @__PURE__ */ new Set([...rings.flat()]);
+  lines = lines.filter((line) => !internalEdgesSet.has(line));
+  lines.forEach((line) => !groupsSet.has(line));
+  lines = [...new Set(lines)];
+  return {
+    newLines: lines,
+    rings,
+    internalEdges
+  };
+}
+function createGroup(lineSegments) {
+  const doors = [];
+  lineSegments = lineSegments.filter((line) => {
+    if (line.userData.isDoor) {
+      doors.push(line);
+      return false;
+    }
+    return true;
+  });
+  lineSegments = buildDoubleWallGroup(lineSegments);
+  lineSegments = DoubleWallHelper.complementSide(lineSegments);
+  lineSegments = buildDoubleWallGroup(lineSegments, doors, true, true);
+  return [...lineSegments, ...doors];
+}
+function getGroups(lines, updateGroup = true) {
+  if (updateGroup) lines = createGroup(lines);
+  const map = lines.reduce((map2, line) => {
+    const groups = LineGroupType.get(line);
+    groups.forEach((group2) => {
+      let id = group2.id ?? "wall";
+      if (group2.type === "wall") id = "wall";
+      map2.append(id, line);
+    });
+    return map2;
+  }, new ArrayMap());
+  return map;
+}
+function handleGroup(map) {
+  const group2 = map.group((lines) => {
+    if (LineGroupType.everyType(lines, "bayWindow")) return "wall";
+    if (LineGroupType.everyType(lines, "doubleWall")) return "doubleWall";
+    return "wall";
+  }), walls = group2.get("wall") ?? [], doubleWalls = group2.get("doubleWall") ?? [];
+  let newlines = [], doubleWallsSet = new Set(doubleWalls.flat());
+  walls.forEach((lines) => {
+    lines.forEach((line) => doubleWallsSet.has(line) || newlines.push(line));
+  });
+  doubleWalls.forEach((lines) => {
+    lines = [...new Set(lines)];
+    const groups = clippingDoubleWall(lines);
+    groups.forEach((lines2) => {
+      if (lines2.length < 4) return newlines.push(...lines2);
+      lines2 = lines2.sort((a, b) => a.length() - b.length());
+      const line1 = lines2[0], line2 = lines2[1];
+      const newLine = new LineSegment(line1.center.clone(), line2.center.clone());
+      mergeLineUserData(newLine, lines2);
+      newLine.userData.wallWidth = line1.length();
+      newlines.push(newLine);
+      mergeWindow(newLine);
+    });
+  });
+  newlines = newlines.map((line) => line.clone());
+  return newlines.filter((line) => !line.userData.isBayWindow);
+}
+function toJson(lineSegments, name = "测试", communityName = "") {
+  const scale = 1, idMap = /* @__PURE__ */ new Map();
+  let index2 = 0;
+  return {
+    version: "2",
+    name,
+    communityName,
+    city: "",
+    province: "",
+    height: 2.8 * scale,
+    walls: lineSegments.map((line) => {
+      if (line.userData.isDoor && !line.userData.doorDirectConnection) return;
+      idMap.set(line, index2);
+      return {
+        ID: index2++,
+        start: { x: line.start.x * scale, y: line.start.y * scale },
+        end: { x: line.end.x * scale, y: line.end.y * scale },
+        thickness: (line.userData.wallWidth ? line.userData.wallWidth : 0.12) * scale,
+        type: "LINE",
+        isDoor: line.userData.isDoor,
+        loadBearingWall: false,
+        height: 2.8 * scale
+      };
+    }).filter((i) => !!i),
+    pillars: [],
+    beams: [],
+    holes: lineSegments.flatMap((line) => {
+      if (line.userData.isDoor && line.userData.doorDirectConnection) {
+        return {
+          id: index2++,
+          type: "DOOR",
+          openSide: "RIGHT",
+          start: {
+            x: line.start.x * scale,
+            y: line.start.y * scale
+          },
+          end: {
+            x: line.end.x * scale,
+            y: line.end.y * scale
+          },
+          height: 2.1 * scale,
+          qroundClearance: 0 * scale,
+          sillHeight: (line.userData?.sillHeight ?? 0) * scale
+        };
+      } else if (line.userData.isWindow && line.userData.drawWindow) {
+        return line.userData.drawWindow.map((item) => {
+          const center = Point.from(item.p);
+          const start = center.clone().add(
+            line.direction().multiplyScalar(item.width * 0.5)
+          );
+          const end = center.clone().add(
+            line.direction().multiplyScalar(-item.width * 0.5)
+          );
+          return {
+            id: index2++,
+            type: "WINDOW",
+            start: {
+              x: start.x * scale,
+              y: start.y * scale
+            },
+            end: {
+              x: end.x * scale,
+              y: end.y * scale
+            },
+            height: 1.6 * scale,
+            groundClearance: (line.userData?.groundClearance ?? 0.9) * scale,
+            sillHeight: (line.userData?.groundClearance ?? 0.9) * scale
+          };
+        });
+      }
+    }).filter((i) => !!i),
+    rooms: []
+  };
+}
+function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
+  const group2 = getGroups(lineSegments, updateGroup);
+  let newLines = handleGroup(group2);
+  newLines = LineSegmentUndirectedGraph.rotate(newLines, angle, (line, center, angle2) => {
+    if (line.userData.drawWindow) {
+      line.userData.drawWindow.forEach((windowItem) => {
+        const point = Point.from(windowItem.p);
+        point.rotate(center, angle2 * (Math.PI / 180));
+        windowItem.p = point.toJson(windowItem.p.z);
+      });
+    }
+  });
+  return {
+    lines: newLines,
+    toJson(name = "测试", communityName = "") {
+      return toJson(newLines, name, communityName);
+    }
+  };
+}
+const PRE_PROCESSOR = {
+  DoorsAnalysis(lines) {
+    return lines;
+  },
+  AxisAlignCorr(lines, option) {
+    const verticalReferenceLine = findVerticalReference(lines);
+    if (verticalReferenceLine) {
       const t = performance.now();
-      const lineSegments = AxisAlignCorr.correction(lines, this.verticalReferenceLine, option);
+      const lineSegments = AxisAlignCorr.correction(lines, verticalReferenceLine, option);
       console.log("垂直纠正消耗时间：", (performance.now() - t).toFixed(2), "ms", "处理线段数量：", lines.length);
-      const data = lineDataToOriginalData(lineSegments, this.originalZAverage);
-      await this.set(data);
+      return lineSegments;
     } else {
-      throw new Error("未找到一条垂直纠正基准轴线");
+      console.error("未找到一条垂直纠正基准轴线, 未做垂直纠正处理");
+    }
+    return lines;
+  },
+  BoundExt(lines, { trajectory, onBoundExt }) {
+    if (!trajectory) {
+      console.error("没有传入轨迹文件");
+      return lines;
     }
+    let t = performance.now();
+    lines = BoundExt.boundExtbyTraj({ lines, trajectory, wallWidth: DEFAULT_WALL_WIDTH, findCallBack: onBoundExt }).lines;
+    console.log(`外墙外扩消耗时间： ${(performance.now() - t).toFixed(2)} ms 处理线段数量： ${lines.length}`);
+    return lines;
+  },
+  AngleCorr(lines) {
+    const box = Box2.fromByLineSegment(...lines), center = box.center, vrLine = findVerticalReference(lines), angle = -vrLine.direction().angleBetween(new Point(0, 1), "angle", "360") * (Math.PI / 180);
+    lines.forEach((line) => {
+      line.rotate(angle, center);
+      if (line.userData.isWindow) {
+        line.userData.drawWindow?.forEach((d) => {
+          const p = Point.from(d.p);
+          p.rotate(center, angle);
+          d.p = p.toJson(d.p.z);
+        });
+      }
+    });
+    return lines;
+  },
+  ResetGeometricCenter(lines) {
+    const box = Box2.fromByLineSegment(...lines), center = box.center;
+    lines.forEach((line) => {
+      line.start.division(center);
+      line.end.division(center);
+    });
+    return lines;
+  }
+};
+class Dxf extends Component {
+  static name = "Dxf";
+  static PRE_PROCESSOR = PRE_PROCESSOR;
+  width = 0.04;
+  originalData = [];
+  data = [];
+  box = new Box2(0, 0, 0, 0);
+  cad = null;
+  lineSegments = [];
+  doorLineSegment = [];
+  verticalReferenceLine;
+  originalZAverage = 0;
+  _preProcessorSet = /* @__PURE__ */ new Set();
+  trajectory = null;
+  onBoundExt;
+  /** 原始数据组
+   */
+  get lines() {
+    return this.lineSegments;
+  }
+  /**初始化
+   * @param width 墙体宽度
+   */
+  constructor(width = 0.04) {
+    super();
+    this.width = width;
+  }
+  setTrajectory(trajectory, onBoundExt) {
+    this.trajectory = trajectory;
+    this.onBoundExt = this.onBoundExt ?? onBoundExt;
+    return this;
   }
   /** 完整线段数据
    * @returns 
@@ -6380,253 +6338,110 @@ class Dxf extends Component {
     return lines;
   }
   /**
-   * 将点云结构转换为Float32Array
-   */
-  to3DArray(scale, z = this.originalZAverage) {
-    const array = [];
-    this.wallsGroup.forEach((points) => {
-      for (let i = 0; i < points.length; i++) {
-        const point1 = points[i];
-        const nextIndex = i === points.length - 1 ? 0 : i + 1;
-        const point2 = points[nextIndex];
-        array.push(point1.X * scale, point1.Y * scale, z, point2.X * scale, point2.Y * scale, z);
-      }
-    });
-    return new Float32Array(array);
-  }
-  /** 获取角度范围
-   * @param center 
-   * @param p1 
-   * @param p2 
-   * @returns 
-   */
-  getArcAngleRange(center, p1, p2) {
-    const x1 = p1.x - center.x;
-    const y1 = p1.y - center.y;
-    const x2 = p2.x - center.x;
-    const y2 = p2.y - center.y;
-    let angle1 = Math.atan2(y1, x1);
-    let angle2 = Math.atan2(y2, x2);
-    angle1 = angle1 < 0 ? angle1 + 2 * Math.PI : angle1;
-    angle2 = angle2 < 0 ? angle2 + 2 * Math.PI : angle2;
-    let r1, r2;
-    const diff = Math.abs(angle2 - angle1);
-    if (diff <= Math.PI) {
-      r1 = Math.min(angle1, angle2);
-      r2 = Math.max(angle1, angle2);
-    } else {
-      r1 = Math.max(angle1, angle2);
-      r2 = Math.min(angle1, angle2) + 2 * Math.PI;
-    }
-    return [r1 / (Math.PI / 180), r2 / (Math.PI / 180)];
-  }
-  /**
-   * 线段数据转为原始json数据
-   */
-  lineDataToOriginalData(lines, quadtree) {
-    return lineDataToOriginalData(lines, this.originalZAverage, quadtree);
-  }
-  /**
-   * 转为绘制数据
-   */
-  toDrawDataJson(unit = "Millimeters") {
-    const s = units[unit], data = {
-      unit,
-      line: [],
-      arc: [],
-      dimensionLine: [],
-      center: this.box.center.toJson(),
-      width: this.box.width * s,
-      height: this.box.height * s,
-      scale: s
-    };
-    let color = "white";
-    function drawLine(p1, p2) {
-      data.line.push([p1.x * s, p1.y * s, p2.x * s, p2.y * s, color]);
-    }
-    function drawArc(pos, radius, startAngle, endAngle) {
-      data.arc.push([
-        pos.x * s,
-        pos.y * s,
-        radius * s,
-        startAngle,
-        endAngle,
-        color
-      ]);
-    }
-    for (let i = 0; i < this.originalData.length; i++) {
-      const line = this.originalData[i];
-      if (line.isVerticalReferenceLine) {
-        data.dimensionLine.push([line.start.x * s, line.start.y * s, line.end.x * s, line.end.y * s]);
-        break;
-      }
-    }
-    this.wallsGroup.forEach((points) => {
-      for (let i = 0; i < points.length; i++) {
-        const point1 = points[i];
-        const nextIndex = i === points.length - 1 ? 0 : i + 1;
-        const point2 = points[nextIndex];
-        drawLine(point1, point2);
-      }
-    });
-    const doorThickness = this.width * 0.2;
-    const list = [];
-    this.doorLineSegment.forEach((lineSegment) => {
-      if (lineSegment.length() < 0.4) return;
-      const line = lineSegment.clone().expansion(-this.width * 0.5);
-      color = "cyan";
-      if (line.length() < 1.2) {
-        line.expansion(-doorThickness * 0.5);
-        const normal = lineSegment.normal();
-        let door = new LineSegment(
-          line.start.clone(),
-          line.start.clone().add(normal.clone().multiplyScalar(line.length()))
-        );
-        const box = door.clone().directionMove(door.normal(), line.length() * -0.5).expandToRectangle(line.length(), "bothSides");
-        for (let j = 0; j < list.length; j++) {
-          if (list[j].intersectRectangle(box)) {
-            door = new LineSegment(
-              line.start.clone(),
-              line.start.clone().add(normal.clone().multiplyScalar(-line.length()))
-            );
-            break;
-          }
-        }
-        door.expansion(-doorThickness * 0.5).expandToRectangle(this.width * 0.2, "bothSides").path2D((p1, p2) => drawLine(p1, p2));
-        const a = line.length(), b = door.length(), r = (a ** 2 + b ** 2) / (2 * b), center = door.end.clone().add(door.direction().multiplyScalar(-r)), [startAngle, endAngle] = this.getArcAngleRange(center, line.end, door.end);
-        drawArc(center, r, Math.min(startAngle, endAngle), Math.max(startAngle, endAngle));
-        list.push(box);
-      } else {
-        line.clone().expansion(-this.width * 0.5).expandToRectangle(this.width).path2D((p1, p2) => drawLine(p1, p2));
-        line.clone().directionMove(line.normal(), doorThickness * 0.5).directionMove(line.direction(), doorThickness * 0.5).expansion(-line.length() * 0.45, "end").forward(doorThickness * 0.5).expandToRectangle(doorThickness).path2D((p1, p2) => drawLine(p1, p2));
-        line.clone().directionMove(line.normal(), -doorThickness * 0.5).directionMove(line.direction(), -doorThickness * 0.5).expansion(-line.length() * 0.45, "start").forward(-doorThickness * 0.5).expandToRectangle(doorThickness).path2D((p1, p2) => drawLine(p1, p2));
-      }
+   * 预处理数据
+   * @param data 
+   */
+  preprocessing(data, options) {
+    let { lineSegments, originalZAverage } = originalDataToLineData(data);
+    this.originalZAverage = originalZAverage;
+    lineSegments.forEach((line) => {
+      if (line.userData.isDoor && line.userData.doorDirectConnection) this.doorLineSegment.push(line);
     });
-    color = "yellow";
-    this.lineSegments.forEach((line) => {
-      if (!line.userData.isWindow) return false;
-      if (Array.isArray(line.userData.drawWindow)) {
-        line.userData.drawWindow.forEach((w) => {
-          const { p, width } = w;
-          const center = Point.from(p);
-          const start = center.clone().add(line.direction().multiplyScalar(width * 0.5));
-          const end = center.clone().add(line.direction().multiplyScalar(-width * 0.5));
-          const blinds = new LineSegment(start, end);
-          drawLine(blinds.start, blinds.end);
-          blinds.expandToRectangle(this.width, "bothSides").path2D((p1, p2) => drawLine(p1, p2));
-        });
-      }
+    this._preProcessorSet.forEach((handler) => {
+      lineSegments = handler(lineSegments, options);
     });
-    return data;
+    this.verticalReferenceLine = findVerticalReference(lineSegments);
+    this.verticalReferenceLine.userData.isVerticalReferenceLine = true;
+    return { lineSegments, data };
   }
-  /**
-   * @param type 
+  /** 添加预处理
+   * @param handler 
    */
-  async toDxfImageBlob(unit = "Centimeters", type = "image/jpeg", background = "#000") {
-    const data = this.toDrawDataJson(unit);
-    let canvas;
-    if (typeof window !== "undefined") {
-      canvas = document.createElement("canvas");
-    } else if (typeof global !== "undefined") {
-      const { createCanvas } = await include("canvas");
-      canvas = createCanvas();
-    } else {
-      throw new Error("创建画布失败");
+  addPreProcessor(handler) {
+    this._preProcessorSet.add(handler);
+    return this;
+  }
+  /** 删除预处理
+   * @param handler 
+   */
+  removePreProcessor(handler) {
+    this._preProcessorSet.delete(handler);
+    return this;
+  }
+  /** 清空预处理
+   * @returns 
+   */
+  clearPreProcessor() {
+    this._preProcessorSet.clear();
+    return this;
+  }
+  /** 设置
+   * @param data 房屋结构数据，node环境可以为路径
+   * @param width 墙体宽度
+   * @param scale 缩放比例
+   * @param axisAlignmentCorrection 需要执行轴对称垂直纠正
+   * @param option 
+   * @returns 
+   */
+  async set(data, options = {}) {
+    if (typeof data === "string") {
+      if (typeof global !== "undefined") {
+        const packageName = "fs";
+        const { default: fs2 } = await import(
+          /* @vite-ignore */
+          packageName
+        );
+        const buffer = fs2.readFileSync(data);
+        const json = JSON.parse(buffer.toString("utf-8"));
+        return this.set(json, options);
+      } else throw new Error("非node环境不允许使用路径");
     }
-    const margin = 2 * data.scale;
-    const colors = {
-      cyan: "cyan",
-      yellow: "yellow",
-      white: "white"
-    };
-    canvas.width = data.width + margin * 2;
-    canvas.height = data.height + margin * 2;
-    const ctx = canvas.getContext("2d");
-    if (background) {
-      ctx.fillStyle = background;
-      ctx.fillRect(0, 0, canvas.width, canvas.height);
+    if (data.length === 0) return;
+    this.doorLineSegment.length = 0;
+    this.cad = null;
+    if (data.length === 0) {
+      this.lineSegments = [];
+      this.originalData = data;
+    } else {
+      const res = this.preprocessing(data, options);
+      data = res.data;
+      this.lineSegments = res.lineSegments;
+      this.originalData = data;
     }
-    ctx.translate(data.width * 0.5 + margin, data.height * 0.5 + margin);
-    ctx.scale(1, -1);
-    data.line.forEach(([p1x, p1y, p2x, p2y, color]) => {
-      ctx.strokeStyle = colors[color];
-      ctx.beginPath();
-      ctx.moveTo(p1x, p1y);
-      ctx.lineTo(p2x, p2y);
-      ctx.closePath();
-      ctx.stroke();
-    });
-    data.arc.forEach(([x, y, radius, startAngle, endAngle, color]) => {
-      ctx.strokeStyle = colors[color];
-      ctx.beginPath();
-      ctx.arc(x, y, radius, startAngle * (Math.PI / 180), endAngle * (Math.PI / 180));
-      ctx.stroke();
+    const zList = [];
+    data.forEach(({ start, end }) => zList.push(start.z ?? 0, end.z ?? 0));
+    this.originalZAverage = zList.reduce((count, num) => count + num, 0) / zList.length;
+    this.box = Box2.fromByLineSegment(...this.lineSegments);
+    this.dispatchEvent({
+      type: "dataChange",
+      originalData: this.originalData,
+      data: this.data
     });
-    ctx.beginPath();
-    data.dimensionLine.forEach((item) => {
-      let [p1x, p1y, _, p2y] = item;
-      const minY = Math.min(p1y, p2y), maxY = Math.max(p1y, p2y), x = (canvas.width * 0.5 - 0.4 * data.scale) * (p1x < 0 ? -1 : 1), h = (maxY - minY) * 0.45;
-      ctx.fillStyle = "#fff";
-      ctx.font = `${0.15 * data.scale}px Arial`;
-      ctx.textAlign = "center";
-      ctx.textBaseline = "middle";
-      ctx.save();
-      ctx.translate(x, minY + (maxY - minY) * 0.5);
-      ctx.scale(1, -1);
-      ctx.fillText((maxY - minY).toFixed(2) + "cm", 0, 0);
-      ctx.restore();
-      ctx.moveTo(x - 0.1 * data.scale, minY);
-      ctx.lineTo(x + 0.1 * data.scale, minY);
-      ctx.moveTo(x, minY);
-      ctx.lineTo(x, h + minY);
-      ctx.moveTo(x, maxY);
-      ctx.lineTo(x, maxY - h);
-      ctx.moveTo(x - 0.1 * data.scale, maxY);
-      ctx.lineTo(x + 0.1 * data.scale, maxY);
+    this.dispatchEvent({
+      type: "setDta",
+      originalData: this.originalData,
+      data: this.data
     });
-    ctx.closePath();
-    ctx.strokeStyle = "#fff";
-    ctx.stroke();
-    if ("toBlob" in canvas) {
-      return new Promise((resolve) => {
-        canvas.toBlob((b) => {
-          resolve(b);
-        }, type, 1);
-      });
-    } else {
-      const buffer = canvas.toBuffer(type, { quality: 1 });
-      return buffer;
-    }
-  }
-  /**
-   * 将点json结构转换为Dxf string
-   */
-  toDxfString(unit = "Millimeters") {
-    const d = new Drawing();
-    d.setUnits(unit);
-    d.addLayer("cyan", Drawing.ACI.CYAN, "DOTTED");
-    d.addLayer("yellow", Drawing.ACI.YELLOW, "DOTTED");
-    d.addLayer("white", Drawing.ACI.WHITE, "DOTTED");
-    const data = this.toDrawDataJson();
-    data.line.forEach((item) => {
-      let [p1x, p1y, p2x, p2y, color] = item;
-      d.setActiveLayer(color);
-      d.drawLine(p1x, p1y, p2x, p2y);
+    let lines = this.getLineSegments(true);
+    const doors = lines.filter((line) => line.userData.isDoor);
+    lines = lines.filter((line) => !line.userData.isDoor);
+    lines = buildDoubleWallGroup(lines, doors);
+    lines.push(...doors);
+    this.cad = new CAD().usePlugin(new DxfDataPlugin(lines)).usePlugin(new DxfDrawPlugin());
+    this.dispatchEvent({
+      type: "cadChange",
+      cad: this.cad
     });
-    data.arc.forEach((item) => {
-      const [x, y, r, startAngle, endAngle, color] = item;
-      d.setActiveLayer(color);
-      d.drawArc(x, y, r, startAngle, endAngle);
+    this.dispatchEvent({
+      type: "lineOffset",
+      cad: this.cad
     });
-    return d.toDxfString();
   }
   /**
-   * 将点云结构转换为DXF格式
-   * @returns 
+   * 线段数据转为原始json数据
    */
-  toDxfBlob(unit = "Millimeters") {
-    const blob = new Blob([this.toDxfString(unit)]);
-    return blob;
+  lineDataToOriginalData(lines, quadtree) {
+    return lineDataToOriginalData(lines, this.originalZAverage, quadtree);
   }
   /**
   * 下载原始json
@@ -6643,277 +6458,44 @@ class Dxf extends Component {
       a.click();
     } else if (typeof global !== "undefined") {
       const fs2 = await include("fs", false);
-      fs2.writeFileSync(filename, content);
-    }
-  }
-  /**
-   * 下载
-   * @param filename 
-   */
-  async download(filename, unit = "Millimeters") {
-    if (typeof window !== "undefined") {
-      const blob = this.toDxfBlob(unit);
-      const a = document.createElement("a");
-      a.href = URL.createObjectURL(blob);
-      a.download = filename + ".dxf";
-      a.click();
-    } else if (typeof global !== "undefined") {
-      const fs2 = await include("fs", false);
-      fs2.writeFileSync(filename, this.toDxfString(unit));
-    }
-  }
-  /**
-   * 下载
-   * @param filename 
-   */
-  async downloadImage(filename, unit = "Centimeters", type = "image/jpeg") {
-    const blob = await this.toDxfImageBlob(unit, type);
-    if (!blob) return false;
-    if (typeof window !== "undefined") {
-      const a = document.createElement("a");
-      a.href = URL.createObjectURL(blob);
-      a.download = filename;
-      a.click();
-    } else if (typeof global !== "undefined") {
-      const fs2 = await include("fs", false);
-      fs2.writeFileSync(filename, blob);
-    } else {
-      console.error("图片下载失败");
-    }
-    return true;
-  }
-  /**
-   * 计算原始数据的边界框
-   * @description 计算所有线段的起点和终点的最小最大值，形成一个边界框
-   * @returns 
-   */
-  computedOriginalSize(data, originalBox = new Box2(0, 0, 0, 0)) {
-    const xArr = data.flatMap((item) => [item.start.x, item.end.x]);
-    const yArr = data.flatMap((item) => [item.start.y, item.end.y]);
-    const minX = Math.min(...xArr);
-    const minY = Math.min(...yArr);
-    const maxX = Math.max(...xArr);
-    const maxY = Math.max(...yArr);
-    originalBox.set(minX, minY, maxX, maxY);
-    return originalBox;
-  }
-  /**
-   * 创建数据
-   * @param pointsGroups 
-   * @returns 
-   */
-  static createData(pointsGroups, sealed = true) {
-    let count = 0;
-    const data = pointsGroups.flatMap((points) => {
-      const lines = points.map((point, index2) => {
-        const nextIndex = index2 === points.length - 1 ? 0 : index2 + 1;
-        const nextPoint = points[nextIndex];
-        return {
-          start: { x: point.x, y: point.y },
-          end: { x: nextPoint.x, y: nextPoint.y },
-          insetionArr: [
-            {
-              index: nextIndex + count
-            }
-          ]
-        };
-      });
-      count += points.length;
-      if (!sealed) {
-        lines.pop();
-        lines[lines.length - 1].insetionArr.length = 0;
-        count--;
-      }
-      return lines;
-    });
-    return data;
-  }
-}
-class Variable extends Component {
-  static name = "Variable";
-  originalLineVisible = true;
-  dxfVisible = true;
-  whiteModelVisible = true;
-  isLook = false;
-  currentWheel = 0;
-  pointerMove = { x: 0, y: 0 };
-  currentKeyUp = "";
-  currentKeyDown = "";
-  currentMouseUp = "";
-  currentMouseDown = "";
-  focus = false;
-  set(key, value) {
-    if (key in this) {
-      const oldValue = this[key];
-      this[key] = value;
-      this.dispatchEvent({
-        type: key,
-        value,
-        oldValue
-      });
-    }
-  }
-  get(key) {
-    if (key in this) return this[key];
-  }
-}
-class LineAnalysis extends Component {
-  static name = "LineAnalysis";
-  Dxf = null;
-  Variable = null;
-  lineSegmentList = [];
-  container = new THREE.Group();
-  // 误差角度
-  errorAngle = 4;
-  width = 0.4;
-  /**
-   * 
-   * @param parent 
-   */
-  onAddFromParent(parent) {
-    this.Dxf = parent.findComponentByType(Dxf);
-    this.Variable = this.parent?.findComponentByType(Variable);
-    this.Dxf.addEventListener("setDta", () => {
-      this.lineAnalysis();
-      this.dispatchEvent({ type: "analysisCompleted" });
-    });
-  }
-  /**
-   * 
-   * @param p1 
-   * @param p2 
-   * @param width 
-   * @returns 
+      fs2.writeFileSync(filename, content);
+    }
+  }
+  /** 获取绘制数据
    */
-  expandLineSegment(p1, p2, width = 0.1) {
-    const normal = p2.normal(p1);
-    const pDirect = p2.direction(p1).mutiplyScalar(width * 0.5);
-    const nDirect = p1.direction(p2).mutiplyScalar(width * 0.5);
-    const offsetX = normal.x * width * 0.5;
-    const offsetY = normal.y * width * 0.5;
-    return {
-      points: [
-        // 第一条线
-        new Point(p1.x + offsetX, p1.y + offsetY).add(nDirect),
-        new Point(p2.x + offsetX, p2.y + offsetY).add(pDirect),
-        // 第二条线
-        new Point(p1.x - offsetX, p1.y - offsetY).add(nDirect),
-        new Point(p2.x - offsetX, p2.y - offsetY).add(pDirect)
-      ],
-      indices: [0, 1, 1, 3, 3, 2, 2, 0],
-      rectIndices: [0, 1, 3, 2, 0]
-    };
+  toDrawData(unit = "Millimeters") {
+    return this.cad?.toDrawData(unit);
   }
-  appendLineSegmentList = [];
-  /**
-   * 追加数据
-   * @param p1 
-   * @param p2 
+  /** 获取 dxf 图片 二进制对象
+   * @param type 
    */
-  addData(p1, p2) {
-    const dxf = this.Dxf;
-    dxf.data.push([p1.clone(), p2.clone(), [], false, dxf.data.length]);
-    this.appendLineSegmentList.push(new LineSegment(p1.clone(), p2.clone()));
+  async toDxfImageBlob(unit = "Centimeters", type = "image/jpeg", background = "#000") {
+    return this.cad?.toDxfImageBlob(unit, type, background);
   }
-  /** 结果分析创建矩形
-   * @param result 
+  /** 下载 dxf 图片
+   * @param filename 
    */
-  createRectangle(result) {
-    const dxf = this.Dxf;
-    const project0 = result.project, project1 = result.project2;
-    if (project0.includedAngle(project1) > 135) {
-      project1.points = [project1.points[1], project1.points[0]];
-    }
-    this.addData(project0.points[0], project1.points[0]);
-    this.addData(project0.points[1], project1.points[1]);
-    const leftHeight = project0.points[0].distance(project1.points[0]), rightHeight = project0.points[1].distance(project1.points[1]), count = Math.ceil(Math.max(leftHeight, rightHeight) / dxf.width), leftFragment = leftHeight / count, rightFragment = rightHeight / count, leftDirection = project1.points[0].direction(project0.points[0]), rightDirection = project1.points[1].direction(project0.points[1]), leftP = project0.points[0].clone(), rightP = project0.points[1].clone(), direction = rightP.direction(leftP);
-    direction.multiplyScalar(dxf.width * 0.5);
-    const _leftP = leftP.clone().add(direction), _rightP = rightP.clone().add(direction.multiplyScalar(-1)), d1 = leftP.direction(rightP), d2 = _leftP.direction(_rightP);
-    if (d1.x > 0 && d2.x < 0 || d1.x < 0 && d2.x > 0 || d1.y > 0 && d2.y < 0 || d1.y < 0 && d2.y > 0) return;
-    leftP.set(_leftP.x, _leftP.y);
-    rightP.set(_rightP.x, _rightP.y);
-    for (let i = 1; i < count; i++) {
-      const left = leftDirection.clone().multiplyScalar(leftFragment * i), right = rightDirection.clone().multiplyScalar(rightFragment * i), p1 = leftP.clone().add(left), p2 = rightP.clone().add(right);
-      this.addData(p1, p2);
-    }
+  async downloadDxfImage(filename, unit = "Centimeters", type = "image/jpeg") {
+    return this.cad?.downloadDxfImage(filename, unit, type);
   }
-  quadtree;
   /**
-   * 构建线段四叉树，快速查找，
+   * 将点json结构转换为Dxf 字符串
    */
-  buildQuadtree() {
-    const dxf = this.Dxf;
-    const lineSegmentList = [];
-    this.quadtree = new Quadtree(dxf.originalBox, 2);
-    dxf.lineSegments.forEach((lineSegment) => {
-      if (lineSegment.userData?.isDoor) return;
-      this.quadtree?.insert({
-        line: lineSegment,
-        userData: lineSegmentList.length
-      });
-      lineSegmentList.push(lineSegment);
-    });
-    this.lineSegmentList = lineSegmentList;
+  toDxfString(unit = "Millimeters") {
+    return this.cad?.toDxfString(unit);
   }
-  resultList = [];
-  mergeWallLines = [];
-  /** 线段分析
-   * @description 判断两条线段距离是否较短且趋近平行，然后查找两条线段的重合部分的投影线，以此判断两根线是否需要合并
-   * @param data 
+  /**
+   * 将点云结构转换为 DXF 二进制对象
+   * @returns 
    */
-  lineAnalysis() {
-    this.buildQuadtree();
-    const quadtree = this.quadtree;
-    const lineSegmentList = this.lineSegmentList;
-    const visited = /* @__PURE__ */ new Set(), resultList = [];
-    lineSegmentList.forEach((_0, i) => {
-      const sourceLineSegment = lineSegmentList[i], rectangle = Rectangle.fromByLineSegment(sourceLineSegment, this.width * 2, false, -0.01), ids = quadtree.queryRect(rectangle).map((i2) => i2.userData).filter((index2) => index2 !== i);
-      ids.forEach((id) => {
-        try {
-          if (visited.has(`${i}-${id}`) || visited.has(`${id}-${i}`)) return;
-          const res = this.projectionAnalysis(id, i, sourceLineSegment, lineSegmentList);
-          if (res) resultList.push(res);
-          visited.add(`${i}-${id}`);
-        } catch (error) {
-        }
-      });
-    });
-    this.appendLineSegmentList.length = 0;
-    this.resultList = resultList;
+  toDxfBlob(unit = "Millimeters") {
+    return this.cad?.toDxfBlob(unit);
   }
-  /** 线段投影分析
-   * @param index 
-   * @param sourceLineSegment 
-   * @param lineSegmentList 
-   * @returns 
+  /** 下载Dxf
+   * @param filename 
    */
-  projectionAnalysis(index2, sourceIndex, sourceLineSegment, lineSegmentList) {
-    const temLineSegment = lineSegmentList[index2], direct = sourceLineSegment.direction(), temDirect = temLineSegment.direction(), angle = direct.angleBetween(temDirect) / (Math.PI / 180);
-    if (angle < this.errorAngle || angle > 180 - this.errorAngle) {
-      let data;
-      const p1 = temLineSegment.projectLineSegment(sourceLineSegment), p2 = sourceLineSegment.projectLineSegment(temLineSegment);
-      if (p1.getLength() > p2.getLength()) {
-        data = {
-          target: temLineSegment,
-          targetIndex: index2,
-          source: sourceLineSegment,
-          sourceIndex,
-          project: p1,
-          project2: p2
-        };
-      } else {
-        data = {
-          target: sourceLineSegment,
-          targetIndex: sourceIndex,
-          source: temLineSegment,
-          sourceIndex: index2,
-          project: p2,
-          project2: p1
-        };
-      }
-      if (!data || data.project.getLength() < 0.2 || data.project2.getLength() < 0.2) return;
-      return data;
-    }
+  async downloadDxf(filename, unit = "Millimeters") {
+    return this.cad?.downloadDxf(filename, unit);
   }
 }
 class DoorsAnalysis {
@@ -6933,15 +6515,13 @@ class DoorsAnalysis {
   doorSearchNearAngle = 110;
   doorSearchDistance = 2;
   doors = [];
-  lineAnalysis;
   continueFind = true;
-  constructor(lineAnalysis, skipFindDoor) {
-    this.lineAnalysis = lineAnalysis;
-    this.dxf = lineAnalysis.Dxf;
+  constructor(dxf, skipFindDoor) {
+    this.dxf = dxf;
+    this.lineSegments = dxf.lineSegments.filter((lineSegment) => !lineSegment.userData?.isDoor);
     this.findPointVirtualGrid = new PointVirtualGrid();
-    this.quadtree = lineAnalysis.quadtree;
-    this.resultList = lineAnalysis.resultList;
-    this.lineSegments = lineAnalysis.lineSegmentList;
+    this.quadtree = createQuadtree(this.lineSegments);
+    this.resultList = DoubleWallHelper.findDoubleLine(this.lineSegments).resultList;
     this.dxf.doorLineSegment.length = 0;
     this.lineSegments.forEach((line) => {
       line.points.forEach((p) => {
@@ -7050,20 +6630,13 @@ class DoorsAnalysis {
    */
   getDoorPoint() {
     const doorPoints = [], calculatedDoorPoint = [], dxf = this.dxf, pointVirtualGrid = this.pointVirtualGrid;
-    dxf.doors.forEach((item) => {
-      const doorLine = dxf.lineSegments[item[4]];
-      const doorData = dxf.originalData[item[4]];
+    dxf.lineSegments.forEach((doorLine, index2) => {
+      if (!doorLine.userData?.isDoor) return;
+      const doorData = doorLine.userData;
       if (doorData.doorDirectConnection) {
-        const { start, end, ...opt } = doorData;
         this.continueFind = false;
-        const line = new LineSegment(Point.from(start), Point.from(end));
-        line.userData = {
-          ...cloneUserData(opt),
-          doorDirectConnection: true,
-          isDoor: true
-        };
-        this.dxf.doorLineSegment.push(line);
-        line.points.forEach((point) => {
+        this.dxf.doorLineSegment.push(doorLine);
+        doorLine.points.forEach((point) => {
           const res = pointVirtualGrid.queryPoint(point);
           if (res.length) {
             calculatedDoorPoint.push({
@@ -7090,7 +6663,7 @@ class DoorsAnalysis {
           uuid: uuid()
         });
       } else {
-        console.warn(`门的线段顺序${item[4]} 没有drawDoorData属性`);
+        console.warn(`门的线段顺序${index2} 没有drawDoorData属性`);
       }
     });
     return { doorPoints, calculatedDoorPoint };
@@ -7354,7 +6927,6 @@ class DoorsAnalysisComponent extends Component {
   doorSearchDistance = 2;
   DoorsAnalysis;
   skipFindDoor = false;
-  needsSaveDoor = false;
   doors = [];
   /**
    * 
@@ -7362,164 +6934,13 @@ class DoorsAnalysisComponent extends Component {
    */
   onAddFromParent(parent) {
     const dxf = parent.findComponentByType(Dxf);
-    const lineAnalysis = this.parent?.findComponentByType(LineAnalysis);
-    dxf.addEventListener("createGroup", () => {
-      this.DoorsAnalysis = new DoorsAnalysis(lineAnalysis, this.skipFindDoor);
-      if (this.needsSaveDoor) {
-        this.doors = dxf.doors.map((item) => dxf.lineSegments[item[4]]);
-      }
+    dxf.addEventListener("dataChange", () => {
+      this.DoorsAnalysis = new DoorsAnalysis(dxf, this.skipFindDoor);
       this.skipFindDoor = false;
       this.dispatchEvent({ type: "analysisCompleted" });
     });
   }
 }
-function createGroup(lineSegments) {
-  const doors = [];
-  lineSegments = lineSegments.filter((line) => {
-    if (line.userData.isDoor) {
-      doors.push(line);
-      return false;
-    }
-    return true;
-  });
-  lineSegments = buildDoubleWallGroup(lineSegments);
-  lineSegments = DoubleWallHelper.complementSide(lineSegments);
-  lineSegments = buildDoubleWallGroup(lineSegments, doors, true, true);
-  return [...lineSegments, ...doors];
-}
-function getGroups(lines, updateGroup = true) {
-  if (updateGroup) lines = createGroup(lines);
-  const map = lines.reduce((map2, line) => {
-    const groups = LineGroupType.get(line);
-    groups.forEach((group2) => {
-      let id = group2.id ?? "wall";
-      if (group2.type === "wall") id = "wall";
-      map2.append(id, line);
-    });
-    return map2;
-  }, new ArrayMap());
-  return map;
-}
-function handleGroup(map) {
-  const group2 = map.group((lines) => {
-    if (LineGroupType.everyType(lines, "bayWindow")) return "wall";
-    if (LineGroupType.everyType(lines, "doubleWall")) return "doubleWall";
-    return "wall";
-  }), walls = group2.get("wall") ?? [], doubleWalls = group2.get("doubleWall") ?? [];
-  let newlines = [], doubleWallsSet = new Set(doubleWalls.flat());
-  walls.forEach((lines) => {
-    lines.forEach((line) => doubleWallsSet.has(line) || newlines.push(line));
-  });
-  doubleWalls.forEach((lines) => {
-    lines = [...new Set(lines)];
-    const groups = clippingDoubleWall(lines);
-    groups.forEach((lines2) => {
-      if (lines2.length < 4) return newlines.push(...lines2);
-      lines2 = lines2.sort((a, b) => a.length() - b.length());
-      const line1 = lines2[0], line2 = lines2[1];
-      const newLine = new LineSegment(line1.center.clone(), line2.center.clone());
-      mergeLineUserData(newLine, lines2);
-      newLine.userData.wallWidth = line1.length();
-      newlines.push(newLine);
-      mergeWindow(newLine);
-    });
-  });
-  newlines = newlines.map((line) => line.clone());
-  return newlines.filter((line) => !line.userData.isBayWindow);
-}
-function toJson(lineSegments, name = "测试", communityName = "") {
-  const scale = 1, idMap = /* @__PURE__ */ new Map();
-  let index2 = 0;
-  return {
-    version: "2",
-    name,
-    communityName,
-    city: "",
-    province: "",
-    height: 2.8 * scale,
-    walls: lineSegments.map((line) => {
-      if (line.userData.isDoor && !line.userData.doorDirectConnection) return;
-      idMap.set(line, index2);
-      return {
-        ID: index2++,
-        start: { x: line.start.x * scale, y: line.start.y * scale },
-        end: { x: line.end.x * scale, y: line.end.y * scale },
-        thickness: (line.userData.wallWidth ? line.userData.wallWidth : 0.12) * scale,
-        type: "LINE",
-        isDoor: line.userData.isDoor,
-        loadBearingWall: false,
-        height: 2.8 * scale
-      };
-    }).filter((i) => !!i),
-    pillars: [],
-    beams: [],
-    holes: lineSegments.flatMap((line) => {
-      if (line.userData.isDoor && line.userData.doorDirectConnection) {
-        return {
-          id: index2++,
-          type: "DOOR",
-          openSide: "RIGHT",
-          start: {
-            x: line.start.x * scale,
-            y: line.start.y * scale
-          },
-          end: {
-            x: line.end.x * scale,
-            y: line.end.y * scale
-          },
-          height: 2.1 * scale,
-          qroundClearance: 0 * scale,
-          sillHeight: (line.userData?.sillHeight ?? 0) * scale
-        };
-      } else if (line.userData.isWindow && line.userData.drawWindow) {
-        return line.userData.drawWindow.map((item) => {
-          const center = Point.from(item.p);
-          const start = center.clone().add(
-            line.direction().multiplyScalar(item.width * 0.5)
-          );
-          const end = center.clone().add(
-            line.direction().multiplyScalar(-item.width * 0.5)
-          );
-          return {
-            id: index2++,
-            type: "WINDOW",
-            start: {
-              x: start.x * scale,
-              y: start.y * scale
-            },
-            end: {
-              x: end.x * scale,
-              y: end.y * scale
-            },
-            height: 1.6 * scale,
-            groundClearance: (line.userData?.groundClearance ?? 0.9) * scale,
-            sillHeight: (line.userData?.groundClearance ?? 0.9) * scale
-          };
-        });
-      }
-    }).filter((i) => !!i),
-    rooms: []
-  };
-}
-function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
-  const group2 = getGroups(lineSegments, updateGroup);
-  let newLines = handleGroup(group2);
-  newLines = LineSegmentUndirectedGraph.rotate(newLines, angle, (line, center, angle2) => {
-    if (line.userData.drawWindow) {
-      line.userData.drawWindow.forEach((windowItem) => {
-        const point = Point.from(windowItem.p);
-        point.rotate(center, angle2 * (Math.PI / 180));
-        windowItem.p = point.toJson(windowItem.p.z);
-      });
-    }
-  });
-  return {
-    lines: newLines,
-    toJson(name = "测试", communityName = "") {
-      return toJson(newLines, name, communityName);
-    }
-  };
-}
 class ThreeVJia extends Component {
   static name = "ThreeVJia";
   lineSegments = [];
@@ -7569,10 +6990,37 @@ class ThreeVJia extends Component {
     }
   }
 }
+class Variable extends Component {
+  static name = "Variable";
+  originalLineVisible = true;
+  dxfVisible = true;
+  whiteModelVisible = true;
+  isLook = false;
+  currentWheel = 0;
+  pointerMove = { x: 0, y: 0 };
+  currentKeyUp = "";
+  currentKeyDown = "";
+  currentMouseUp = "";
+  currentMouseDown = "";
+  focus = false;
+  set(key, value) {
+    if (key in this) {
+      const oldValue = this[key];
+      this[key] = value;
+      this.dispatchEvent({
+        type: key,
+        value,
+        oldValue
+      });
+    }
+  }
+  get(key) {
+    if (key in this) return this[key];
+  }
+}
 class DxfSystem extends ComponentManager {
   Dxf;
   Variable;
-  LineAnalysis;
   DoorsAnalysis;
   CorrectionDxf;
   wallWidth;
@@ -7588,11 +7036,9 @@ class DxfSystem extends ComponentManager {
     this.Dxf = new Dxf(this.wallWidth);
     this.CorrectionDxf = new CorrectionDxf(this.wallWidth);
     this.Variable = new Variable();
-    this.LineAnalysis = new LineAnalysis();
     this.DoorsAnalysis = new DoorsAnalysisComponent();
     this.addComponent(this.Variable);
     this.addComponent(this.Dxf);
-    this.addComponent(this.LineAnalysis);
     this.addComponent(this.DoorsAnalysis);
     this.addComponent(this.CorrectionDxf);
     this.addComponent(new ThreeVJia());
@@ -7612,187 +7058,12 @@ class DxfSystem extends ComponentManager {
   }
 }
 const components = {
-  LineAnalysis,
   ThreeVJia,
   Variable,
   Dxf,
   DoorsAnalysisComponent,
   CorrectionDxf
 };
-function findRingEdges(lines) {
-  const lineUG = new LineSegmentUndirectedGraph(lines), unionFindSet = new UnionFindSet(lineUG.size), visited = /* @__PURE__ */ new Set(), ringEdges = [];
-  function dfs(n1) {
-    visited.add(n1);
-    const neighbors = lineUG.getNeighbors(n1);
-    neighbors?.forEach((n2) => {
-      if (visited.has(n2)) return;
-      if (unionFindSet.find(n1) === unionFindSet.find(n2)) {
-        const line = lineUG.getLine(n1, n2);
-        ringEdges.push(line);
-      } else {
-        unionFindSet.union(n1, n2);
-      }
-    });
-  }
-  lineUG.forEach((n1) => {
-    if (visited.has(n1)) return;
-    dfs(n1);
-  });
-  return ringEdges;
-}
-function findMinRing(lines, ringEdges) {
-  const grid = createPointVirtualGrid(lines), temLine = new LineSegment(), queryLine = new LineSegment(), rings = [], visited = /* @__PURE__ */ new Set();
-  function getDirect(line, preDirect) {
-    const center = line.center, direct = line.normal();
-    temLine.start.copy(center);
-    temLine.end.copy(center).add(direct.clone().multiplyScalar(1));
-    const point = preDirect.getIntersection(temLine);
-    temLine.end.copy(point);
-    return temLine.clone();
-  }
-  function find(edge, line, point, preLine, preDirect, path, isPreDirect = true) {
-    if (path.length > lines.length) return;
-    if (visited.has(line)) return;
-    visited.add(line);
-    let direct;
-    const otherPoint = line.getAnotherPoint(point);
-    if (isPreDirect) {
-      if (line.vertical(preLine)) direct = getDirect(line, preDirect);
-      else {
-        const center = line.center, x = center.distance(preDirect.start), d0 = center.direction(preDirect.start);
-        direct = preDirect.directionMove(d0, x);
-      }
-    } else direct = preDirect;
-    let result = grid.queryPoint(otherPoint, true);
-    if (result.length === 1) {
-      const item = result[0], nextLine = item.userData, otherPoint1 = nextLine.getAnotherPoint(item.point), d0 = otherPoint1.direction(item.point);
-      if (edge === nextLine) return path;
-      if (nextLine.vertical(line)) {
-        const d1 = otherPoint.direction(point), center = nextLine.center, isSameDirection = d0.angleBetween(direct.direction()) < 1e-9;
-        direct.start.copy(center);
-        direct.end.copy(center).add(d1.multiplyScalar(0.02));
-        if (isSameDirection) direct.end.rotate(direct.start, Math.PI);
-        path.push(nextLine);
-        if (find(edge, nextLine, item.point, line, direct, path, false)) return path;
-      }
-    } else {
-      queryLine.start.copy(direct.start).add(direct.direction().multiplyScalar(5e-3));
-      const lines2 = [line, ...result.map((item) => {
-        const line2 = item.userData;
-        line2.length();
-        return line2;
-      })];
-      for (let i = 0; i < result.length; i++) {
-        const item = result[i], nextLine = item.userData;
-        if (edge === nextLine) return path;
-        if (result.length === 4 && nextLine.parallel(line)) continue;
-        queryLine.end.copy(nextLine.center);
-        if (!lines2.some((line1) => {
-          if (line1 === nextLine) return false;
-          return line1.intersectLineSegment(queryLine);
-        })) {
-          path.push(nextLine);
-          return find(edge, nextLine, item.point, line, direct, path);
-        }
-      }
-    }
-  }
-  for (let i = 0; i < ringEdges.length; i++) {
-    const line = ringEdges[i], center = line.center, startList = grid.queryPoint(line.start, true), endList = grid.queryPoint(line.end, true), minList = startList.length < endList.length ? startList : endList, directList = [], list = minList.filter((item) => {
-      if (minList.length === 3 && item.userData?.parallel(line)) return false;
-      const otherPoint = item.userData?.getAnotherPoint(item.point);
-      directList.push(otherPoint.direction(item.point));
-      return true;
-    });
-    const ringList = [];
-    for (let i2 = 0; i2 < list.length; i2++) {
-      const item = list[i2];
-      let direct = directList[i2];
-      if (item.userData?.parallel(line)) {
-        const otherIndex = i2 ? 0 : 1, other = directList[otherIndex];
-        direct = other.clone().multiplyScalar(-1);
-      }
-      visited.clear();
-      const directLine = new LineSegment(center.clone(), center.clone().add(direct.clone().multiplyScalar(0.2)));
-      const path = find(line, item.userData, item.point, line, directLine, [line, item.userData]);
-      if (path) {
-        ringList.push([...path]);
-      }
-    }
-    if (ringList.length === 2) {
-      const set2 = new Set(ringList[0]);
-      const count = ringList[1].filter((line2) => set2.has(line2)).length;
-      if (count > 1) ringList.splice(0, 2, ringList[0].length < ringList[1].length ? ringList[0] : ringList[1]);
-    }
-    rings.push(...ringList);
-  }
-  return rings;
-}
-function ringsDeduplication(rings) {
-  const map = new ArrayMap(), newRings = [];
-  rings.forEach((ring) => map.append(ring.length, ring));
-  for (const rings2 of map.values()) {
-    const lineIndexGenerator = new LineIndexGenerator(rings2.flat());
-    const ringMap = new ArrayMap();
-    rings2.map((ring) => {
-      const key = ring.map((line) => lineIndexGenerator.getIndex(line)).sort((a, b) => a - b).join(",");
-      ringMap.append(key, ring);
-    });
-    ringMap.forEach((list) => newRings.push(list[0]));
-  }
-  return newRings;
-}
-function findMaxRing(lines, ringEdges) {
-  const rings = findMinRing(lines, ringEdges), visited = /* @__PURE__ */ new Map(), unionFindSet = new UnionFindSet(rings.length), internalEdges = [];
-  rings.forEach((ring, index2) => {
-    for (let i = 0; i < ring.length; i++) {
-      const line = ring[i];
-      if (visited.has(line)) unionFindSet.union(index2, visited.get(line));
-      else visited.set(line, index2);
-    }
-  });
-  const countMap = new CountMap();
-  const groups = unionFindSet.getAllSets().valueArray.map((list) => {
-    let group2 = list.map((i) => rings[i]);
-    if (group2.length === 1) return group2[0];
-    countMap.clear();
-    group2 = ringsDeduplication(group2);
-    group2.forEach((lines2) => lines2.forEach((line) => countMap.set(line)));
-    const ring = countMap.reduce((lines2, count, line) => {
-      if (count === 1) lines2.push(line);
-      else internalEdges.push(line);
-      return lines2;
-    }, []);
-    return ring;
-  });
-  return {
-    internalEdges,
-    rings: groups
-  };
-}
-function findClosedPolygons(lines) {
-  const linesGroup = LineSegment.groupByPath(lines), rings = [], internalEdges = [];
-  linesGroup.forEach((lines2, _) => {
-    try {
-      let ringEdges = findRingEdges(lines2);
-      const result = findMaxRing(lines2, ringEdges);
-      rings.push(...result.rings);
-      internalEdges.push(...result.internalEdges);
-    } catch (error) {
-      console.warn("环查找出现异常：", error.message);
-    }
-  });
-  const internalEdgesSet = /* @__PURE__ */ new Set([...internalEdges]);
-  const groupsSet = /* @__PURE__ */ new Set([...rings.flat()]);
-  lines = lines.filter((line) => !internalEdgesSet.has(line));
-  lines.forEach((line) => !groupsSet.has(line));
-  lines = [...new Set(lines)];
-  return {
-    newLines: lines,
-    rings,
-    internalEdges
-  };
-}
 function drawLines$1(lines, parameters, offset = 1e-3) {
   if (Array.isArray(lines) && lines[0] instanceof Point) {
     const _lines = lines;
@@ -7998,7 +7269,7 @@ class Scenario {
     this.doorGroup.name = "";
     this.texture = null;
     this.numdu = 1;
-    this.color = 15066597;
+    this.color = 16777215;
     this.doorModely = null;
     this.windowModely = null;
     this.CabinetModel = null;
@@ -8060,10 +7331,17 @@ class Scenario {
     this.closedArray = lines.filter((item) => {
       return LineGroupType.hasType(item, "doubleWall");
     });
-    const groups = LineSegment.groupByPath(this.closedArray);
+    let groups = LineSegment.groupByPath(this.closedArray);
     const set2 = new Set(this.closedArray);
     let singleLineWall = lines.filter((line) => !set2.has(line) && !line.userData.isDoor && !line.userData.isBayWindow);
     let menList = lines.filter((line) => line.userData.isDoor);
+    groups = groups.filter((group2) => {
+      if (group2.length < 4) {
+        singleLineWall.push(...group2);
+        return false;
+      }
+      return true;
+    });
     this.TheHandlingOfTheDoor(menList);
     this.overallTreatmentOfSingleLineWalls(singleLineWall);
     for (const g in groups) {
@@ -8166,15 +7444,13 @@ class Scenario {
     const geometry = this.createParallelepipedFromBase(basePoints, 2.8);
     const material = new THREE.MeshStandardMaterial({
       color: this.color,
-      side: THREE.DoubleSide,
-      // flatShading: true,
-      roughness: this.numdu,
-      metalness: 0,
-      envMapRotation: new THREE.Euler(0, 0, 0),
-      polygonOffset: true,
-      polygonOffsetFactor: 10,
-      polygonOffsetUnits: 10
-      // wireframe: true
+      side: THREE.DoubleSide
+      // roughness: this.numdu,
+      // metalness: 0.0,
+      // envMapRotation: new THREE.Euler(0, 0, 0),
+      // polygonOffset: true,
+      // polygonOffsetFactor: 10,
+      // polygonOffsetUnits: 10,
     });
     const cube = new THREE.Mesh(geometry, material);
     const edges = new THREE.EdgesGeometry(geometry);
@@ -8471,14 +7747,13 @@ class Scenario {
     const geometry = this.createParallelepipedFromBase(basePoints, Height ? Height : this.WindowHeight);
     const material = new THREE.MeshStandardMaterial({
       color: this.color,
-      side: THREE.DoubleSide,
-      // flatShading: true,
-      roughness: this.numdu,
-      metalness: 0,
-      envMapRotation: new THREE.Euler(0, 0, 0),
-      polygonOffset: true,
-      polygonOffsetFactor: 10,
-      polygonOffsetUnits: 10
+      side: THREE.DoubleSide
+      // roughness: this.numdu,
+      // metalness: 0.0,
+      // envMapRotation: new THREE.Euler(0, 0, 0),
+      // polygonOffset: true,
+      // polygonOffsetFactor: 10,
+      // polygonOffsetUnits: 10,
     });
     const brush1 = new Brush(mesh.geometry);
     brush1.updateMatrixWorld();
@@ -8524,25 +7799,23 @@ class Scenario {
     const result = evaluator.evaluate(brush1, brush2, SUBTRACTION);
     const material = new THREE.MeshStandardMaterial({
       color: this.color,
-      side: THREE.DoubleSide,
-      // flatShading: true,
-      roughness: this.numdu,
-      metalness: 0,
-      envMapRotation: new THREE.Euler(0, 0, 0),
-      polygonOffset: true,
-      polygonOffsetFactor: 10,
-      polygonOffsetUnits: 10
+      side: THREE.DoubleSide
+      // roughness: this.numdu,
+      // metalness: 0.0,
+      // envMapRotation: new THREE.Euler(0, 0, 0),
+      // polygonOffset: true,
+      // polygonOffsetFactor: 10,
+      // polygonOffsetUnits: 10,
     });
     const material1 = new THREE.MeshStandardMaterial({
       color: this.color,
-      side: THREE.DoubleSide,
-      // flatShading: true,
-      roughness: this.numdu,
-      metalness: 0,
-      envMapRotation: new THREE.Euler(0, 0, 0),
-      polygonOffset: true,
-      polygonOffsetFactor: 10,
-      polygonOffsetUnits: 10
+      side: THREE.DoubleSide
+      // roughness: this.numdu,
+      // metalness: 0.0,
+      // envMapRotation: new THREE.Euler(0, 0, 0),
+      // polygonOffset: true,
+      // polygonOffsetFactor: 10,
+      // polygonOffsetUnits: 10,
     });
     result.material = material1;
     new THREE.Mesh(geometry2, material);
@@ -15842,9 +15115,9 @@ class SceneAutoGenerat {
     });
     const contour = Point.fromByList(item.contour ?? []), rectangle = new Polygon(Qa(contour.map((p) => [p.x, p.y])).map((p) => Point.from(p)));
     rectangle.pop();
-    const max = rectangle.getMaxLengthInfo(), min = rectangle.getMinLengthInfo(), center = rectangle.getCenter(), direction = max.start.y < max.end.y ? max.start.direction(max.end) : max.end.direction(max.start), height = Math.abs(item.box.max.z - this.z);
+    const z = item.box.min.z, max = rectangle.getMaxLengthInfo(), min = rectangle.getMinLengthInfo(), center = rectangle.getCenter(), direction = max.start.y < max.end.y ? max.start.direction(max.end) : max.end.direction(max.start), height = Math.abs(item.box.max.z - z);
     const group2 = new THREE.Group();
-    group2.position.set(center.x, center.y, this.z);
+    group2.position.set(center.x, center.y, z);
     group2.add(model);
     this.scene.add(group2);
     const box32 = new THREE.Box3();
@@ -15866,7 +15139,7 @@ class SceneAutoGenerat {
     const direction2 = point1.y < point2.y ? point1.direction(point2) : point2.direction(point1);
     group2.rotateZ(direction2.angleBetween2(direction));
     this.scene.add(
-      SceneAutoGenerat.itemParse(item, this.z).box
+      SceneAutoGenerat.itemParse(item).box
     );
   }
   /** 构建物品模型
@@ -15874,10 +15147,10 @@ class SceneAutoGenerat {
   async buildItem() {
     await Promise.all(this.itemList.map(async (item) => await this.getModel(item)));
   }
-  static itemParse(item, z) {
+  static itemParse(item) {
     const contour = Point.fromByList(item.contour), rectangle = new Polygon(Qa(contour.map((p) => [p.x, p.y])).map((p) => Point.from(p)));
     rectangle.pop();
-    const height = Math.abs(item.box.max.z - z), max = rectangle.getMaxLengthInfo(), direction = max.start.y < max.end.y ? max.start.direction(max.end) : max.end.direction(max.start), shape = new THREE.Shape();
+    const z = item.box.min.z, height = Math.abs(item.box.max.z - z), max = rectangle.getMaxLengthInfo(), min = rectangle.getMinLengthInfo(), direction = max.start.y < max.end.y ? max.start.direction(max.end) : max.end.direction(max.start), shape = new THREE.Shape();
     rectangle.forEach((p, i) => {
       if (i === 0) shape.moveTo(p.x, p.y);
       else shape.lineTo(p.x, p.y);
@@ -15890,11 +15163,34 @@ class SceneAutoGenerat {
     lineSegments.position.z = z;
     box3.setFromObject(lineSegments);
     const center = box3.getCenter(new THREE.Vector3());
+    const maxLine = new LineSegment(max.start, max.end), minLine = new LineSegment(min.start, min.end);
+    const zStart = new THREE.Vector3().copy(rectangle[0].toJson(z)), zEnd = zStart.clone();
+    zEnd.z += height;
     return {
       box: lineSegments,
       center,
       category: item.category,
-      angle: direction.angleBetween(new Point(0, 1), "angle", "360") * (Math.PI / 180) + Math.PI * 0.5
+      angle: direction.angleBetween(new Point(0, 1), "angle", "360") * (Math.PI / 180) + Math.PI * 0.5,
+      info: [
+        {
+          center: new THREE.Vector3().copy(maxLine.center.toJson(z)),
+          start: new THREE.Vector3().copy(maxLine.start.toJson(z)),
+          end: new THREE.Vector3().copy(maxLine.start.toJson(z)),
+          length: maxLine.length()
+        },
+        {
+          center: new THREE.Vector3().copy(minLine.center.toJson(z)),
+          start: new THREE.Vector3().copy(minLine.start.toJson(z)),
+          end: new THREE.Vector3().copy(minLine.start.toJson(z)),
+          length: minLine.length()
+        },
+        {
+          center: zStart.clone().add(zEnd).multiplyScalar(0.5),
+          start: zStart,
+          end: zEnd,
+          length: height
+        }
+      ]
     };
   }
 }
@@ -15927,8 +15223,6 @@ class WhiteModel extends Component {
   whiteModelGroup = new THREE.Group();
   // dxf数据白模边缘线
   whiteModelLineGroup = new THREE.Group();
-  // 原始数据白模
-  originalWhiteMode = new THREE.Group();
   material = new THREE.MeshStandardMaterial({ color: 16777215, transparent: true, opacity: 0.8, side: THREE.DoubleSide });
   itemList = [];
   promise;
@@ -15942,8 +15236,7 @@ class WhiteModel extends Component {
   onAddFromParent(parent) {
     this.Dxf = parent.findComponentByName("Dxf");
     this.Variable = parent.findComponentByName("Variable");
-    this.originalWhiteMode.visible = false;
-    this.Dxf?.addEventListener("lineOffset", () => {
+    this.Dxf?.addEventListener("cadChange", () => {
       this.promise = this.updateModel();
     });
   }
@@ -15951,12 +15244,10 @@ class WhiteModel extends Component {
     const dxfSystem = this.parent;
     this.Variable?.set("whiteModelVisible", false);
     const dxf = this.Dxf;
-    this.originalWhiteMode.clear();
     this.whiteModelGroup.clear();
     this.whiteModelLineGroup.clear();
     this.whiteModelGroup.add(this.whiteModelLineGroup);
     this.whiteModelGroup.position.z = dxf.originalZAverage;
-    this.originalWhiteMode.position.z = dxf.originalZAverage;
     const lines = dxfSystem.Dxf.getLineSegments(true);
     const sceneAutoGenerat = new SceneAutoGenerat(lines, this.itemList, dxfSystem.Dxf.originalZAverage, dxfSystem.CorrectionDxf.trajectory);
     await sceneAutoGenerat.init();
@@ -15965,7 +15256,7 @@ class WhiteModel extends Component {
       this.whiteModelLineGroup.add(group2.clone(true));
     }
     const walls = dxf.originalData.map(({ start, end, insetionArr }) => {
-      const startVec3 = new Point(start.x, start.y).mutiplyScalar(dxf.scale), endVec3 = new Point(end.x, end.y).mutiplyScalar(dxf.scale), { points, indices, rectIndices } = lineSqueezing(startVec3, endVec3, dxf.width);
+      const startVec3 = new Point(start.x, start.y), endVec3 = new Point(end.x, end.y), { points, indices, rectIndices } = lineSqueezing(startVec3, endVec3, dxf.width);
       return {
         points,
         indices,
@@ -15985,12 +15276,9 @@ class WhiteModel extends Component {
         bevelSize: 0
       });
       if (geometry.attributes.position.array.filter((num) => Number.isNaN(num)).length) return;
-      const mesh = new THREE.Mesh(geometry);
-      this.originalWhiteMode?.add(mesh);
     });
     this.dispatchEvent({
       type: "updateModel",
-      originalWhiteMode: this.originalWhiteMode,
       whiteModelGroup: this.whiteModelGroup
     });
     return this.whiteModelLineGroup;
@@ -16099,101 +15387,6 @@ class WhiteModel extends Component {
     }
   }
 }
-class DetailsPoint extends Component {
-  static name = "DetailsPoint";
-  Dxf = null;
-  WhiteModel = null;
-  Variable = null;
-  desPoints = [];
-  raylines = [];
-  data = [];
-  onAddFromParent(parent) {
-    this.Dxf = parent.findComponentByName("Dxf");
-    this.Variable = parent.findComponentByName("Variable");
-    this.Dxf?.addEventListener("setDta", () => {
-      this.updateModel();
-    });
-  }
-  /**
-   * 设置值
-   * @param data 
-   */
-  async set(data) {
-    if (typeof data === "string") {
-      if (typeof global !== "undefined") {
-        const packageName = "fs";
-        const { default: fs2 } = await import(
-          /* @vite-ignore */
-          packageName
-        );
-        const buffer = fs2.readFileSync(data);
-        const json = JSON.parse(buffer.toString("utf-8"));
-        this.set(json);
-        return;
-      } else {
-        throw new Error("非node环境不允许使用路径");
-      }
-    }
-    this.data = data;
-    this.updateModel();
-  }
-  /**
-   * 设置射线辅助
-   */
-  racasterHelper(position, direction, far) {
-    this.raylines.push([
-      position.clone(),
-      position.clone().add(direction.clone().multiplyScalar(far))
-    ]);
-    direction.z = 0;
-    this.raylines.push([
-      position.clone(),
-      position.clone().add(direction.clone().multiplyScalar(far))
-    ]);
-  }
-  _timer = null;
-  /**
-   * 更新模型
-   */
-  updateModel() {
-    if (this._timer) clearTimeout(this._timer);
-    this._timer = setTimeout(() => {
-      this._timer = null;
-      const whiteModel = this.parent?.findComponentByName("WhiteModel");
-      this.raylines.length = 0;
-      this.desPoints.length = 0;
-      this.data.forEach((item) => {
-        const position = new THREE.Vector3(
-          item.position.x,
-          item.position.y,
-          item.position.z
-        );
-        const direction = new THREE.Vector3(
-          item.direction.x,
-          item.direction.y,
-          item.direction.z
-        );
-        const far = 100;
-        this.racasterHelper(position, direction, far);
-        direction.z = 0;
-        const raycaster = new THREE.Raycaster(position, direction, 0, far);
-        const list = raycaster.intersectObject(whiteModel.originalWhiteMode);
-        if (list.length) {
-          const { point } = list[0];
-          this.desPoints.push({
-            message: item.desc,
-            position,
-            intersection: point
-          });
-        }
-      });
-      this.dispatchEvent({
-        type: "handleSuccess",
-        desPoints: this.desPoints
-      });
-    }, 50);
-  }
-}
 class DxfLineModel extends Component {
   static name = "DxfLineModel";
   dxfLineModel = new THREE.LineSegments();
@@ -16204,16 +15397,22 @@ class DxfLineModel extends Component {
     this.dxfModelGroup.add(this.dxfLineModel);
     this.dxfModelGroup.add(this.dxfDoorsLineModel);
     this.dxfDoorsLineModel.material = new THREE.LineBasicMaterial({ color: 16776960, vertexColors: true });
-    dxf?.addEventListener("lineOffset", () => this.updateMode());
+    dxf?.addEventListener("cadChange", () => this.updateMode());
   }
   updateMode() {
     const dxf = this.parent?.findComponentByName("Dxf");
     this.dxfLineModel.clear();
-    const dxfArray = dxf.to3DArray(1 / dxf.scale, 0);
+    const cad = dxf.cad;
+    const dxfArray = new Float32Array(
+      cad.groups.flatMap((group2) => {
+        if (group2.type !== "unionGroupAll") return [];
+        return group2.lines.flatMap((line) => line.points.flatMap((p) => [p.x, p.y, 0]));
+      })
+    );
     this.dxfLineModel.geometry = new THREE.BufferGeometry().setAttribute("position", new THREE.BufferAttribute(dxfArray, 3, true));
     const doorsArray = new Float32Array(
       dxf.doorLineSegment.flatMap(({ start, end }) => [start.x, start.y, 0, end.x, end.y, 0])
-    ).map((n) => n / dxf.scale);
+    );
     const doorsColorArray = new Float32Array(dxf.doorLineSegment.flatMap(() => [1, 0, 0, 0, 1, 0]));
     this.dxfDoorsLineModel.geometry = new THREE.BufferGeometry().setAttribute("position", new THREE.BufferAttribute(doorsArray, 3, true)).setAttribute("color", new THREE.BufferAttribute(doorsColorArray, 3));
     this.dxfModelGroup.position.z = dxf.originalZAverage;
@@ -16225,19 +15424,16 @@ class DxfLineModel extends Component {
 }
 const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  DetailsPoint,
   DxfLineModel,
   WhiteModel
 }, Symbol.toStringTag, { value: "Module" }));
 function ModelDataPlugin_(dxfSystem, option = {}) {
   const {
-    detailsPoint = true,
     whiteModel = true,
     dxfLineModel = true
   } = option;
   dxfLineModel && dxfSystem.addComponent(new DxfLineModel());
   whiteModel && dxfSystem.addComponent(new WhiteModel());
-  detailsPoint && dxfSystem.addComponent(new DetailsPoint());
 }
 const ModelDataPlugin = Object.assign(ModelDataPlugin_, {
   create(option = {}) {
@@ -16638,12 +15834,9 @@ async function createEditor(dom, camera, orbitControls = false, viewPermission)
   const rp = await loadRenderPlugin();
   const editor = await loadEditorPlugin();
   const dxfSystem = new DxfSystem().usePlugin(mp.ModelDataPlugin.create({
-    detailsPoint: false,
     whiteModel: true
   })).usePlugin(rp.RenderPlugin.create({
-    originalLine: false,
     modelData: false,
-    detailsPoint: false,
     orbitControls,
     camera
   })).usePlugin(editor.EditorPlugin.create({ viewPermission }));
@@ -16687,45 +15880,44 @@ async function buildJson(opt) {
   dxfSystem.usePlugin(mp.ModelDataPlugin);
   const whiteModel = dxfSystem.findComponentByType(mp.components.WhiteModel);
   const threeVJia = dxfSystem.findComponentByName("ThreeVJia");
-  await dxfSystem.Dxf.set(json);
-  if (trajectory) {
-    if (typeof trajectory === "string") {
+  if (itemInfo) {
+    if (typeof itemInfo === "string") {
       if (typeof global !== "undefined") {
         const packageName = "fs";
         const { default: fs2 } = await import(
           /* @vite-ignore */
           packageName
         );
-        const buffer = fs2.readFileSync(trajectory);
-        trajectory = JSON.parse(buffer.toString("utf-8"));
+        const buffer = fs2.readFileSync(itemInfo);
+        itemInfo = JSON.parse(buffer.toString("utf-8"));
       } else throw new Error("非node环境不允许使用路径");
     }
-    dxfSystem.CorrectionDxf.setTrajectory(trajectory);
+    whiteModel?.setItemList(itemInfo);
   }
-  if (itemInfo) {
-    if (typeof itemInfo === "string") {
+  if (opt.axisAlignCorr !== false) dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.AxisAlignCorr);
+  if (trajectory) {
+    if (typeof trajectory === "string") {
       if (typeof global !== "undefined") {
         const packageName = "fs";
         const { default: fs2 } = await import(
           /* @vite-ignore */
           packageName
         );
-        const buffer = fs2.readFileSync(itemInfo);
-        itemInfo = JSON.parse(buffer.toString("utf-8"));
+        const buffer = fs2.readFileSync(trajectory);
+        trajectory = JSON.parse(buffer.toString("utf-8"));
       } else throw new Error("非node环境不允许使用路径");
     }
-    whiteModel?.setItemList(itemInfo);
+    dxfSystem.CorrectionDxf.setTrajectory(trajectory);
   }
-  await dxfSystem.Dxf.axisAlignCorr({
+  await dxfSystem.Dxf.set(json, {
     groupMethod: "cross",
     fittingMethod: "max",
     crossAxistThreshold: 0.08,
     ...axisAlignCorrOption
   });
-  dxfSystem.Dxf.lineOffset();
   download?.json && await dxfSystem.Dxf.downloadOriginalData(download.json);
-  download?.dxf && await dxfSystem.Dxf.download(download.dxf);
-  download?.image && await dxfSystem.Dxf.downloadImage(download.image);
+  download?.dxf && await dxfSystem.Dxf.downloadDxf(download.dxf);
+  download?.image && await dxfSystem.Dxf.downloadDxfImage(download.image);
   download?.correctionJson && await dxfSystem.CorrectionDxf.downloadOriginalData(download.correctionJson);
   download?.correctionDxf && await dxfSystem.CorrectionDxf.downloadDxf(download.correctionDxf);
   download?.correctionImage && await dxfSystem.CorrectionDxf.downloadDxfImage(download.correctionImage);
@@ -16741,7 +15933,7 @@ async function buildJson(opt) {
 async function getFileAll(dxfSystem = gloabalDxfSystem) {
   const whiteModel = dxfSystem.findComponentByName("WhiteModel");
   const jpg = new File([await dxfSystem.CorrectionDxf.toDxfImageBlob()], "img.jpg", { type: "image/jpeg" });
-  const dxf = new File([dxfSystem.Dxf.toDxfBlob()], "dxf.dxf", { type: "application/dxf" });
+  const dxf = new File([dxfSystem.Dxf.toDxfBlob() ?? ""], "dxf.dxf", { type: "application/dxf" });
   const correctionDxf = new File([dxfSystem.CorrectionDxf.toDxfBlob() ?? ""], "dxf.dxf", { type: "application/dxf" });
   const glb = new File([await whiteModel.toGltfBlob(true)], "model.glb", { type: "application/octet-stream" });
   const gltf2 = new File([await whiteModel.toGltfBlob(false)], "model.gltf", { type: "application/json" });
@@ -16764,29 +15956,28 @@ export {
   Box2 as B,
   Component as C,
   DxfSystem as D,
-  Lines as L,
+  LineSegment as L,
   ModelDataPlugin as M,
-  Point as P,
+  PointVirtualGrid as P,
   Quadtree as Q,
   SelectLocalFile as S,
   ThreeVJia as T,
   Variable as V,
   WhiteModel as W,
-  DetailsPoint as a,
-  PointVirtualGrid as b,
+  Point as a,
+  DoorsAnalysisComponent as b,
   cloneUserData as c,
-  DoorsAnalysisComponent as d,
-  LineSegment as e,
-  CommandManager as f,
-  createEditor as g,
-  getModels as h,
-  buildJson as i,
-  getFileAll as j,
-  getGlobalDxfSystem as k,
-  Dxf as l,
-  index$1 as m,
-  index as n,
-  components as o,
+  Lines as d,
+  CommandManager as e,
+  createEditor as f,
+  getModels as g,
+  buildJson as h,
+  getFileAll as i,
+  getGlobalDxfSystem as j,
+  Dxf as k,
+  index$1 as l,
+  index as m,
+  components as n,
   recomputedWindow as r,
   uuid as u
 };