feat:conflict

src/views/components/Header.vue

@@ -525,7 +525,8 @@ import {
   delAttrs,
   // useAssets,
   autoSaveAS,
-  queryURLParams
+  queryURLParams,
+  dealDataBeforeOpen
 } from '@/services/common';
 import { useEnterprise } from '@/services/enterprise';
 import {
@@ -774,16 +775,11 @@ const openJson = async (file: File) => {
     if(!data.color){
       data.color = '#bdc7db';
     }
-<<<<<<< HEAD
-    if(!data.width){data.width= 1920};
-    if(!data.height){data.height= 1080};
-=======
     dealDataBeforeOpen(data);
     if(!(data as any).oldV){
       if(!data.width){data.width= 1920};
       if(!data.height){data.height= 1080};
     }
->>>>>>> ceec9b7 (feat:2d格式转大屏格式)
     meta2d.open(data);
   } catch (e) {
     console.error(e);