ananzhusen преди 1 година
родител
ревизия
9ba555c219
променени са 1 файла, в които са добавени 12 реда и са изтрити 11 реда
  1. 12 11
      src/views/components/Header.vue

+ 12 - 11
src/views/components/Header.vue

@@ -558,6 +558,7 @@ import { formComponents, rootDomain } from '@/services/defaults';
 import Pay from './Pay.vue';
 import {getNetJsDiagram} from '@/services/material';
 import { useMeta2dData } from '@/services/common';
+import { upload } from '@/services/file';
 
 const { enterprise } = useEnterprise();
 const router = useRouter();
@@ -806,7 +807,7 @@ const openZip = async (file: File) => {
     }
     if (key.endsWith('.json')) {
       // 认为只有一个 json 文件
-      // dataStr = await zip.file(key).async('string');
+      dataStr = await zip.file(key).async('string');
       break;
     }
   }
@@ -841,14 +842,14 @@ const openZip = async (file: File) => {
       filename = filename.substring(0, extPos > 8 ? 8 : extPos);
 
       // 上传文件
-      const result: any = {};
-      //   await upload(
-      //   // await zip.file(key).async('blob'),
-      //   true,
-      //   filename + ext,
-      //   "/2D/默认"
-      // );
-      let _key = key;
+      const result: any = await upload(
+        await zip.file(key).async('blob'),
+        true,
+        filename + ext
+      );
+      let arr =  key.split('/');
+      arr.shift();
+      let _key ='/'+ arr.join('/');
       // if (_png) {
       //   _key = key.substring(_png);
       // } else if (_image) {
@@ -861,10 +862,10 @@ const openZip = async (file: File) => {
       if (result) {
         if (dataStr.replaceAll) {
           //'le5le.meta2d'
-          dataStr = dataStr.replaceAll(_key.slice(12), result.url);
+          dataStr = dataStr.replaceAll(_key, result.url);
         } else {
           while (dataStr.includes(_key)) {
-            dataStr = dataStr.replace(_key.slice(12), result.url);
+            dataStr = dataStr.replace(_key, result.url);
             // 正则 gm 在特殊情况下报错,例如如下场景
             /**
                  *