build-dxf 0.1.79 → 0.1.81

package/package.json

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

package/src/DomEventRegister.js

@@ -107,7 +107,7 @@ const _Renderer = class _Renderer extends Component {
     this.description = description;
     const {
       scene = new THREE.Scene(),
-      camera = new THREE.PerspectiveCamera(45, 1, 0.01, 1e3)
+      camera = new THREE.PerspectiveCamera(45, 1, 1e-4, 1e3)
     } = description;
     this.camera = camera;
     this.scene = scene;

package/src/api/index.d.ts

@@ -0,0 +1,22 @@
+import { IRegion, ISpace } from './type';
+export declare function getSpaceListApi(): Promise<ISpace[]>;
+/** 获取区域列表api
+ * @param idSpace
+ * @returns
+ */
+export declare function getRegionListApi(idSpace: String): Promise<IRegion[]>;
+/** 获取名下所有区域列表 api
+ */
+export declare function getRegionListAllApi(): Promise<{
+    regionList: IRegion[][];
+    spaceList: ISpace[];
+}>;
+/**
+ * 更新三维家json
+ */
+export declare function updateThreeJiaJsonApi(body: {
+    schemeContent: string;
+    idRegion: string;
+    models: string;
+    dxf: string;
+}): Promise<boolean>;

package/src/api/type.d.ts

@@ -0,0 +1,30 @@
+export type ModelItemType = "dxf" | "gltf" | "jpg" | "glb" | "originalJson" | "json" | "obj" | "threeVJiaJson" | "publicInfoJson" | "trajectory";
+export interface IModelItem {
+    type: ModelItemType;
+    url: string;
+    data?: any;
+}
+export interface IRegion {
+    idRegion: string;
+    regionName: string;
+    type: string;
+    active: string;
+    createTime: string;
+    updateTime: number;
+    url: string;
+    idSpace: string;
+    username: string;
+    nickName: string;
+    headerImg: string;
+    dxf: string;
+    models: IModelItem[];
+    ext: string;
+    progress: number;
+}
+export interface ISpace {
+    idSpace: string;
+    spaceName: string;
+    accountRole: number;
+    active: number;
+    regionList: IRegion[];
+}

package/src/build.js

@@ -3107,7 +3107,9 @@ class WallInsertObject {
     return item.id ?? item.doorId;
   }
   static getNearId(item) {
-    return item.nearId ?? item.nearDoorId;
+    let nearId = item.nearId ?? item.nearDoorId;
+    if (nearId === -1) nearId = void 0;
+    return nearId;
   }
   /** 遍历孔洞
    * @param line 
@@ -6571,6 +6573,39 @@ class MaxiCircles extends MiniCircles {
     };
   }
 }
+const maxiCircles$1 = new MaxiCircles();
+function buildBayWindowGroup(lines, clear = true) {
+  const bayWindowLines = lines.filter((line) => line.userData.isBayWindow), groupedLineSet = /* @__PURE__ */ new Set();
+  const removeSet = findDiscretePointLine2(lines, null, true);
+  const lines_ = lines.filter((line) => !removeSet.has(line));
+  lines.forEach((line) => {
+    if (LineGroupType.hasType(line, "bayWindow")) {
+      if (line.userData.isWindow) line.currentData.isBayWindowLine = true;
+      LineGroupType.removeByType(line, "bayWindow");
+    }
+  });
+  const grid = createPointVirtualGrid(lines);
+  removeSet.clear();
+  bayWindowLines.forEach((bayWindowLine) => {
+    let { circles } = maxiCircles$1.miniCircle(lines_, { circleEdges: [bayWindowLine] });
+    circles = circles.filter((group) => group.some((line) => line.userData.isWindow && line.currentData.isBayWindowLine));
+    if (circles.length) {
+      grid.queryPolygon(Polygon.fromByLines(circles[0]), "inside").forEach((res) => removeSet.add(res.userData));
+    }
+    const id = uuid();
+    if (circles.length) {
+      const group = circles[0];
+      group.forEach((line) => {
+        clear && LineGroupType.clear(line);
+        LineGroupType.set(line, id, "bayWindow", true);
+        groupedLineSet.add(line);
+      });
+    } else clear && LineGroupType.clear(bayWindowLine);
+  });
+  lines = lines.filter((line) => !removeSet.has(line));
+  clear && lines.forEach((line) => groupedLineSet.has(line) || LineGroupType.clear(line));
+  return lines;
+}
 const maxiCircles = new MaxiCircles();
 let trajectory;
 function isDoublePeDoorCircle(circle) {
@@ -6588,7 +6623,6 @@ function isDoublePeDoorCircle(circle) {
   return matching.length > 0;
 }
 function isPolyHasTrajectoryPoint(lines) {
-  if (isDoublePeDoorCircle(lines)) return true;
   if (!trajectory) return true;
   const ploy = Polygon.fromByLines2(lines);
   const box = ploy.getBox2();
@@ -6599,29 +6633,56 @@ function isPolyHasTrajectoryPoint(lines) {
   }
   return true;
 }
-function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
-  const doorLines = [], otherLines = [], peDoubleDoors = [];
-  for (let i = 0; i < lines_.length; i++) {
-    const line = lines_[i];
+function initData(lines) {
+  const doorLines = [], otherLines = [], bayWindowLines = [], peDoors = [], peDoubleDoors = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
     if (line.userData.isDoor) {
       doorLines.push(line);
       continue;
     }
     if (line.userData.isBayWindow) {
+      bayWindowLines.push(line);
       continue;
     }
     if (line.userData.isPassageEntrance && line.userData.passageEntrance?.length) {
-      const isDoubleDoor = line.userData.passageEntrance.some((item) => typeof WIO.getId(item) === "number");
+      const isDoubleDoor = line.userData.passageEntrance.some((item) => typeof WIO.getNearId(item) === "number");
       if (isDoubleDoor) peDoubleDoors.push(line);
+      else peDoors.push(line);
       continue;
     }
     otherLines.push(line);
   }
-  otherLines.push(...peDoubleDoors);
-  let { internalEdges, circles } = maxiCircles.maxiCircles(otherLines, (circles2) => {
-    return circles2.filter(isPolyHasTrajectoryPoint);
-  });
-  const finalCircles = circles.filter((circle) => circle.length > 3);
+  return { doorLines, otherLines, bayWindowLines, peDoors, peDoubleDoors };
+}
+function getPeDoubleDoorCircles(lines, peDoubleDoorLines) {
+  let allLines = [...lines, ...peDoubleDoorLines];
+  const notFoundLines = [];
+  const circlesList = [];
+  for (let i = 0; i < peDoubleDoorLines.length; i++) {
+    const line = peDoubleDoorLines[i];
+    let { circles } = maxiCircles.miniCircle(allLines, { circleEdges: [line] });
+    const finalCircles = circles.filter(isDoublePeDoorCircle);
+    if (finalCircles.length) circlesList.push(...finalCircles);
+    else notFoundLines.push(line);
+  }
+  return {
+    circlesList,
+    notFoundLines
+  };
+}
+function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
+  const {
+    doorLines,
+    otherLines,
+    // bayWindowLines,
+    // peDoors,
+    peDoubleDoors
+  } = initData(lines_);
+  const { notFoundLines, circlesList } = getPeDoubleDoorCircles(otherLines, peDoubleDoors);
+  otherLines.push(...notFoundLines);
+  let { internalEdges, circles } = maxiCircles.maxiCircles(otherLines, (circles2) => circles2.filter(isPolyHasTrajectoryPoint));
+  const { circles: finalCircles } = maxiCircles.mergeCircles([...circlesList, ...circles], internalEdges);
   lines_.forEach((line) => LineGroupType.removeByTypes(line, ["doubleWall", "wall"]));
   const grid = new PointVirtualGrid(), finalCirclesSet = new Set(finalCircles.flat(2));
   otherLines.forEach((line) => !finalCirclesSet.has(line) && grid.insert(line.center, line));
@@ -6650,38 +6711,6 @@ const buildDoubleWallGroup = Object.assign(buildDoubleWallGroup_, {
     else trajectory = void 0;
   }
 });
-function buildBayWindowGroup(lines, clear = true) {
-  const bayWindowLines = lines.filter((line) => line.userData.isBayWindow), groupedLineSet = /* @__PURE__ */ new Set();
-  const removeSet = findDiscretePointLine2(lines, null, true);
-  const lines_ = lines.filter((line) => !removeSet.has(line));
-  lines.forEach((line) => {
-    if (LineGroupType.hasType(line, "bayWindow")) {
-      if (line.userData.isWindow) line.currentData.isBayWindowLine = true;
-      LineGroupType.removeByType(line, "bayWindow");
-    }
-  });
-  const grid = createPointVirtualGrid(lines);
-  removeSet.clear();
-  bayWindowLines.forEach((bayWindowLine) => {
-    let { circles } = maxiCircles.miniCircle(lines_, { circleEdges: [bayWindowLine] });
-    circles = circles.filter((group) => group.some((line) => line.userData.isWindow && line.currentData.isBayWindowLine));
-    if (circles.length) {
-      grid.queryPolygon(Polygon.fromByLines(circles[0]), "inside").forEach((res) => removeSet.add(res.userData));
-    }
-    const id = uuid();
-    if (circles.length) {
-      const group = circles[0];
-      group.forEach((line) => {
-        clear && LineGroupType.clear(line);
-        LineGroupType.set(line, id, "bayWindow", true);
-        groupedLineSet.add(line);
-      });
-    } else clear && LineGroupType.clear(bayWindowLine);
-  });
-  lines = lines.filter((line) => !removeSet.has(line));
-  clear && lines.forEach((line) => groupedLineSet.has(line) || LineGroupType.clear(line));
-  return lines;
-}
 class DoubleWallHelper {
   static errorAngle = 4;
   /** 线段投影分析
@@ -8484,7 +8513,7 @@ class AxisAlignCorr {
   }
 }
 function shortDistanceLink(lines, radius = 0.1) {
-  const dpLines = [...findDiscretePointLine2(lines.filter((line) => !line.userData.isDoor), void 0, false)], pointVirtualGrid = createPointVirtualGrid(dpLines), appendLines = [], visited = /* @__PURE__ */ new Set();
+  const dpSet = findDiscretePoint(lines.filter((line) => !line.userData.isDoor)), pointVirtualGrid = createPointVirtualGrid(dpSet.map((v2) => v2)), appendLines = [], visited = /* @__PURE__ */ new Set();
   const getWeight2 = (target, point2, line) => {
     if (target.weight) return target.weight;
     const targetLine = target.userData, targetPoint = target.point;
@@ -8492,24 +8521,21 @@ function shortDistanceLink(lines, radius = 0.1) {
     target.weight = weight;
     return weight;
   };
-  for (let i = 0; i < dpLines.length; i++) {
-    const line = dpLines[i];
+  for (const [point2, line] of dpSet) {
     if (line.userData.isDoor) continue;
-    line.points.forEach((point2) => {
-      if (visited.has(point2)) return false;
-      const list = pointVirtualGrid.queryCircle(point2, radius, true).map((item) => Object.assign({}, item)).filter((item) => {
-        const targetLine2 = item.userData, targetPoint2 = item.point, direct1 = line.getAnotherPoint(point2).directionFrom(point2), direct2 = targetLine2.getAnotherPoint(targetPoint2).directionFrom(targetPoint2), angle = direct1.angleBetween(direct2, "angle");
-        return angle > 90;
-      }).sort((a2, b4) => getWeight2(b4, point2, line) - getWeight2(a2, point2, line));
-      if (list.length === 0) return;
-      const { point: targetPoint } = list[0];
-      const targetLine = list[0].userData;
-      visited.add(point2);
-      visited.add(targetPoint);
-      const projectLine1 = line.projectLineSegment(targetLine), projectLine2 = targetLine.projectLineSegment(line), len1 = projectLine1.length(), len2 = projectLine2.length();
-      if (len1 === 0 && len2 === 0) appendLines.push(new LineSegment(point2.clone(), list[0].point.clone()));
-      else appendLines.push(new LineSegment(projectLine1.center, projectLine2.center));
-    });
+    if (visited.has(point2)) continue;
+    const list = pointVirtualGrid.queryCircle(point2, radius, true).map((item) => Object.assign({}, item)).filter((item) => {
+      const targetLine2 = item.userData, targetPoint2 = item.point, direct1 = line.getAnotherPoint(point2).directionFrom(point2), direct2 = targetLine2.getAnotherPoint(targetPoint2).directionFrom(targetPoint2), angle = direct1.angleBetween(direct2, "angle");
+      return angle > 90;
+    }).sort((a2, b4) => getWeight2(b4, point2, line) - getWeight2(a2, point2, line));
+    if (list.length === 0) continue;
+    const { point: targetPoint } = list[0];
+    const targetLine = list[0].userData;
+    visited.add(point2);
+    visited.add(targetPoint);
+    const projectLine1 = line.projectLineSegment(targetLine), projectLine2 = targetLine.projectLineSegment(line), len1 = projectLine1.length(), len2 = projectLine2.length();
+    if (len1 === 0 && len2 === 0) appendLines.push(new LineSegment(point2.clone(), list[0].point.clone()));
+    else appendLines.push(new LineSegment(projectLine1.center, projectLine2.center));
   }
   return [...lines, ...appendLines];
 }
@@ -8645,9 +8671,7 @@ function axisAlignCorr$1(lines, targettLine, option) {
   if (wallGroup) {
     newLines = DoubleWallHelper.complementSide(newLines);
     WallInsertObject.recomputed(newLines);
-    TEST = true;
     newLines = buildDoubleWallGroup(newLines, true);
-    TEST = false;
     newLines = buildBayWindowGroup(newLines, false);
   }
   new WallInsertObject(lines).recomputed().merge();
@@ -19267,21 +19291,17 @@ function removeShortDoubleWall(lineSegments) {
   const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall"), freePointLines = [...findDiscretePointLine2(lineSegments)].filter((line) => line.length() < 0.3), grid = createPointVirtualGrid(doubleWalls.flat(4)), lines = freePointLines.filter((line) => grid.queryPoint(line.start).length > 0 || grid.queryPoint(line.end).length > 0), removeSet = new Set(lines);
   return lineSegments.filter((line) => !removeSet.has(line));
 }
-function connectionCorr(point2, next, line, width) {
+function getNextPoint(point2, line, next, width) {
   if (next.length === 0) {
     const direct = point2.directionFrom(line.getAnotherPoint(point2));
-    point2.add(direct.multiplyScalar(width));
-    return true;
+    return point2.clone().add(direct.multiplyScalar(width));
   }
   const p2 = next[0].userData.projectPoint(point2, false);
   if (!p2) return false;
-  point2.copy(p2);
-  next.forEach((d2) => d2.point.copy(p2));
-  return true;
+  return p2;
 }
-function stepElimination$1(lineSegments, callBack) {
+function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
   const grid = createPointVirtualGrid(lineSegments);
-  const minWidth = 0.1;
   function getIntersInfo(line, point2) {
     const intersList = grid.queryPoint(point2, true);
     if (intersList.length == 0) return;
@@ -19300,7 +19320,6 @@ function stepElimination$1(lineSegments, callBack) {
     }
     if (count !== 1) return;
     if (!firstLine || !firstPoint) return;
-    if (parallel2.length !== 0) return;
     const firstOtherPoint = firstLine.getAnotherPoint(firstPoint);
     const nextResult = grid.queryPoint(firstOtherPoint, true);
     return {
@@ -19318,7 +19337,7 @@ function stepElimination$1(lineSegments, callBack) {
   for (let i = 0; i < lineSegments.length; i++) {
     const line = lineSegments[i];
     const len = line.length();
-    if (len > minWidth) continue;
+    if (len > findMinWidth) continue;
     const startInfo = getIntersInfo(line, line.start);
     if (!startInfo) continue;
     const endInfo = getIntersInfo(line, line.end);
@@ -19336,13 +19355,28 @@ function stepElimination$1(lineSegments, callBack) {
       mainInfo = endInfo;
       secondaryInfo = startInfo;
     }
-    const oldLine = mainInfo.firstLine.clone();
-    if (!connectionCorr(mainInfo.firstPoint, secondaryInfo.next, mainInfo.firstLine, secondaryInfo.length)) continue;
-    removeLines.push(secondaryInfo.firstLine, line);
-    secondaryInfo.firstLine.points.forEach((p2) => grid.remove(p2));
+    const parallel2 = startInfo.parallel.concat(endInfo.parallel);
+    const newPoint = getNextPoint(mainInfo.firstPoint, mainInfo.firstLine, secondaryInfo.next, secondaryInfo.length);
+    if (!newPoint) continue;
+    removeLines.push(line);
     line.points.forEach((p2) => grid.remove(p2));
-    mainInfo.firstLine.points.forEach((p2) => grid.update(p2));
-    if (typeof callBack === "function") callBack(mainInfo.firstLine, line, secondaryInfo.firstLine, oldLine);
+    if (parallel2.length === 0) {
+      const oldLine = mainInfo.firstLine.clone();
+      mainInfo.firstPoint.copy(newPoint);
+      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
+      removeLines.push(secondaryInfo.firstLine);
+      secondaryInfo.firstLine.points.forEach((p2) => grid.remove(p2));
+      mainInfo.firstLine.points.forEach((p2) => grid.update(p2));
+      if (typeof onMerge === "function") onMerge(mainInfo.firstLine, line, secondaryInfo.firstLine, oldLine);
+    } else {
+      secondaryInfo.firstPoint.copy(mainInfo.firstPoint);
+      secondaryInfo.firstOtherPoint.copy(newPoint);
+      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
+      startInfo.parallel.concat(endInfo.parallel).forEach((item) => item.point.copy(mainInfo.firstPoint));
+      secondaryInfo.firstLine.points.forEach((p2) => grid.update(p2));
+      secondaryInfo.next.forEach((d2) => grid.update(d2.point));
+      startInfo.parallel.concat(endInfo.parallel).forEach((item) => grid.update(item.point));
+    }
   }
   const removeLinesSet = new Set(removeLines);
   lineSegments = lineSegments.filter((line) => !removeLinesSet.has(line));
@@ -19353,32 +19387,32 @@ function repetitiveTask(count, callfun) {
     callfun(i);
   }
 }
-function stepElimination(lines, opt) {
-  repetitiveTask(2, () => {
-    lines = stepElimination$1(lines, (target, _, source, oldLine) => {
-      if (source.userData.isDoor) WallInsertObject.addInsertObject(target, {
-        p: source.center.toJson(opt?.originalZ),
-        width: source.length(),
-        full: false,
-        type: "door",
-        height: source.userData.drawDoorData.height,
-        groundClearance: source.userData.drawDoorData.groundClearance
-      });
-      if (target.userData.isDoor) {
-        delete target.userData.isDoor;
-        WallInsertObject.addInsertObject(target, {
-          p: oldLine.center.toJson(opt?.originalZ),
-          width: oldLine.length(),
-          full: false,
-          type: "door",
-          height: target.userData.drawDoorData?.height,
-          groundClearance: target.userData.drawDoorData?.groundClearance ?? 0
-        });
-      }
-      WallInsertObject.copyInsertObject(target, source);
-      WallInsertObject.recomputed([target]);
-    });
+function stepEliminationMerge(target, _, source, oldLine) {
+  if (source.userData.isDoor) WallInsertObject.addInsertObject(target, {
+    p: source.center.toJson(),
+    width: source.length(),
+    full: false,
+    type: "door",
+    height: source.userData.drawDoorData.height,
+    groundClearance: source.userData.drawDoorData.groundClearance
   });
+  if (target.userData.isDoor) {
+    delete target.userData.isDoor;
+    WallInsertObject.addInsertObject(target, {
+      p: oldLine.center.toJson(),
+      width: oldLine.length(),
+      full: false,
+      type: "door",
+      height: target.userData.drawDoorData?.height,
+      groundClearance: target.userData.drawDoorData?.groundClearance ?? 0
+    });
+  }
+  WallInsertObject.copyInsertObject(target, source);
+  WallInsertObject.recomputed([target]);
+}
+function linesSmoothing(lines, _) {
+  repetitiveTask(2, () => lines = stepElimination(lines, 0.1, stepEliminationMerge));
+  WallInsertObject.recomputed(lines);
   return lines;
 }
 const PRE_PROCESSOR = {
@@ -19399,9 +19433,9 @@ const PRE_PROCESSOR = {
   /** 处理门线垂直方向有其他线段遮挡的情况
    */
   DoorSpaceHandle: doorSpaceHandle,
-  /** 阶梯合并
+  /** 线段平滑处理
    */
-  StepElimination: stepElimination,
+  LinesSmoothing: linesSmoothing,
   /** 移除与双线墙链接的短线段
    */
   RemoveShortDoubleWall: removeShortDoubleWall
@@ -22142,7 +22176,7 @@ async function buildJson(opt) {
   doorFind && (dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorSpaceHandle), dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorFind), dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorSpaceHandle));
   if (opt.axisAlignCorr !== false) {
     dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.AxisAlignCorr);
-    dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.StepElimination);
+    dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.LinesSmoothing);
     dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.RemoveShortDoubleWall);
   }
   if (trajectory2) {

package/src/index3.js

@@ -17248,9 +17248,20 @@ class StorageHelper {
     if (typeof v === "number") return v;
     return Number(v);
   }
+  static getJson(key, defaultValue) {
+    const v = this.get(key, defaultValue);
+    try {
+      if (v) return JSON.parse(v);
+    } catch (error) {
+    }
+    return defaultValue;
+  }
   static set(key, vaalue) {
     localStorage.setItem(key, String(vaalue));
   }
+  static setJson(key, value) {
+    this.set(key, JSON.stringify(value));
+  }
 }
 const _hoisted_1 = ["innerHTML"];
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/src/utils/DxfSystem/components/CorrectionDxf.d.ts

@@ -15,7 +15,7 @@ export declare class CorrectionDxf<TEventMap extends {} = {}> extends Dxf<{} & T
         DoubleWallAlignment: typeof import('../utils/lineHandle/CadPreProcessor/doubleWallAlignment').doubleWallAlignment;
         WallHeightHandle: typeof import('../utils/lineHandle/CadPreProcessor/wallHeightHandle').wallHeightHandle;
         DoorSpaceHandle: typeof import('../utils/lineHandle/CadPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        StepElimination: typeof import('../utils/lineHandle/CadPreProcessor/stepElimination').stepElimination;
+        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/linesSmoothing').linesSmoothing;
         RemoveShortDoubleWall: typeof import('../utils/lineHandle/CadPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     rotateCorrCad?: CAD;

package/src/utils/DxfSystem/components/Dxf.d.ts

@@ -29,7 +29,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
         DoubleWallAlignment: typeof import('../utils/lineHandle/CadPreProcessor/doubleWallAlignment').doubleWallAlignment;
         WallHeightHandle: typeof import('../utils/lineHandle/CadPreProcessor/wallHeightHandle').wallHeightHandle;
         DoorSpaceHandle: typeof import('../utils/lineHandle/CadPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        StepElimination: typeof import('../utils/lineHandle/CadPreProcessor/stepElimination').stepElimination;
+        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/linesSmoothing').linesSmoothing;
         RemoveShortDoubleWall: typeof import('../utils/lineHandle/CadPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     width: number;

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/index.d.ts

@@ -6,7 +6,7 @@ import { doubleWallAlignment } from './doubleWallAlignment';
 import { wallHeightHandle } from './wallHeightHandle';
 import { doorSpaceHandle } from './doorSpaceHandle';
 import { removeShortDoubleWall } from './removeShortDoubleWall';
-import { stepElimination } from './stepElimination';
+import { linesSmoothing } from './linesSmoothing';
 /**
  * 默认提供的预处理函数
  */
@@ -28,9 +28,9 @@ export declare const PRE_PROCESSOR: {
     /** 处理门线垂直方向有其他线段遮挡的情况
      */
     DoorSpaceHandle: typeof doorSpaceHandle;
-    /** 阶梯合并
+    /** 线段平滑处理
      */
-    StepElimination: typeof stepElimination;
+    LinesSmoothing: typeof linesSmoothing;
     /** 移除与双线墙链接的短线段
      */
     RemoveShortDoubleWall: typeof removeShortDoubleWall;

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/{stepElimination.d.ts → linesSmoothing.d.ts}

@@ -1,3 +1,3 @@
 import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
 import { SetDataOption } from '../../../type';
-export declare function stepElimination(lines: LineSegment[], opt?: SetDataOption): LineSegment<Record<string, any>>[];
+export declare function linesSmoothing(lines: LineSegment[], _?: SetDataOption): LineSegment<Record<string, any>>[];

package/src/utils/DxfSystem/utils/lineHandle/buildGroup/buildBayWindowGroup.d.ts

@@ -0,0 +1,7 @@
+import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
+import { LineUserData } from '../../../type';
+/** 构建飘窗组组结构
+ * @param lines
+ * @returns
+ */
+export declare function buildBayWindowGroup(lines: LineSegment<LineUserData>[], clear?: boolean): LineSegment<LineUserData>[];

package/src/utils/DxfSystem/utils/lineHandle/{buildGroup.d.ts → buildGroup/buildDoubleWallGroup.d.ts}

@@ -1,5 +1,5 @@
-import { LineSegment } from '../../../algorithmsStructures/LineSegment';
-import { LineUserData } from '../../type';
+import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
+import { LineUserData } from '../../../type';
 /** 双线墙
  * @param lines_
  * @param clearInternalLine
@@ -10,8 +10,3 @@ export declare function buildDoubleWallGroup_(lines_: LineSegment<LineUserData>[
 export declare const buildDoubleWallGroup: typeof buildDoubleWallGroup_ & {
     setTrajectory(trajectory_: Record<string, any> | undefined): void;
 };
-/** 构建飘窗组组结构
- * @param lines
- * @returns
- */
-export declare function buildBayWindowGroup(lines: LineSegment<LineUserData>[], clear?: boolean): LineSegment<LineUserData>[];

package/src/utils/DxfSystem/utils/lineHandle/buildGroup/index.d.ts

@@ -0,0 +1,2 @@
+export * from './buildBayWindowGroup';
+export * from './buildDoubleWallGroup';

package/src/utils/DxfSystem/utils/tools/WallInsertObject.d.ts

@@ -2,7 +2,7 @@ import { LineSegment } from '../../../algorithmsStructures/LineSegment';
 import { InsertObject, LineUserData } from '../../type';
 type InsertObjectKey = 'drawWindow' | 'passageEntrance';
 /**
- * 墙体嵌入物（窗户、空洞）
+ * 墙体嵌入物（窗户、空洞）处理
  */
 export declare class WallInsertObject {
     static mountedObjectType: never[];

package/src/utils/algorithmsStructures/mergeUShapedPath.d.ts

@@ -0,0 +1,6 @@
+import { LineSegment } from './LineSegment';
+/** 合并U形路径
+ * @param lineSegments
+ * @returns
+ */
+export declare function mergeUShapedPath(lineSegments: LineSegment[], findMinWidth?: number, onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];

package/src/utils/algorithmsStructures/stepElimination.d.ts

@@ -3,4 +3,4 @@ import { LineSegment } from './LineSegment';
  * @param lineSegments
  * @returns
  */
-export declare function stepElimination(lineSegments: LineSegment[], callBack?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];
+export declare function stepElimination(lineSegments: LineSegment[], findMinWidth?: number, onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];

package/src/utils/tools/StorageHelper.d.ts

@@ -2,5 +2,7 @@ export declare class StorageHelper {
     static get(key: string, defaultValue?: any): any;
     static getBoolean(key: string, defaultValue?: boolean): boolean;
     static getNumber(key: string, defaultValue?: number): number;
+    static getJson<T = any>(key: string, defaultValue: T): any;
     static set(key: string, vaalue: any): void;
+    static setJson<T = any>(key: string, value: T): void;
 }

package/src/utils/tools/getJson.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 获取json
+ * @param url
+ */
+export declare function getJson(url: string): Promise<any>;