From a1a541fff01ec566b55e010ec8031d978316829d Mon Sep 17 00:00:00 2001
From: "2817212736@qq.com" <2817212736@qq.com>
Date: Mon, 26 May 2025 15:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=BB=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E9=95=BF/=E5=AE=BD=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=A4=96=E9=83=A8=E5=AF=BC=E5=85=A5=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=97=B6=E5=AE=9E=E4=BD=93=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  4 ++--
 pnpm-lock.yaml                      | 10 +++++-----
 src/common/MaterialSerializer.ts    |  2 +-
 src/components/MaterialAdjuster.vue |  4 ++--
 src/components/MaterialView.vue     |  4 ++--
 src/helpers/helper.material.ts      |  3 ++-
 src/lib/entry.ts                    |  7 +++++++
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index f63651a..a40d75e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "material-editor",
   "private": true,
-  "version": "1.0.6",
+  "version": "1.0.7",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -32,7 +32,7 @@
     "fflate": "^0.8.2",
     "flatbush": "^3.3.0",
     "js-angusj-clipper": "^1.2.1",
-    "pako": "^2.1.0",
+    "pako": "^1.0.11",
     "pinia": "^3.0.2",
     "polylabel": "^1.1.0",
     "three": "npm:three-cf@^0.122.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2670194..58dd3e7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,8 +24,8 @@ importers:
         specifier: ^1.2.1
         version: 1.3.1
       pako:
-        specifier: ^2.1.0
-        version: 2.1.0
+        specifier: ^1.0.11
+        version: 1.0.11
       pinia:
         specifier: ^3.0.2
         version: 3.0.2(typescript@5.7.3)(vue@3.5.13(typescript@5.7.3))
@@ -706,8 +706,8 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  pako@2.1.0:
-    resolution: {integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==}
+  pako@1.0.11:
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
   path-browserify@1.0.1:
     resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
@@ -1626,7 +1626,7 @@ snapshots:
 
   nanoid@3.3.11: {}
 
-  pako@2.1.0: {}
+  pako@1.0.11: {}
 
   path-browserify@1.0.1: {}
 
diff --git a/src/common/MaterialSerializer.ts b/src/common/MaterialSerializer.ts
index 9001e8b..400cb38 100644
--- a/src/common/MaterialSerializer.ts
+++ b/src/common/MaterialSerializer.ts
@@ -1,4 +1,4 @@
-import { CADFactory, CADFiler, CADObject, Database, DuplicateRecordCloning, ObjectId, PhysicalMaterialRecord } from "webcad_ue4_api";
+import { CADFactory, CADFiler, CADObject, Database, DuplicateRecordCloning, Factory, LayerNode, ObjectId, PhysicalMaterialRecord } from "webcad_ue4_api";
 
 // TODO: Danger: 注意入侵性代码
 // 疑似是WebCAD中的漏洞，当传入new Database()时，
diff --git a/src/components/MaterialAdjuster.vue b/src/components/MaterialAdjuster.vue
index 8be4fe9..55782d1 100644
--- a/src/components/MaterialAdjuster.vue
+++ b/src/components/MaterialAdjuster.vue
@@ -10,10 +10,10 @@
             <label>材质名</label>
             <input v-model.trim="materialInfo.materialName" type="text" placeholder="材质名" />
 
-            <!-- <CfFlex gap="1em">
+            <CfFlex gap="1em" v-if="debugMode">
                 <button class="btn-success" style="min-width: 110px;" @click="HandleUpload">上传</button>
                 <button class="btn-danger" style="min-width: 110px;" @click="HandleCancel">取消</button>
-            </CfFlex> -->
+            </CfFlex>
         </div>
 
         <div class="adjust-section">
diff --git a/src/components/MaterialView.vue b/src/components/MaterialView.vue
index f127c61..68356cf 100644
--- a/src/components/MaterialView.vue
+++ b/src/components/MaterialView.vue
@@ -59,8 +59,8 @@ async function HandleUpdateConfig() {
 <style scoped lang="scss">
 .material-view
 {
-    width: 100%;
-    height: 100%;
+    width: 100cqw;
+    height: 100cqh;
     box-sizing: border-box;
     padding: 0;
     margin: 0;
diff --git a/src/helpers/helper.material.ts b/src/helpers/helper.material.ts
index 7e1054f..a462871 100644
--- a/src/helpers/helper.material.ts
+++ b/src/helpers/helper.material.ts
@@ -8,8 +8,9 @@ export function ToDeflatedBase64(materialJson: string)
 
 export function FromDeflateBase64(base64: string) {
     let binaryString = atob(base64);
-    console.log("Bin", binaryString);
+    // TODO: Danger: 压缩数据有问题，使用fflate或是pako@2.1.0会出现EOF/unknown compression method错误，必须要使用pako@1.0.11才行
     let data = Pako.inflate(binaryString as any, { to: "string" });
+    // let data = U8ToStr(Deflate(binaryString));
     console.log("data", data);
     return data;
 }
\ No newline at end of file
diff --git a/src/lib/entry.ts b/src/lib/entry.ts
index 4cddf4d..70aae90 100644
--- a/src/lib/entry.ts
+++ b/src/lib/entry.ts
@@ -7,6 +7,7 @@ import { ConfigureLibOutput, type LibOutputConfig } from './libOutputConfig';
 import { useEvent } from '../stores/eventStore';
 import { useScene, useSceneRaw } from '../stores/sceneStore';
 import { DeflateAsync } from '../helpers/helper.compression';
+import { CADFactory, Factory, LayerNode } from 'webcad_ue4_api';
 
 let app: VueApp<Element> = undefined;
 
@@ -19,6 +20,12 @@ export function Mount(element: Element, options: Partial<LibOutputConfig>) {
     ConfigureLibOutput(options);
 
     const pinia = createPinia();
+
+    // TODO: Warn: 有BUG，部分实体的构造函数名带_1后缀，原因未知，这会导致CADFactory在创建实体时找不到注册的类名
+    // @ts-ignore
+    // console.log(CADFactory.factory.objectNameMap); // 为什么Map中的构造函数名带_1后缀？
+    CADFactory.RegisterObjectAlias(LayerNode, "LayerNode");
+
     app = createApp(App);
     app.use(pinia)
         .mount(element);