build-dxf 0.0.19-5 → 0.0.19-7

package/package.json

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

package/src/build.d.ts

@@ -7,6 +7,6 @@ export * from './utils/DxfSystem/plugin/ModelDataPlugin';
  * @param camera
  * @returns
  */
-export declare function createEditor(dom: HTMLDivElement, camera?: THREE.OrthographicCamera): Promise<{
+export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera, orbitControls?: boolean): Promise<{
     dxfSystem: DxfSystem;
 }>;

package/src/build.js

@@ -3076,7 +3076,7 @@ function loadRenderPlugin() {
 function loadEditorPlugin() {
   return import("./index3.js");
 }
-async function createEditor(dom, camera) {
+async function createEditor(dom, camera, orbitControls = false) {
   const mp = await Promise.resolve().then(() => index);
   const rp = await loadRenderPlugin();
   const editor = await loadEditorPlugin();
@@ -3087,7 +3087,7 @@ async function createEditor(dom, camera) {
     originalLine: false,
     modelData: false,
     detailsPoint: false,
-    orbitControls: false,
+    orbitControls,
     camera
   })).usePlugin(editor.Editor);
   const domContainer = dxfSystem.findComponentByType(rp.components.DomContainer);

package/src/index2.js

@@ -478,7 +478,7 @@ class DomContainer extends Component {
       position: "absolute",
       left: 0,
       top: 0,
-      zIndex: 9,
+      // zIndex: 9,
       width: "100%",
       height: "100%"
     });
@@ -486,7 +486,7 @@ class DomContainer extends Component {
       position: "absolute",
       left: 0,
       top: 0,
-      zIndex: 10,
+      // zIndex: 10,
       width: "100%",
       height: "100%"
     });
@@ -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;
+        }
+      }
     });
   }
   /**

package/src/index3.js

@@ -1436,7 +1436,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({
@@ -1450,6 +1449,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;
   /** 重新设置数据
@@ -1463,6 +1463,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/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_ & {