build-dxf 0.0.19-6 → 0.0.19-8

package/src/index.js

@@ -1,8 +1,10 @@
-import { D, M, i, c } from "./build.js";
 import "three";
+import { D, M, i, c, g, d } from "./build.js";
 export {
   D as DxfSystem,
   M as ModelDataPlugin,
   i as components,
-  c as createEditor
+  c as createEditor,
+  g as getFileAll,
+  d as getGlobalDxfSystem
 };

package/src/index2.js

@@ -622,16 +622,72 @@ class DomEventRegister extends Component {
   static name = "DomEventRegister";
   cancelDefaultBehaviorList = [];
   pointer = new Vector2();
+  _isMouseEnter = false;
+  set isMouseEnter(isMouseEnter) {
+    if (this._isMouseEnter === isMouseEnter) return;
+    this._isMouseEnter = isMouseEnter;
+  }
+  get isMouseEnter() {
+    return this._isMouseEnter;
+  }
   /**
-   * 
-   * @param parent 
+   * 组件被添加到父组件上时调用
    */
-  onAddFromParent(parent) {
-    const domContainer = parent.findComponentByType(DomContainer);
-    const variable = parent.findComponentByType(Variable);
-    const domElement = domContainer.domElement;
+  onAddFromParent() {
+    this.initMouseMoveEventProxy();
+    this.initKeyEvent();
+    this.initWheelEvent();
+    this.autoBodyCursor();
+  }
+  /**
+   * 初始化鼠标事件代理(判断鼠标是否在domElement上)
+   */
+  initMouseMoveEventProxy() {
+    const domContainer = this.parent?.findComponentByType(DomContainer), domElement = domContainer.domElement, variable = this.parent?.findComponentByType(Variable), globalMousemoveFun = (e) => {
+      const rect = domElement.getBoundingClientRect(), offsetX = e.clientX - rect.left, offsetY = e.clientY - rect.top;
+      if (offsetX >= 0 && offsetY >= 0 && offsetX <= rect.width && offsetY <= rect.height) {
+        this.pointer.set(offsetX, offsetY);
+        this.dispatchEvent({
+          type: "mousemove",
+          x: offsetX,
+          y: offsetY,
+          moveX: e.movementX,
+          moveY: e.movementY
+        });
+        this.isMouseEnter = true;
+      } else {
+        this.isMouseEnter = false;
+      }
+    }, globalMousedownFun = (e) => {
+      if (!this.isMouseEnter) return;
+      const rect = domElement.getBoundingClientRect();
+      variable.set("currentMouseDown", "mouse_" + e.button);
+      this.dispatchEvent({
+        type: "mousedown",
+        x: e.clientX - rect.left,
+        y: e.clientY - rect.top
+      });
+    }, globalMouseupFun = (e) => {
+      if (!this.isMouseEnter) return;
+      variable.set("currentMouseUp", "mouse_" + e.button);
+    };
+    document.addEventListener("mousemove", globalMousemoveFun);
+    document.addEventListener("mousedown", globalMousedownFun);
+    document.addEventListener("mouseup", globalMouseupFun);
+    this.addEventRecord("destory", () => {
+      document.removeEventListener("mousemove", globalMousemoveFun);
+      document.removeEventListener("mousedown", globalMousedownFun);
+      document.removeEventListener("mouseup", globalMouseupFun);
+    });
+  }
+  /**
+   * 初始化键盘事件
+   */
+  initKeyEvent() {
+    const variable = this.parent?.findComponentByType(Variable);
     document.body.tabIndex = 1;
     const onKeyup = (e) => {
+      if (!this.isMouseEnter) return;
       const key = e.key.toLocaleLowerCase();
       variable.set("currentKeyUp", key);
       for (let i = 0; i < this.cancelDefaultBehaviorList.length; i++) {
@@ -641,6 +697,7 @@ class DomEventRegister extends Component {
     };
     document.body.addEventListener("keyup", onKeyup);
     const onKeydown = (e) => {
+      if (!this.isMouseEnter) return;
       const key = e.key.toLocaleLowerCase();
       variable.set("currentKeyDown", key);
       for (let i = 0; i < this.cancelDefaultBehaviorList.length; i++) {
@@ -649,43 +706,46 @@ class DomEventRegister extends Component {
       }
     };
     document.body.addEventListener("keydown", onKeydown);
+    const onFocus = () => variable.set("focus", true);
+    document.body.addEventListener("focus", onFocus);
+    const onBlur = () => variable.set("focus", false);
+    document.body.addEventListener("blur", onBlur);
     this.addEventRecord("destory", () => {
       document.body.removeEventListener("keyup", onKeyup);
       document.body.removeEventListener("keydown", onKeydown);
+      document.body.removeEventListener("focus", onFocus);
+      document.body.removeEventListener("blur", onBlur);
     });
-    domElement.addEventListener("mousedown", (e) => {
-      variable.set("currentMouseDown", "mouse_" + e.button);
-    });
-    domElement.addEventListener("mouseup", (e) => {
-      variable.set("currentMouseUp", "mouse_" + e.button);
-    });
-    domElement.addEventListener("wheel", (e) => {
-      variable.set("currentWheel", e.wheelDelta);
-    });
-    domElement.addEventListener("focus", () => {
-      variable.set("focus", true);
-    });
-    domElement.addEventListener("blur", () => {
-      variable.set("focus", false);
-    });
-    this.dragMoveHelper(domElement, (_0, x, y) => variable.set("pointerMove", { x, y }), { x: 0, y: 0 });
-    domElement.addEventListener("mousemove", (e) => {
-      this.pointer.set(e.offsetX, e.offsetY);
-      this.dispatchEvent({
-        type: "mousemove",
-        x: e.offsetX,
-        y: e.offsetY,
-        moveX: e.movementX,
-        moveY: e.movementY
-      });
+  }
+  /**
+   * 初始化滚轮事件
+   */
+  initWheelEvent() {
+    const variable = this.parent?.findComponentByType(Variable);
+    const onWheel = (e) => variable.set("currentWheel", e.wheelDelta);
+    document.body.addEventListener("wheel", onWheel);
+    this.addEventRecord("destory", () => {
+      document.body.removeEventListener("wheel", onWheel);
     });
-    domElement.addEventListener("mousedown", (e) => {
-      this.pointer.set(e.offsetX, e.offsetY);
-      this.dispatchEvent({
-        type: "mousedown",
-        x: e.offsetX,
-        y: e.offsetY
-      });
+  }
+  /**
+   * 根据domElement的cursor自动设置body的cursor
+   */
+  autoBodyCursor() {
+    const domContainer = this.parent?.findComponentByType(DomContainer), domElement = domContainer.domElement;
+    let bodyCursor = null;
+    this.addEventListener("update", () => {
+      if (this.isMouseEnter) {
+        if (bodyCursor === null) {
+          bodyCursor = document.body.style.cursor;
+        }
+        document.body.style.cursor = domElement.style.cursor;
+      } else {
+        if (bodyCursor !== null) {
+          document.body.style.cursor = bodyCursor;
+          bodyCursor = null;
+        }
+      }
     });
   }
   /**
@@ -762,6 +822,8 @@ class EventInput extends Component {
       this.mouseList.clear();
     });
     this.addEventListener("codeChange", this._computedkeyCombination.bind(this));
+    this.addKeyCombination("save", ["control", "s"]);
+    this.addCancelDefaultBehavior((input) => input.isOnlyKeyDowns(["control", "s"]));
   }
   /** 添加取消浏览器默认行为规则
    * @param callBack 

package/src/index3.js

@@ -1,6 +1,6 @@
 import * as THREE from "three";
 import { i as isString, n as noop, r as resolveUnref, t as tryOnScopeDispose, b as isClient, c as tryOnMounted, d as identity, e as buildProps, f as definePropType, _ as _export_sfc, u as useNamespace, g as isNumber, h as addUnit, w as withInstall, j as useEmptyValuesProps, k as useSizeProp, p as provideGlobalConfig, l as iconPropType, m as useGlobalComponentSettings, T as TypeComponentsMap, o as ElIcon, q as TypeComponents, s as useTimeoutFn, v as isString$1, x as isFunction, y as isBoolean, z as isElement, A as withInstallFunction, L as Lines, E as ElButton, a as ElCheckbox, S as SelectLocalFile } from "./selectLocalFile.js";
-import { C as Component, L as LineSegment, P as Point, B as Box2, E as EventDispatcher, b as PointVirtualGrid, Q as Quadtree } from "./build.js";
+import { C as Component, L as LineSegment, P as Point, B as Box2, E as EventDispatcher, g as getFileAll, b as PointVirtualGrid, Q as Quadtree } from "./build.js";
 import { watch, ref, defineComponent, computed, createElementBlock, openBlock, normalizeClass, unref, renderSlot, createVNode, Transition, withCtx, withDirectives, createElementVNode, normalizeStyle, createTextVNode, toDisplayString, vShow, shallowReactive, onMounted, createBlock, createCommentVNode, resolveDynamicComponent, Fragment, withModifiers, nextTick, isVNode, render, toRaw, createStaticVNode, createApp } from "vue";
 import "clipper-lib";
 import "dxf-writer";
@@ -1097,11 +1097,11 @@ class Default extends Component {
           const rectangle = line.expandToRectangle(0.02, "bothSides");
           object3D.geometry = editor.renderManager.createGeometry({ position: rectangle.createGeometry() }, 6);
           this.container.add(object3D);
-          dom.parentElement.style.cursor = "pointer";
+          dom.style.cursor = "pointer";
           currentSelectLine = line;
         } else {
           object3D.removeFromParent();
-          dom.parentElement.style.cursor = "default";
+          dom.style.cursor = "default";
           currentSelectLine = null;
         }
       }),
@@ -1259,7 +1259,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const originalLineVisible = ref(true), dxfVisible = ref(true), whiteModelVisible = ref(true), isLook = ref(false), dxfSystem = toRaw(props.dxfSystem);
+    const originalLineVisible = ref(true), dxfVisible = ref(true), whiteModelVisible = ref(true), isLook = ref(false), dxfSystem = toRaw(props.dxfSystem), log = console.log;
     function setLines(lines) {
       if (lines) {
         localStorage.setItem("lines", JSON.stringify(lines));
@@ -1293,33 +1293,44 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             type: "success",
             onClick: selectLocalFile
           }, {
-            default: withCtx(() => _cache[2] || (_cache[2] = [
+            default: withCtx(() => _cache[3] || (_cache[3] = [
               createTextVNode(" 选择文件 ", -1)
             ])),
             _: 1,
-            __: [2]
+            __: [3]
           }),
           createVNode(unref(ElButton), {
             size: "small",
             type: "primary",
             onClick: _cache[0] || (_cache[0] = ($event) => unref(dxfSystem).Dxf.download("test.dxf"))
           }, {
-            default: withCtx(() => _cache[3] || (_cache[3] = [
+            default: withCtx(() => _cache[4] || (_cache[4] = [
               createTextVNode(" 下载 DXF ", -1)
             ])),
             _: 1,
-            __: [3]
+            __: [4]
+          }),
+          createVNode(unref(ElButton), {
+            size: "small",
+            type: "primary",
+            onClick: _cache[1] || (_cache[1] = ($event) => unref(log)(unref(getFileAll)()))
+          }, {
+            default: withCtx(() => _cache[5] || (_cache[5] = [
+              createTextVNode(" 打印 ", -1)
+            ])),
+            _: 1,
+            __: [5]
           })
         ]),
         createElementVNode("div", _hoisted_3, [
           createElementVNode("div", _hoisted_4, [
             createVNode(unref(ElCheckbox), {
               modelValue: dxfVisible.value,
-              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dxfVisible.value = $event),
+              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => dxfVisible.value = $event),
               label: "dxf"
             }, null, 8, ["modelValue"])
           ]),
-          _cache[4] || (_cache[4] = createStaticVNode('<div class="mt-[5px] text-[#c9c9c9] text-[10px]"><p class="text-right"> 绘制连续线段:<span class="w-[110px] inline-block">Ctrl + L</span></p><p class="text-right"> 绘制线段确认:<span class="w-[110px] inline-block">Enter</span></p><p class="text-right"> 绘制门线:<span class="w-[110px] inline-block">Ctrl + M</span></p><p class="text-right"> 绘制窗户线:<span class="w-[110px] inline-block">Ctrl + Q</span></p><p class="text-right"> 移动线段点:<span class="w-[110px] inline-block">Ctrl + P</span></p><p class="text-right"> 删除线段:<span class="w-[110px] inline-block">选中 + Delete</span></p><p class="text-right"> 删除窗户线:<span class="w-[110px] inline-block">选中 + Q + Delete</span></p><p class="text-right"> 选中:<span class="w-[110px] inline-block">鼠标左键</span></p><p class="text-right"> 多选:<span class="w-[110px] inline-block">鼠标左键 + Ctrl</span></p><p class="text-right"> 取消选中:<span class="w-[110px] inline-block">鼠标左键 + Alt</span></p><p class="text-right"> 框选:<span class="w-[110px] inline-block">鼠标左键 + 移动</span></p><p class="text-right"> 线段同方向合并:<span class="w-[110px] inline-block">Ctrl + G</span></p><p class="text-right"> 线段连接:<span class="w-[110px] inline-block">选中 + Shift + L</span></p><p class="text-right"> 线段交点连接:<span class="w-[110px] inline-block">选中 + Ctrl + Shift + L</span></p><p class="text-right"> 取消命令:<span class="w-[110px] inline-block">Esc</span></p></div>', 1))
+          _cache[6] || (_cache[6] = createStaticVNode('<div class="mt-[5px] text-[#c9c9c9] text-[10px]"><p class="text-right"> 绘制连续线段:<span class="w-[110px] inline-block">Ctrl + L</span></p><p class="text-right"> 绘制线段确认:<span class="w-[110px] inline-block">Enter</span></p><p class="text-right"> 绘制门线:<span class="w-[110px] inline-block">Ctrl + M</span></p><p class="text-right"> 绘制窗户线:<span class="w-[110px] inline-block">Ctrl + Q</span></p><p class="text-right"> 移动线段点:<span class="w-[110px] inline-block">Ctrl + P</span></p><p class="text-right"> 删除线段:<span class="w-[110px] inline-block">选中 + Delete</span></p><p class="text-right"> 删除窗户线:<span class="w-[110px] inline-block">选中 + Q + Delete</span></p><p class="text-right"> 选中:<span class="w-[110px] inline-block">鼠标左键</span></p><p class="text-right"> 多选:<span class="w-[110px] inline-block">鼠标左键 + Ctrl</span></p><p class="text-right"> 取消选中:<span class="w-[110px] inline-block">鼠标左键 + Alt</span></p><p class="text-right"> 框选:<span class="w-[110px] inline-block">鼠标左键 + 移动</span></p><p class="text-right"> 线段同方向合并:<span class="w-[110px] inline-block">Ctrl + G</span></p><p class="text-right"> 线段连接:<span class="w-[110px] inline-block">选中 + Shift + L</span></p><p class="text-right"> 线段交点连接:<span class="w-[110px] inline-block">选中 + Ctrl + Shift + L</span></p><p class="text-right"> 取消命令:<span class="w-[110px] inline-block">Esc</span></p></div>', 1))
         ])
       ]);
     };
@@ -1390,7 +1401,6 @@ let Editor$1 = class Editor extends Component {
       const x = domEventRegister.pointer.x / size.x * 2 - 1;
       const y = -(domEventRegister.pointer.y / size.y * 2 - 1);
       coords.set(x, y);
-      console.log("pointer-", "x:", x, "y:", y);
       raycaster.setFromCamera(coords, renderer.camera);
       const intersections = raycaster.intersectObject(this.plane);
       if (intersections.length) {
@@ -1437,7 +1447,6 @@ class RenderManager extends Component {
   actionHistory = /* @__PURE__ */ new Set();
   onAddFromParent() {
     const dxfLineModel = this.dxfLineModel;
-    this.reset();
     this.editor.container.add(this.container);
     this.editor.container.add(dxfLineModel.dxfModelGroup);
     dxfLineModel.dxfLineModel.material = new THREE.LineBasicMaterial({
@@ -1451,6 +1460,7 @@ class RenderManager extends Component {
     });
     this.variable.addEventListener("dxfVisible", (e) => dxfLineModel.dxfModelGroup.visible = e.value);
     this.dxf.addEventListener("createGroup", () => this.reset());
+    this.reset();
   }
   updatedMode = null;
   /** 重新设置数据
@@ -1464,6 +1474,7 @@ class RenderManager extends Component {
     }
     this.pointVirtualGrid = new PointVirtualGrid();
     const box = this.dxf.box.clone().expansion(Math.max(this.dxf.box.width, this.dxf.box.height) * 2);
+    if (box.width === 0 || box.height === 0) box.set(-200, -200, 200, 200);
     this.quadtree = new Quadtree(box);
     this.lines.length = 0;
     this.dxf.lineSegments.forEach((line) => {

package/src/utils/ComponentManager/ComponentManager.d.ts

@@ -32,7 +32,7 @@ export declare class ComponentManager<TEventMap extends {} = {}> extends EventDi
      * 查找所有符合条件的组件
      * @param callBack
      */
-    findComponents(predicate: (component: Component, index: number) => boolean): Component<{}> | undefined;
+    findComponents(predicate: (component: Component, index: number) => boolean): Component<{}>[];
     /**
      *
      * @param type

package/src/utils/DxfSystem/plugin/RenderPlugin/components/DomEventRegister.d.ts

@@ -1,5 +1,5 @@
 import { Vector2 } from 'three';
-import { Component, ComponentManager } from '../../../../ComponentManager';
+import { Component } from '../../../../ComponentManager';
 export declare class DomEventRegister extends Component<{
     mousemove: {
         x: number;
@@ -15,11 +15,29 @@ export declare class DomEventRegister extends Component<{
     static name: string;
     cancelDefaultBehaviorList: ((e: KeyboardEvent) => boolean)[];
     pointer: Vector2;
+    private _isMouseEnter;
+    set isMouseEnter(isMouseEnter: boolean);
+    get isMouseEnter(): boolean;
     /**
-     *
-     * @param parent
+     * 组件被添加到父组件上时调用
+     */
+    onAddFromParent(): void;
+    /**
+     * 初始化鼠标事件代理(判断鼠标是否在domElement上)
+     */
+    initMouseMoveEventProxy(): void;
+    /**
+     * 初始化键盘事件
+     */
+    initKeyEvent(): void;
+    /**
+     * 初始化滚轮事件
+     */
+    initWheelEvent(): void;
+    /**
+     * 根据domElement的cursor自动设置body的cursor
      */
-    onAddFromParent(parent: ComponentManager): void;
+    autoBodyCursor(): void;
     /**
      *
      * @param callBack

package/src/utils/DxfSystem/plugin/RenderPlugin/components/Renderer.d.ts

@@ -17,7 +17,7 @@ export interface RendererDescription {
     };
     resizeObserver?: HTMLElement | null;
     scene?: THREE.Scene;
-    camera?: THREE.PerspectiveCamera | THREE.OrthographicCamera;
+    camera?: THREE.PerspectiveCamera | THREE.OrthographicCamera | THREE.Camera;
 }
 export declare class Renderer extends Component<{
     resize: {

package/src/utils/DxfSystem/plugin/RenderPlugin/index.d.ts

@@ -7,7 +7,7 @@ type Option = {
     modelData?: boolean;
     detailsPoint?: boolean;
     orbitControls?: boolean;
-    camera?: THREE.OrthographicCamera;
+    camera?: THREE.Camera;
 };
 declare function RenderPlugin_(dxfSystem: DxfSystem, option?: Option): void;
 declare const RenderPlugin: typeof RenderPlugin_ & {