feat:conflict

src/services/defaults.ts

@@ -4983,7 +4983,7 @@ context.meta2d.translate(
       },
       {
         name: '树形选择器',
-        icon: 'l-shu-copy',
+        icon: 'l-shuxingxuanzeqi',
         data: {
           width: 300,
           height: 64,

src/services/download.ts

@@ -269,10 +269,25 @@ export const getDownloadList = (meta2dData: any, path: string = 'v') => {
       '/view/theme/light.json',
     ];
     files.forEach((file) => {
-      lists.add({
-        url: (cdn ? cdn : '') + file,
-        path: file,
-      });
+      // lists.add({
+      //   url: (cdn ? cdn : '') + file,
+      //   path: file,
+      // });
+      let _file = file;
+      // if(file === '/view/assets/index.js' && !flag_3d){
+      //   _file = '/v/view/index.js';
+      // }
+      if(_file.startsWith('/view/css/v')){
+        lists.add({
+          url: (cdn ? cdn + '/v' : import.meta.env.BASE_URL.slice(0, -1)) + _file,
+          path: file,
+        });
+      }else{
+        lists.add({
+          url: (cdn ? cdn : '') + _file,
+          path: file,
+        });
+      }
     });
   }
   if(meta2dData){
@@ -391,6 +406,8 @@ export const getComponentPurchased = async (list: any) => {
   }
   const res: any = await axios.post('/api/paid/2d/component?pageSize=1000', {
     list: _list,
+    // collection:'v',
+    // id:meta2d.store.data.id
   });
 
   if (res?.error) {
@@ -423,6 +440,8 @@ export const get2dComponentJs = async (names: string[] = components) => {
     '/api/2d-component.js',
     {
       // list,
+      // collection:'v',
+      // id:meta2d.store.data.id
     },
     {
       responseType: 'blob',
@@ -434,6 +453,8 @@ export const get2dComponentJs = async (names: string[] = components) => {
 export const getTemPngs = async (names: string[]) => {
   const res: any = await axios.post('/api/file/presign', {
     names,
+    // collection:'v',
+    // id:meta2d.store.data.id
   });
   return res;
 };

src/views/components/Project.vue

@@ -237,7 +237,7 @@ const onDescription = (node: any) => {
 };
 
 const ondblclick = (node: any) => {
-  if (node.data.value !== data.actived[0]) {
+  if (node.data.type==='page' && node.data.value !== data.actived[0]) {
     return;
   }
   node.data.edited = true;