build-dxf 0.0.19-1 → 0.0.19-11

package/src/index3.js

@@ -1,7 +1,7 @@
 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 { O as isString, P as noop, Q as resolveUnref, T as tryOnScopeDispose, U as isClient, V as tryOnMounted, W as identity, m as buildProps, q as definePropType, _ as _export_sfc, x as useNamespace, B as isNumber, X as addUnit, y as withInstall, Y as useEmptyValuesProps, w as useSizeProp, Z as provideGlobalConfig, v as iconPropType, $ as useGlobalComponentSettings, a0 as TypeComponentsMap, E as ElIcon, a1 as TypeComponents, a2 as useTimeoutFn, A as isString$1, a3 as isFunction, C as isBoolean, a4 as isElement, a5 as withInstallFunction, I as Lines, J as DomEventRegister } 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 { 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 { 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, watchEffect, onUnmounted, renderList, createApp } from "vue";
 import "clipper-lib";
 import "dxf-writer";
 import "three/addons/controls/OrbitControls.js";
@@ -777,7 +777,7 @@ class DrawLine extends CommandFlowComponent {
    * @param next 
    */
   selectPoint(next) {
-    let editor = this.parent?.findComponentByName("Editor"), renderer = editor.renderer, start = null, end = null, points = [], circle = new THREE.Mesh(new THREE.SphereGeometry(0.05), new THREE.MeshBasicMaterial({ color: 65280 })), dom = renderer.html2DRenderer?.domElement, line = new Lines([], 16711935), auxiliaryLine = new Lines([
+    let editor = this.parent?.findComponentByName("Editor"), start = null, end = null, points = [], circle = new THREE.Mesh(new THREE.SphereGeometry(0.05), new THREE.MeshBasicMaterial({ color: 65280 })), dom = editor.domContainer.domElement, line = new Lines([], 16711935), auxiliaryLine = new Lines([
       new THREE.Vector3(-1e4, 0, 0),
       new THREE.Vector3(1e4, 0, 0),
       new THREE.Vector3(0, -1e4, 0),
@@ -804,10 +804,10 @@ class DrawLine extends CommandFlowComponent {
         if (find) {
           circle.position.set(point.x, point.y, 0);
           this.container.add(circle);
-          dom.parentElement.style.cursor = "none";
+          dom.style.cursor = "none";
         } else {
           circle.removeFromParent();
-          dom.parentElement.style.cursor = "crosshair";
+          dom.style.cursor = "crosshair";
         }
         currentPoint.copy(point);
         if (!(start && end)) return;
@@ -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;
         }
       }),
@@ -1248,10 +1248,8 @@ class CommandManager extends EventDispatcher {
     }
   }
 }
-const _hoisted_1 = { class: "pointer-events-none absolute left-0 top-0 w-full h-fit z-[10000] flex flex-row justify-between p-[5px] box-border select-none pointer-events-[all]" };
-const _hoisted_2 = { class: "pointer-events-auto" };
-const _hoisted_3 = { class: "pointer-events-auto" };
-const _hoisted_4 = { class: "text-[14px] bg-[rgba(255,255,255,1)] rounded-[6px] p-[0px_10px]" };
+const _hoisted_1 = { class: "mt-[5px] text-[#888] text-[10px] absolute left-[10px] bottom-[10px] rounded-[8px] min-w-[150px] bg-black/15 p-[10px]" };
+const _hoisted_2 = { class: "inline-block ml-[10px]" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "EditorTool",
   props: {
@@ -1259,24 +1257,32 @@ 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);
-    function setLines(lines) {
-      if (lines) {
-        localStorage.setItem("lines", JSON.stringify(lines));
-        try {
-          dxfSystem.Dxf.set(lines);
-          dxfSystem.Dxf.lineOffset();
-        } catch (error) {
-          console.log(error);
-        }
-      }
-    }
-    async function selectLocalFile() {
-      const data = await SelectLocalFile.json();
-      if (Array.isArray(data)) {
-        localStorage.removeItem("orbitControls");
-        setLines(data);
-      }
+    const originalLineVisible = ref(true), dxfVisible = ref(true), whiteModelVisible = ref(true), isLook = ref(false), elRef = ref();
+    ref();
+    const dxfSystem = toRaw(props.dxfSystem), domEventRegister = dxfSystem.findComponentByType(DomEventRegister), toolBarPosition = ref({ left: 10, top: 10 }), shortcutKeys = [
+      { "name": "绘制连续线段", "shortcut": "Ctrl + L" },
+      { "name": "绘制线段确认", "shortcut": "Enter" },
+      { "name": "绘制门线", "shortcut": "Ctrl + M" },
+      { "name": "绘制窗户线", "shortcut": "Ctrl + Q" },
+      { "name": "移动线段点", "shortcut": "Ctrl + P" },
+      { "name": "删除线段", "shortcut": "选中 + Delete" },
+      { "name": "删除窗户线", "shortcut": "选中 + Q + Delete" },
+      { "name": "选中", "shortcut": "鼠标左键" },
+      { "name": "多选", "shortcut": "鼠标左键 + Ctrl" },
+      { "name": "取消选中", "shortcut": "鼠标左键 + Alt" },
+      { "name": "框选", "shortcut": "鼠标左键 + 移动" },
+      { "name": "线段同方向合并", "shortcut": "Ctrl + G" },
+      { "name": "线段连接", "shortcut": "选中 + Shift + L" },
+      { "name": "线段交点连接", "shortcut": "选中 + Ctrl + Shift + L" },
+      { "name": "取消命令", "shortcut": "Esc" }
+    ];
+    watchEffect(() => localStorage.setItem("EditorToolPosition", JSON.stringify(toolBarPosition.value)));
+    function setEditorToolPosition(left, top) {
+      const dom = elRef.value, toolBarDom = elRef.value, rect = dom.getBoundingClientRect(), toolBarRect = toolBarDom.getBoundingClientRect(), minX = 0, maxX = toolBarRect.width - rect.width, minY = 0, maxY = toolBarRect.height - rect.height;
+      left = Math.max(minX, Math.min(left, maxX));
+      top = Math.max(minY, Math.min(top, maxY));
+      toolBarPosition.value = { left, top };
+      console.log(left, top);
     }
     watch(originalLineVisible, () => dxfSystem.Variable.set("originalLineVisible", originalLineVisible.value));
     watch(dxfVisible, () => dxfSystem.Variable.set("dxfVisible", dxfVisible.value));
@@ -1285,43 +1291,33 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     dxfSystem.Variable.addEventListener("originalLineVisible", (e) => originalLineVisible.value = e.value);
     dxfSystem.Variable.addEventListener("dxfVisible", (e) => dxfVisible.value = e.value);
     dxfSystem.Variable.addEventListener("whiteModelVisible", (e) => whiteModelVisible.value = e.value);
+    onMounted(() => {
+      if (localStorage.getItem("EditorToolPosition")) {
+        const { left, top } = JSON.parse(localStorage.getItem("EditorToolPosition") ?? "{}");
+        setEditorToolPosition(left, top);
+      }
+    });
+    onUnmounted(() => {
+      domEventRegister.mouseMoveEventProxylock = false;
+    });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1, [
-        createElementVNode("div", _hoisted_2, [
-          createVNode(unref(ElButton), {
-            size: "small",
-            type: "success",
-            onClick: selectLocalFile
-          }, {
-            default: withCtx(() => _cache[2] || (_cache[2] = [
-              createTextVNode(" 选择文件 ", -1)
-            ])),
-            _: 1,
-            __: [2]
-          }),
-          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] = [
-              createTextVNode(" 下载 DXF ", -1)
-            ])),
-            _: 1,
-            __: [3]
-          })
-        ]),
-        createElementVNode("div", _hoisted_3, [
-          createElementVNode("div", _hoisted_4, [
-            createVNode(unref(ElCheckbox), {
-              modelValue: dxfVisible.value,
-              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($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))
+      return openBlock(), createElementBlock("div", {
+        ref_key: "elRef",
+        ref: elRef,
+        class: "pointer-events-none overflow-hidden absolute left-0 top-0 w-full h-full z-[10000] flex flex-row justify-between p-[5px] box-border select-none pointer-events-[all]"
+      }, [
+        createElementVNode("div", _hoisted_1, [
+          (openBlock(), createElementBlock(Fragment, null, renderList(shortcutKeys, (item) => {
+            return createElementVNode("p", {
+              class: "p-[2px_0px] flex justify-between text-right border-b-1 border-b-[rgba(255,255,255,0.1)] last-of-type:border-b-0",
+              key: item.name
+            }, [
+              createTextVNode(toDisplayString(item.name) + ": ", 1),
+              createElementVNode("span", _hoisted_2, toDisplayString(item.shortcut), 1)
+            ]);
+          }), 64))
         ])
-      ]);
+      ], 512);
     };
   }
 });
@@ -1436,7 +1432,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 +1445,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 +1459,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) => {