build-dxf 0.1.26 → 0.1.27

package/package.json

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

package/src/index.css

@@ -738,13 +738,11 @@
     -webkit-tap-highlight-color: transparent;
 }
 
-[data-v-cd15d420] {
-    font-family: 微软雅黑;
-    /* font-size: 14px; */
+[data-v-88eae165] {
+    font-family: 微软雅黑;
 }
-.number[data-v-cd15d420] {
-    color: #a7a7a7;
-    /* font-weight: 600; */
+.number[data-v-88eae165] {
+    color: #a7a7a7
 }
 
 [data-v-a41b5baa] {

package/src/index3.js

@@ -11966,18 +11966,19 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     function dragMoveHelper(e) {
       if (isMobile() && e instanceof MouseEvent) return;
       let offsetX = 0, offsetY = 0;
+      isdrag.value = true;
       if (e instanceof MouseEvent) {
         offsetX = e.offsetX;
         offsetY = e.offsetY;
       } else if (e instanceof TouchEvent) {
-        const rect = e.target.getBoundingClientRect(), touch = e.touches[0];
-        offsetX = touch.pageX - rect.left;
-        offsetY = touch.pageY - rect.top;
+        const rect2 = e.target.getBoundingClientRect(), touch = e.touches[0];
+        offsetX = touch.pageX - rect2.left;
+        offsetY = touch.pageY - rect2.top;
       }
       const cusor = document.body.style.cursor;
       document.body.style.cursor = "move";
+      const rect = elRef.value.getBoundingClientRect(), toolBarRect = toolBarRef.value.getBoundingClientRect();
       const move = (e2) => {
-        const rect = elRef.value.getBoundingClientRect(), toolBarRect = toolBarRef.value.getBoundingClientRect();
         setEditorToolPosition(
           e2.pageX - rect.left - offsetX,
           e2.pageY - rect.top - offsetY,
@@ -11985,16 +11986,18 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           toolBarRect
         );
         e2.stopPropagation();
+        e2.preventDefault();
         document.body.style.cursor = "move";
       };
       const end = () => {
-        document.body.removeEventListener("mousemove", move);
+        document.removeEventListener("mousemove", move);
         document.removeEventListener("mouseup", end);
         document.body.style.cursor = cusor;
+        isdrag.value = false;
       };
       const touchmove = (e2) => {
         if (e2.touches.length) {
-          const rect = elRef.value.getBoundingClientRect(), toolBarRect = toolBarRef.value.getBoundingClientRect(), touch = e2.touches[0];
+          const touch = e2.touches[0];
           setEditorToolPosition(
             touch.pageX - rect.left - offsetX,
             touch.pageY - rect.top - offsetY,
@@ -12008,18 +12011,20 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         }
       };
       const touchend = () => {
-        document.body.removeEventListener("touchmove", touchmove);
-        document.body.removeEventListener("touchend", touchend);
+        document.removeEventListener("touchmove", touchmove);
+        document.removeEventListener("touchend", touchend);
         document.body.style.cursor = cusor;
+        isdrag.value = false;
       };
       if (isMobile()) {
-        document.body.addEventListener("touchmove", touchmove, { passive: false });
+        document.addEventListener("touchmove", touchmove, { passive: false });
         document.addEventListener("touchend", touchend);
       } else {
-        document.body.addEventListener("mousemove", move);
+        document.addEventListener("mousemove", move);
         document.addEventListener("mouseup", end);
       }
       e.stopPropagation();
+      e.preventDefault();
     }
     function onClickIcon() {
       emits("clickIcon");
@@ -12027,7 +12032,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emits = __emit;
     const showContent = useModel(__props, "showContent");
-    const elRef = ref(), toolBarRef = ref(), toolBarPosition = ref({ left: props.position?.x ?? 10, top: props.position?.y ?? 100 }), resizeObserver = new ResizeObserver(() => setEditorToolPosition(toolBarPosition.value.left, toolBarPosition.value.top));
+    const elRef = ref(), toolBarRef = ref(), toolBarPosition = ref({ left: props.position?.x ?? 10, top: props.position?.y ?? 100 }), resizeObserver = new ResizeObserver(() => setEditorToolPosition(toolBarPosition.value.left, toolBarPosition.value.top)), isdrag = ref(false);
     watch(showContent, () => {
       if (showContent.value) {
         nextTick(() => setEditorToolPosition(toolBarPosition.value.left, toolBarPosition.value.top));
@@ -12048,7 +12053,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", {
         ref_key: "elRef",
         ref: elRef,
-        class: "editorTool pointer-events-none overflow-hidden absolute left-0 top-0 w-full h-full z-[20] flex flex-row justify-between p-[5px] box-border select-none pointer-events-[all]"
+        class: normalizeClass([{ "pointer-events-none": isdrag.value }, "editorTool pointer-events-none overflow-hidden absolute left-0 top-0 w-full h-full z-[20] flex flex-row justify-between p-[5px] box-border select-none pointer-events-[all]"])
       }, [
         createElementVNode("div", {
           ref_key: "toolBarRef",
@@ -12088,7 +12093,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
             renderSlot(_ctx.$slots, "default")
           ])) : createCommentVNode("", true)
         ], 38)
-      ], 512);
+      ], 2);
     };
   }
 });
@@ -12181,7 +12186,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   props: {
     selectLines: {}
   },
-  emits: ["update"],
+  emits: ["update", "clickIcon"],
   setup(__props, { emit: __emit }) {
     const props = __props, emits = __emit, selectLines = props.selectLines, map = /* @__PURE__ */ new Map(), userDataList = computed(() => {
       return selectLines.value.map((line2) => {
@@ -12194,7 +12199,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return openBlock(), createBlock(_sfc_main$3, {
         title: "属性",
         name: "PropertiesPanel",
-        style: { "z-index": "201" }
+        style: { "z-index": "201" },
+        onClickIcon: _cache[5] || (_cache[5] = ($event) => emits("clickIcon"))
       }, {
         default: withCtx(() => [
           createElementVNode("div", {
@@ -12216,18 +12222,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                         return openBlock(), createElementBlock("p", _hoisted_8$1, [
                           createElementVNode("span", _hoisted_9$1, toDisplayString(index2 === 0 ? "开始" : "结束"), 1),
                           createElementVNode("span", _hoisted_10$1, "x：" + toDisplayString(point.x.toFixed(2)), 1),
-                          _cache[5] || (_cache[5] = createElementVNode("span", { class: "mr-[20px]" }, null, -1)),
+                          _cache[6] || (_cache[6] = createElementVNode("span", { class: "mr-[20px]" }, null, -1)),
                           createElementVNode("span", _hoisted_11$1, "y：" + toDisplayString(point.y.toFixed(2)), 1)
                         ]);
                       }), 256)),
                       createElementVNode("p", _hoisted_12$1, [
-                        _cache[6] || (_cache[6] = createElementVNode("span", { class: "mr-[5px]" }, "长度", -1)),
+                        _cache[7] || (_cache[7] = createElementVNode("span", { class: "mr-[5px]" }, "长度", -1)),
                         createElementVNode("span", _hoisted_13$1, toDisplayString(Number(line2.length().toFixed(4))) + "m", 1)
                       ])
                     ]),
                     createElementVNode("div", _hoisted_14$1, [
                       userDataList.value[i].isSelectWindow ? (openBlock(), createElementBlock("p", _hoisted_15$1, [
-                        _cache[7] || (_cache[7] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "窗户宽度", -1)),
+                        _cache[8] || (_cache[8] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "窗户宽度", -1)),
                         createVNode(_sfc_main$2, {
                           onBlur: _cache[0] || (_cache[0] = ($event) => emits("update")),
                           modelValue: userDataList.value[i].width,
@@ -12246,7 +12252,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue", "onUpdate:modelValue"])
                       ]),
                       line2.userData.isDoor ? (openBlock(), createElementBlock("p", _hoisted_18, [
-                        _cache[8] || (_cache[8] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "门高度", -1)),
+                        _cache[9] || (_cache[9] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "门高度", -1)),
                         createVNode(_sfc_main$2, {
                           onBlur: _cache[2] || (_cache[2] = ($event) => emits("update")),
                           modelValue: userDataList.value[i].drawDoorData.height,
@@ -12255,7 +12261,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue", "onUpdate:modelValue"])
                       ])) : createCommentVNode("", true),
                       userDataList.value[i].isSelectWindow ? (openBlock(), createElementBlock("p", _hoisted_19, [
-                        _cache[9] || (_cache[9] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "离地高度", -1)),
+                        _cache[10] || (_cache[10] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "离地高度", -1)),
                         createVNode(_sfc_main$2, {
                           onBlur: _cache[3] || (_cache[3] = ($event) => emits("update")),
                           modelValue: userDataList.value[i].groundClearance,
@@ -12283,7 +12289,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const PropertiesPanelView = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-cd15d420"]]);
+const PropertiesPanelView = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-88eae165"]]);
 class PropertiesPanel extends CommandFlowComponent {
   static name = "PropertiesPanel";
   container = new THREE.Group();
@@ -12334,7 +12340,7 @@ class PropertiesPanel extends CommandFlowComponent {
     this.isOpen = true;
     const container = document.createElement("div");
     container.tabIndex = 1;
-    ["mousemove", "mousedown", "keydown", "keyup"].forEach((key) => container.addEventListener(key, (e) => e.stopPropagation()));
+    ["mousedown", "keydown", "keyup"].forEach((key) => container.addEventListener(key, (e) => e.stopPropagation()));
     this.domElement.appendChild(container);
     const selectLines = ref([]);
     const update = () => {
@@ -12366,7 +12372,7 @@ class PropertiesPanel extends CommandFlowComponent {
       position: this.editor.domEventRegister.pointer.clone(),
       onClickIcon: () => {
         eventCloses.forEach((eventClose) => eventClose());
-        this.domElement.removeChild(container);
+        container.remove();
         this.container.clear();
         this.isOpen = false;
       },
@@ -13269,6 +13275,7 @@ class RayDistance extends CommandFlowComponent {
     super.onAddFromParent(parent);
     this.editor.container.add(this.container);
     const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.createCursor("no-drop")).add(this.selectPoint.bind(this), { prompt: `请选择线段上的一个点作为发射点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择发射点, ${this.formatText("ESC")} 取消命令` }).setLoop(true);
+    commandFlow.writeOperationList = false;
     commandFlow.addEventListener("finally", this.createFinally());
     this.eventInput.addKeyCombination(this.commandName, this.shortcutKeys);
     this.eventInput.addEventListener("codeChange", async () => this.eventInput.isKeyCombination(this.commandName) && await this.commandManager.start(this.commandName));
@@ -13349,6 +13356,7 @@ class ManualDistance extends CommandFlowComponent {
     super.onAddFromParent(parent);
     this.editor.container.add(this.container);
     const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.createCursor("no-drop")).add(this.selectPoint.bind(this), { prompt: `请选择两个点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择, ${this.formatText("ESC")} 取消命令` }).setLoop(true);
+    commandFlow.writeOperationList = false;
     commandFlow.addEventListener("finally", this.createFinally());
     this.eventInput.addKeyCombination(this.commandName, this.shortcutKeys);
     this.eventInput.addEventListener("codeChange", async () => this.eventInput.isKeyCombination(this.commandName) && await this.commandManager.start(this.commandName));

package/src/utils/DxfSystem/plugin/Editor/pages/PropertiesPanel.vue.d.ts

@@ -10,7 +10,9 @@ type __VLS_Props = {
 };
 declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     update: (...args: any[]) => void;
+    clickIcon: (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
     onUpdate?: ((...args: any[]) => any) | undefined;
+    onClickIcon?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
 export default _default;