build-dxf 0.1.31 → 0.1.33

package/package.json

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

package/src/DomEventRegister.js

@@ -7,7 +7,7 @@ import { CSS3DObject, CSS3DSprite, CSS3DRenderer } from "three/addons/renderers/
 import { CSS2DObject, CSS2DRenderer } from "three/addons/renderers/CSS2DRenderer.js";
 import { OrbitControls } from "three/addons/controls/OrbitControls.js";
 import * as TWEEN from "@tweenjs/tween.js";
-import { C as Component, a as Point, h as getDefaultExportFromCjs, A as ArrayMap, V as Variable } from "./build.js";
+import { C as Component, a as Point, i as getDefaultExportFromCjs, A as ArrayMap, V as Variable } from "./build.js";
 import { ref } from "vue";
 class DomContainer extends Component {
   static name = "DomContainer";
@@ -250,8 +250,9 @@ const _Renderer = class _Renderer extends Component {
    */
   createCircle(point, parameters, parent) {
     const vertices = [];
-    if (Array.isArray(point)) point.forEach((p) => vertices.push(p.x, p.y, 0));
-    else vertices.push(point.x, point.y, 0);
+    if (Array.isArray(point)) point.forEach((p) => vertices.push(p.x, p.y, p.z ?? 0));
+    else if (point instanceof Point) vertices.push(point.x, point.y, 0);
+    else vertices.push(point.x, point.y, point.z);
     const geometry = new THREE.BufferGeometry();
     geometry.setAttribute("position", new THREE.Float32BufferAttribute(vertices, 3));
     const material = new THREE.PointsMaterial({
@@ -1382,7 +1383,7 @@ class DomEventRegister extends Component {
     return this;
   }
   destroy() {
-    this.canceEventRecord("destory");
+    this.cancelEventRecord("destory");
   }
   /**
    * 

package/src/build.js

@@ -33,6 +33,14 @@ class EventDispatcher extends EventDispatcher$1 {
   }
   eventRecordStack = /* @__PURE__ */ new Map();
   addEventRecord(name, ...cancels) {
+    if (Array.isArray(name)) {
+      const list = name.map((n) => this.addEventRecord(n, ...cancels));
+      const add2 = (cancel) => {
+        list.forEach(({ add: add3 }) => add3(cancel));
+        return { add: add2 };
+      };
+      return { add: add2 };
+    }
     if (!this.eventRecordStack.has(name)) this.eventRecordStack.set(name, []);
     cancels.forEach((cancel) => {
       this.eventRecordStack.get(name)?.push(cancel);
@@ -43,7 +51,7 @@ class EventDispatcher extends EventDispatcher$1 {
     };
     return { add };
   }
-  canceEventRecord(name) {
+  cancelEventRecord(name) {
     const list = this.eventRecordStack.get(name);
     if (list) {
       list.reverse().forEach((cancel) => cancel());
@@ -2205,6 +2213,9 @@ class Point {
     this.y = y;
     return this;
   }
+  setByDirect(direct, origin, width) {
+    origin.clone().add(direct.clone().multiplyScalar(width));
+  }
   setX(x) {
     this.x = x;
     return this;
@@ -15675,6 +15686,32 @@ class Lines extends THREE.LineSegments {
     this.points.length = 0;
     this.addPoint(...points);
   }
+  setColor(color) {
+    if (this.material.color instanceof THREE.Color) this.material.color.setHex(color);
+    else this.material.color = new THREE.Color(color);
+  }
+  setOpacity(opacity) {
+    this.material.transparent = true;
+    this.material.opacity = opacity;
+  }
+  getCenter(startIndex, endIndex) {
+    endIndex = endIndex ?? startIndex;
+    if (startIndex <= this.points.length - 1 && endIndex <= this.points.length - 1) {
+      const start = this.points[startIndex];
+      const end = this.points[endIndex];
+      return start.clone().add(end).multiplyScalar(0.5);
+    }
+    throw new Error("索引不在可取范围");
+  }
+  getDistance(startIndex, endIndex) {
+    endIndex = endIndex ?? startIndex;
+    if (startIndex <= this.points.length - 1 && endIndex <= this.points.length - 1) {
+      const start = this.points[startIndex];
+      const end = this.points[endIndex];
+      return start.distanceTo(end);
+    }
+    throw new Error("索引不在可取范围");
+  }
   _timer = null;
   updateGeometry() {
     if (this._timer) clearTimeout(this._timer);
@@ -19081,7 +19118,6 @@ async function buildJson(opt) {
         itemInfo = JSON.parse(buffer.toString("utf-8"));
       } else throw new Error("非node环境不允许使用路径");
     }
-    whiteModel?.setItemList(itemInfo);
   }
   doorFind && dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorFind);
   if (opt.axisAlignCorr !== false) dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.AxisAlignCorr);
@@ -19102,7 +19138,9 @@ async function buildJson(opt) {
     groupMethod: "cross",
     fittingMethod: "max",
     crossAxistThreshold: 0.08,
+    wallGroup: true,
     ...axisAlignCorrOption,
+    publicInfo: itemInfo,
     trajectory
   });
   download?.json && await dxfSystem.Dxf.downloadOriginalData(download.json);
@@ -19159,20 +19197,21 @@ export {
   Point as a,
   LineSegment as b,
   cloneUserData as c,
-  Lines as d,
-  drawText$1 as e,
-  PRE_PROCESSOR as f,
-  CommandManager as g,
-  getDefaultExportFromCjs as h,
-  createEditor as i,
-  getModels as j,
-  buildJson as k,
-  getFileAll as l,
-  getGlobalDxfSystem as m,
-  index$1 as n,
-  index as o,
-  DxfSystem as p,
-  components as q,
+  createQuadtree as d,
+  Lines as e,
+  drawText$1 as f,
+  PRE_PROCESSOR as g,
+  CommandManager as h,
+  getDefaultExportFromCjs as i,
+  createEditor as j,
+  getModels as k,
+  buildJson as l,
+  getFileAll as m,
+  getGlobalDxfSystem as n,
+  index$1 as o,
+  index as p,
+  DxfSystem as q,
   recomputedWindow as r,
+  components as s,
   uuid as u
 };

package/src/components/NumberEditor.vue.d.ts

@@ -0,0 +1,21 @@
+type __VLS_Props = {
+    showCancel?: boolean;
+};
+declare const __VLS_defaults: {
+    modelValue: string;
+};
+type __VLS_PublicProps = {
+    modelValue?: typeof __VLS_defaults['modelValue'];
+} & __VLS_Props;
+declare const _default: import('vue').DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    cancel: (...args: any[]) => void;
+    confirm: (...args: any[]) => void;
+    "update:modelValue": (value: string) => void;
+}, string, import('vue').PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+    onCancel?: ((...args: any[]) => any) | undefined;
+    onConfirm?: ((...args: any[]) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: string) => any) | undefined;
+}>, {
+    showCancel: boolean;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
+export default _default;

package/src/index.css

@@ -2,6 +2,9 @@
 @layer properties {
   @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
+      --tw-translate-x: 0;
+      --tw-translate-y: 0;
+      --tw-translate-z: 0;
       --tw-rotate-x: initial;
       --tw-rotate-y: initial;
       --tw-rotate-z: initial;
@@ -10,6 +13,7 @@
       --tw-border-style: solid;
       --tw-leading: initial;
       --tw-font-weight: initial;
+      --tw-outline-style: solid;
       --tw-blur: initial;
       --tw-brightness: initial;
       --tw-contrast: initial;
@@ -23,7 +27,6 @@
       --tw-drop-shadow-color: initial;
       --tw-drop-shadow-alpha: 100%;
       --tw-drop-shadow-size: initial;
-      --tw-outline-style: solid;
     }
   }
 }
@@ -65,6 +68,19 @@
   .btn:active {
     transform: scale(.7);
   }
+
+  .slide-fade-enter-active {
+    transition: all .3s ease-out;
+  }
+
+  .slide-fade-leave-active {
+    transition: all .8s cubic-bezier(1, .5, .8, 1);
+  }
+
+  .slide-fade-enter-from, .slide-fade-leave-to {
+    opacity: 0;
+    transform: translateX(20px);
+  }
 }
 
 @layer components, utilities;
@@ -85,6 +101,10 @@
   position: absolute;
 }
 
+.fixed {
+  position: fixed;
+}
+
 .relative {
   position: relative;
 }
@@ -101,6 +121,14 @@
   top: 10px;
 }
 
+.top-\[50\%\] {
+  top: 50%;
+}
+
+.right-\[0px\] {
+  right: 0;
+}
+
 .right-\[10px\] {
   right: 10px;
 }
@@ -129,6 +157,10 @@
   left: 20px;
 }
 
+.z-20 {
+  z-index: 20;
+}
+
 .z-100 {
   z-index: 100;
 }
@@ -137,10 +169,38 @@
   z-index: 11;
 }
 
+.z-\[18\] {
+  z-index: 18;
+}
+
 .z-\[20\] {
   z-index: 20;
 }
 
+.col-start-1 {
+  grid-column-start: 1;
+}
+
+.col-start-4 {
+  grid-column-start: 4;
+}
+
+.col-end-3 {
+  grid-column-end: 3;
+}
+
+.col-end-4 {
+  grid-column-end: 4;
+}
+
+.row-start-3 {
+  grid-row-start: 3;
+}
+
+.row-end-5 {
+  grid-row-end: 5;
+}
+
 .container {
   width: 100%;
 }
@@ -262,6 +322,11 @@
   height: 30px;
 }
 
+.size-\[40px\] {
+  width: 40px;
+  height: 40px;
+}
+
 .h-\[20px\] {
   height: 20px;
 }
@@ -326,6 +391,11 @@
   flex-shrink: 1;
 }
 
+.translate-y-\[-50\%\] {
+  --tw-translate-y: -50%;
+  translate: var(--tw-translate-x) var(--tw-translate-y);
+}
+
 .rotate-90 {
   rotate: 90deg;
 }
@@ -346,6 +416,14 @@
   resize: both;
 }
 
+.grid-cols-4 {
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+}
+
+.grid-rows-4 {
+  grid-template-rows: repeat(4, minmax(0, 1fr));
+}
+
 .flex-col {
   flex-direction: column;
 }
@@ -362,6 +440,10 @@
   align-items: center;
 }
 
+.items-end {
+  align-items: flex-end;
+}
+
 .justify-between {
   justify-content: space-between;
 }
@@ -374,6 +456,10 @@
   justify-content: flex-end;
 }
 
+.gap-\[0px\] {
+  gap: 0;
+}
+
 .gap-\[5px\] {
   gap: 5px;
 }
@@ -382,6 +468,14 @@
   gap: 10px;
 }
 
+.gap-\[16px\] {
+  gap: 16px;
+}
+
+.gap-\[20px\] {
+  gap: 20px;
+}
+
 .overflow-hidden {
   overflow: hidden;
 }
@@ -442,19 +536,35 @@
   border-top-width: 1px;
 }
 
-.border-b-1 {
+.border-b, .border-b-1 {
   border-bottom-style: var(--tw-border-style);
   border-bottom-width: 1px;
 }
 
+.\!border-\[var\(--primary-color\)\] {
+  border-color: var(--primary-color) !important;
+}
+
+.border-\[\#00ff0a\] {
+  border-color: #00ff0a;
+}
+
 .border-\[\#ccc\] {
   border-color: #ccc;
 }
 
+.border-\[\#fff\] {
+  border-color: #fff;
+}
+
 .border-t-\[\#eee\] {
   border-top-color: #eee;
 }
 
+.border-b-\[\#ccc\] {
+  border-bottom-color: #ccc;
+}
+
 .border-b-\[\#eee\] {
   border-bottom-color: #eee;
 }
@@ -463,6 +573,10 @@
   background-color: var(--primary-color) !important;
 }
 
+.bg-\[\#717171\] {
+  background-color: #717171;
+}
+
 .bg-\[\#ccc\] {
   background-color: #ccc;
 }
@@ -479,6 +593,10 @@
   background-color: var(--el-color-primary);
 }
 
+.bg-\[var\(--primary-color\)\] {
+  background-color: var(--primary-color);
+}
+
 .bg-\[whitesmoke\] {
   background-color: #f5f5f5;
 }
@@ -497,7 +615,15 @@
   }
 }
 
-.p-\[0_5px\], .p-\[0px_5px\] {
+.p-\[0_5px\] {
+  padding: 0 5px;
+}
+
+.p-\[0px\] {
+  padding: 0;
+}
+
+.p-\[0px_5px\] {
   padding: 0 5px;
 }
 
@@ -513,10 +639,18 @@
   padding: 5px;
 }
 
+.p-\[5px_40px\] {
+  padding: 5px 40px;
+}
+
 .p-\[10px\] {
   padding: 10px;
 }
 
+.p-\[40px\] {
+  padding: 40px;
+}
+
 .pt-\[5px\] {
   padding-top: 5px;
 }
@@ -537,6 +671,15 @@
   font-size: 14px;
 }
 
+.text-\[16px\] {
+  font-size: 16px;
+}
+
+.\!leading-\[88px\] {
+  --tw-leading: 88px !important;
+  line-height: 88px !important;
+}
+
 .leading-\[1\.4em\] {
   --tw-leading: 1.4em;
   line-height: 1.4em;
@@ -547,6 +690,16 @@
   line-height: 20px;
 }
 
+.leading-\[30px\] {
+  --tw-leading: 30px;
+  line-height: 30px;
+}
+
+.leading-\[40px\] {
+  --tw-leading: 40px;
+  line-height: 40px;
+}
+
 .font-bold {
   --tw-font-weight: var(--font-weight-bold);
   font-weight: var(--font-weight-bold);
@@ -580,6 +733,10 @@
   color: #fff;
 }
 
+.text-\[red\] {
+  color: red;
+}
+
 .text-white {
   color: var(--color-white);
 }
@@ -588,6 +745,11 @@
   opacity: .3;
 }
 
+.outline-0 {
+  outline-style: var(--tw-outline-style);
+  outline-width: 0;
+}
+
 .blur {
   --tw-blur: blur(8px);
   filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
@@ -615,6 +777,12 @@
   transition-duration: var(--tw-duration, var(--default-transition-duration));
 }
 
+.transition-colors {
+  transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
+  transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+  transition-duration: var(--tw-duration, var(--default-transition-duration));
+}
+
 .select-none {
   -webkit-user-select: none;
   user-select: none;
@@ -643,6 +811,29 @@
   scale: .8;
 }
 
+.active\:grayscale-75:active {
+  --tw-grayscale: grayscale(75%);
+  filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+}
+
+@property --tw-translate-x {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0;
+}
+
+@property --tw-translate-y {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0;
+}
+
+@property --tw-translate-z {
+  syntax: "*";
+  inherits: false;
+  initial-value: 0;
+}
+
 @property --tw-rotate-x {
   syntax: "*";
   inherits: false
@@ -684,6 +875,12 @@
   inherits: false
 }
 
+@property --tw-outline-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+
 @property --tw-blur {
   syntax: "*";
   inherits: false
@@ -750,16 +947,46 @@
   inherits: false
 }
 
-@property --tw-outline-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}
-
 * {
     -webkit-tap-highlight-color: transparent;
 }
 
+ul li[data-v-a77398cf]{
+    background: white; 
+    line-height: 44px;
+    text-align: center;
+    border-radius: 6px;
+    font-size: 20px;
+}
+ul li[data-v-a77398cf]:active {
+    background: #eee;
+}
+.confirm[data-v-a77398cf] {
+    background:  var(--primary-color);
+    color: #fff;
+}
+.confirm[data-v-a77398cf]:active {
+    filter: grayscale(0.4);
+    background:  var(--primary-color);
+}
+.flashing-ani[data-v-a77398cf] {
+    animation: flashing-a77398cf 1s linear infinite;
+}
+@keyframes flashing-a77398cf {
+0% {
+        opacity: 1;
+}
+49% {
+        opacity: 1;
+}
+50% {
+        opacity: 0;
+}
+100% {
+        opacity: 0;
+}
+}
+
 [data-v-293a173d] {
     font-family: 微软雅黑;
 }
@@ -767,14 +994,20 @@
     color: #a7a7a7
 }
 
-[data-v-ebbd8d3b] {
+[data-v-461b52cf] {
     font-family: 宋体;
 }
 
-.editorTool .el-checkbox__label {
+.editorToolContent .el-checkbox__label {
     font-size: 10px !important;
     font-family: 宋体;
 }
-.editorTool .el-button+.el-button {
+.editorToolContent .el-button+.el-button {
     margin-left: 0;
+}
+.editorToolContent .el-checkbox {
+    margin-right: 0px;
+}
+.editorToolContent .el-checkbox__label{
+    padding-left: 2px;
 }

package/src/index.js

@@ -1,15 +1,15 @@
 import "three";
-import { D, p, n, k, q, i, l, m, j, o } from "./build.js";
+import { D, q, o, l, s, j, m, n, k, p } from "./build.js";
 import "clipper-lib";
 export {
   D as Dxf,
-  p as DxfSystem,
-  n as ModelDataPlugin,
-  k as buildJson,
-  q as components,
-  i as createEditor,
-  l as getFileAll,
-  m as getGlobalDxfSystem,
-  j as getModels,
-  o as utils
+  q as DxfSystem,
+  o as ModelDataPlugin,
+  l as buildJson,
+  s as components,
+  j as createEditor,
+  m as getFileAll,
+  n as getGlobalDxfSystem,
+  k as getModels,
+  p as utils
 };