ananzhusen пре 1 година
родитељ
комит
67e9b6f171
2 измењених фајлова са 14 додато и 11 уклоњено
  1. 11 8
      src/services/download.ts
  2. 3 3
      src/views/components/Header.vue

+ 11 - 8
src/services/download.ts

@@ -3,6 +3,9 @@ import {
   checkData,
 } from '@/services/utils';
 
+export const img_cdn = 'https://assets.le5lecdn.com';
+export const img_upCdn = 'https://drive.le5lecdn.com';
+
 export const getDownloadList = (meta2dData:any, path:string='v') => {
   const lists = new Set();
   //TODO 加一个type区分是数据/还是接口
@@ -10,8 +13,8 @@ export const getDownloadList = (meta2dData:any, path:string='v') => {
   // const meta2dData = meta2d.data();
   let img = meta2dData.bkImage;
   if (img) {
-    if (img.startsWith('/') || img.startsWith(cdn) || img.startsWith(upCdn)) {
-      let _img = img.replace(cdn, '').replace(upCdn, '');
+    if (img.startsWith('/') || img.startsWith(img_cdn) || img.startsWith(img_upCdn)) {
+      let _img = img.replace(img_cdn, '').replace(img_upCdn, '');
       if(_img.startsWith('/v/')){
         _img = _img.slice(2);
       }
@@ -31,11 +34,11 @@ export const getDownloadList = (meta2dData:any, path:string='v') => {
       if (image) {
         if (
           image.startsWith('/') ||
-          image.startsWith(cdn) ||
-          image.startsWith(upCdn)
+          image.startsWith(img_cdn) ||
+          image.startsWith(img_upCdn)
         ) {
           // 只考虑相对路径下的 image ,绝对路径图片无需下载
-          let _img = image.replace(cdn, '').replace(upCdn, '');
+          let _img = image.replace(img_cdn, '').replace(img_upCdn, '');
           if(_img.startsWith('/v/')){
             _img = _img.slice(2);
           }
@@ -54,7 +57,7 @@ export const getDownloadList = (meta2dData:any, path:string='v') => {
   
   //其他文件
   const files = [
-    // '/view/assets/index.js',
+    '/view/assets/index.js',
     '/view/assets/index.css',
     '/view/css/index.css',
 
@@ -64,7 +67,7 @@ export const getDownloadList = (meta2dData:any, path:string='v') => {
     '/view/js/lcjs.iife.js',
     '/view/js/highcharts.js',
     '/view/js/highcharts-more.js',
-    '/view/js/2d-components.js',
+    // '/view/js/2d-components.js',
 
     '/view/index.html',
     '/view/favicon.ico',
@@ -85,7 +88,7 @@ export const getDownloadList = (meta2dData:any, path:string='v') => {
   if ((meta2dData as any).image) delete (meta2dData as any).image;
   checkData(meta2dData);
   lists.add({
-    data:JSON.stringify(meta2dData).replaceAll(cdn, '').replaceAll(upCdn, ''),
+    data:JSON.stringify(meta2dData).replaceAll(img_cdn, '').replaceAll(img_upCdn, ''),
     path:`/view/projects/${path}/data`,
   });
 

+ 3 - 3
src/views/components/Header.vue

@@ -739,7 +739,7 @@ const downloadHtml = async () => {
   const pen_3d = meta2dData.pens.filter(
     (pen) =>
       pen.name === 'iframe' &&
-      (pen.iframe.indexOf('3d.le5le.com') !== -1)
+      (pen.iframe.indexOf('3d.le5le.com') !== -1||pen.iframe.indexOf('/3d/') !== -1)
   );
   if (pen_3d && pen_3d.length) {
     //存在3d场景
@@ -779,7 +779,7 @@ const downloadHtml = async () => {
   const pen_2d = meta2dData.pens.filter(
     (pen) =>
       pen.name === 'iframe' &&
-      (pen.iframe.indexOf('2d.le5le.com') !== -1)
+      (pen.iframe.indexOf('2d.le5le.com') !== -1||pen.iframe.indexOf('/2d/') !== -1)
   );
   if (pen_2d && pen_2d.length) {
     //存在3d场景
@@ -819,7 +819,7 @@ const downloadHtml = async () => {
   const pen_v = meta2dData.pens.filter(
     (pen) =>
       pen.name === 'iframe' &&
-      (pen.iframe.indexOf('v.le5le.com') !== -1)
+      (pen.iframe.indexOf('v.le5le.com') !== -1||pen.iframe.indexOf('/v/') !== -1)
   );
 
   if (pen_v && pen_v.length) {