build-dxf 0.0.19-4 → 0.0.19-6

package/package.json

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

package/src/build.js

@@ -3087,6 +3087,7 @@ async function createEditor(dom, camera) {
     originalLine: false,
     modelData: false,
     detailsPoint: false,
+    orbitControls: false,
     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%"
     });
@@ -630,22 +630,28 @@ class DomEventRegister extends Component {
     const domContainer = parent.findComponentByType(DomContainer);
     const variable = parent.findComponentByType(Variable);
     const domElement = domContainer.domElement;
-    domElement.tabIndex = 1;
-    domElement.addEventListener("keyup", (e) => {
+    document.body.tabIndex = 1;
+    const onKeyup = (e) => {
       const key = e.key.toLocaleLowerCase();
       variable.set("currentKeyUp", key);
       for (let i = 0; i < this.cancelDefaultBehaviorList.length; i++) {
         const element = this.cancelDefaultBehaviorList[i];
         if (element(e)) e.preventDefault();
       }
-    });
-    domElement.addEventListener("keydown", (e) => {
+    };
+    document.body.addEventListener("keyup", onKeyup);
+    const onKeydown = (e) => {
       const key = e.key.toLocaleLowerCase();
       variable.set("currentKeyDown", key);
       for (let i = 0; i < this.cancelDefaultBehaviorList.length; i++) {
         const element = this.cancelDefaultBehaviorList[i];
         if (element(e)) e.preventDefault();
       }
+    };
+    document.body.addEventListener("keydown", onKeydown);
+    this.addEventRecord("destory", () => {
+      document.body.removeEventListener("keyup", onKeyup);
+      document.body.removeEventListener("keydown", onKeydown);
     });
     domElement.addEventListener("mousedown", (e) => {
       variable.set("currentMouseDown", "mouse_" + e.button);
@@ -714,6 +720,9 @@ class DomEventRegister extends Component {
     });
     callBack({ ...offset }, 0, 0);
   }
+  destroy() {
+    this.canceEventRecord("destory");
+  }
 }
 class EventInput extends Component {
   static name = "EventInput";
@@ -1021,6 +1030,7 @@ function RenderPlugin_(dxfSystem, option = {}) {
     originalLine = true,
     modelData = true,
     detailsPoint = true,
+    orbitControls = true,
     camera = new THREE.PerspectiveCamera(45, 1, 0.01, 1e3)
   } = option;
   const domContainer = new DomContainer();
@@ -1033,11 +1043,11 @@ function RenderPlugin_(dxfSystem, option = {}) {
       "3d": domContainer.html3DRenderer
     },
     resizeObserver: domContainer.domElement,
-    orbitControls: {
+    orbitControls: orbitControls ? {
       domElement: domContainer.domElement,
       enableDamping: true,
       dampingFactor: 0.15
-    }
+    } : void 0
   }));
   originalLine && dxfSystem.addComponent(new OriginalLineRender());
   modelData && dxfSystem.addComponent(new ModelDataRender());

package/src/index3.js

@@ -1390,6 +1390,7 @@ 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) {

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

@@ -39,4 +39,5 @@ export declare class DomEventRegister extends Component<{
         x: number;
         y: number;
     }, condition?: () => boolean): void;
+    destroy(): void;
 }

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

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