build-dxf 0.1.20 → 0.1.22

package/package.json

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

package/src/build.d.ts

@@ -15,6 +15,7 @@ export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera,
     dxfSystem: DxfSystem;
     getFileAll: () => Promise<{
         dxf: File;
+        obj: File;
         glb: File;
         gltf: File;
         json: File;
@@ -59,6 +60,7 @@ export declare function buildJson(opt: HandleJsonOption): Promise<{
  */
 export declare function getFileAll(dxfSystem?: DxfSystem): Promise<{
     dxf: File;
+    obj: File;
     glb: File;
     gltf: File;
     json: File;

package/src/build.js

@@ -15000,11 +15000,13 @@ const SelectLocalFile = Object.assign(selectLocalFileFun, {
 });
 class CommandFlow extends EventDispatcher {
   list = [];
+  dataList = [];
   rollbacklist = [];
   revokeRollbacklist = [];
   // 是否写入操作记录
   writeOperationList = true;
   loop = false;
+  currentIndex = 0;
   setLoop(loop) {
     this.loop = loop;
     return this;
@@ -15014,8 +15016,9 @@ class CommandFlow extends EventDispatcher {
    * @param operation 
    * @returns 
    */
-  add(operation) {
+  add(operation, data = {}) {
     this.list.push(operation);
+    this.dataList.push(data);
     return this;
   }
   /** 添加回滚回调列表
@@ -15033,6 +15036,9 @@ class CommandFlow extends EventDispatcher {
     this.revokeRollbacklist.push(callBack);
     return this;
   }
+  getData(index2) {
+    return this.dataList[index2];
+  }
 }
 class CommandManager extends EventDispatcher {
   commandFlowMap = /* @__PURE__ */ new Map();
@@ -15066,6 +15072,13 @@ class CommandManager extends EventDispatcher {
     this.commandFlowMap.set(name, commandFlow);
     return commandFlow;
   }
+  /** 获取命令流
+   * @param name 
+   * @returns 
+   */
+  getCommandFlow(name) {
+    return this.commandFlowMap.get(name);
+  }
   executionPromise = null;
   executionResolve = null;
   /** 执行控制流
@@ -15096,6 +15109,7 @@ class CommandManager extends EventDispatcher {
     try {
       for (let i = step; i < commandFlow.list.length; i++) {
         const operation = commandFlow.list[i];
+        commandFlow.currentIndex = i;
         commandFlow.dispatchEvent({ type: "executing", index: i });
         this.dispatchEvent({ type: "executing", name, index: i });
         data = await new Promise((resolve) => {
@@ -15117,6 +15131,7 @@ class CommandManager extends EventDispatcher {
     } finally {
       this.lock = false;
       this.currentName = null;
+      commandFlow.currentIndex = 0;
       if (this.abortController && !this.abortController.signal.aborted) {
         commandFlow.dispatchEvent({ type: "completed", data });
         this.dispatchEvent({ type: "completed", name, data });
@@ -15402,12 +15417,13 @@ async function getFileAll(dxfSystem = gloabalDxfSystem) {
   const dxf = new File([dxfSystem.CorrectionDxf.toDxfBlob() ?? ""], "dxf.dxf", { type: "application/dxf" });
   const jpg = new File([await dxfSystem.CorrectionDxf.toRCDxfImageBlob()], "img.jpg", { type: "image/jpeg" });
   const correctionDxf = new File([dxfSystem.CorrectionDxf.toRCDxfBlob() ?? ""], "dxf.dxf", { type: "application/dxf" });
+  const obj = new File([await whiteModel.toOBJBlob()], "model.obj", { type: "application/octet-stream" });
   const glb = new File([await whiteModel.toGltfBlob(true)], "model.glb", { type: "application/octet-stream" });
   const gltf2 = new File([await whiteModel.toGltfBlob(false)], "model.gltf", { type: "application/json" });
   const json = new File([JSON.stringify(dxfSystem.Dxf.originalData)], "json.json", { type: "application/json" });
   return {
     dxf,
-    // obj, 
+    obj,
     glb,
     gltf: gltf2,
     json,

package/src/index.css

@@ -109,6 +109,10 @@
   bottom: 10px;
 }
 
+.bottom-\[20px\] {
+  bottom: 20px;
+}
+
 .left-0 {
   left: calc(var(--spacing) * 0);
 }
@@ -117,6 +121,14 @@
   left: 10px;
 }
 
+.left-\[20px\] {
+  left: 20px;
+}
+
+.z-100 {
+  z-index: 100;
+}
+
 .z-\[11\] {
   z-index: 11;
 }
@@ -424,6 +436,16 @@
   background-color: var(--color-white);
 }
 
+.bg-white\/15 {
+  background-color: #ffffff26;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .bg-white\/15 {
+    background-color: color-mix(in oklab, var(--color-white) 15%, transparent);
+  }
+}
+
 .p-\[0px_5px\] {
   padding: 0 5px;
 }
@@ -680,7 +702,7 @@
   inherits: false
 }
 
-[data-v-adaee1e3] {
+[data-v-492c138f] {
     font-family: 宋体;
 }