feat:cherry-pick conflict

package.json

@@ -19,6 +19,7 @@
     "@meta2d/le5le-charts": "^1.0.3",
     "@meta2d/sequence-diagram": "^1.0.0",
     "@meta2d/svg": "^1.0.3",
+    "@meta2d/utils": "^1.0.0",
     "axios": "^0.26.0",
     "dayjs": "^1.11.5",
     "exceljs": "^4.3.0",

src/services/defaults.ts

@@ -3694,6 +3694,16 @@ export const templates: any[] = [
 ];
 
 export const defaultPureColor: string[] = [
+  '#FF5959',
+  '#F5693B',
+  '#E6B420',
+  '#30EE6F',
+  '#30EEDC',
+  '#31A7F5',
+  '#7381FF',
+  '#AB73FF',
+  '#F054B1',
+  '#F75781',
   '#ff925c',
   '#e6d950',
   '#51e69b',

src/views/Preview.vue

@@ -20,12 +20,12 @@ const meta2dDom = ref('');
 
 const meta2dOptions: Options = {
   cdn,
-  background: '#1e2430',
-  x: 10,
-  y: 10,
-  width: 1920,
-  color: '#bdc7db',
-  height: 1080,
+  // background: '#1e2430',
+  // x: 10,
+  // y: 10,
+  // width: 1920,
+  // color: '#bdc7db',
+  // height: 1080,
   defaultFormat: { ...defaultFormat },
 };
 
@@ -81,13 +81,27 @@ const watcher = watch(
 const open = async () => {
   if (route.query.id) {
     const ret: any = await getLe5leV(route.query.id + '');
-    ret && ret.data && meta2d.open(ret.data);
+    if(ret && ret.data){
+      if(!ret.data.background){
+        ret.data.background = '#1e2430';
+      }
+      if(!ret.data.color){
+        ret.data.color = '#bdc7db';
+      }
+      meta2d.open(ret.data);
+    }
   } else {
     let data: any = await localforage.getItem(localStorageName);
     if (data) {
       data = JSON.parse(data);
       data.locked = 1;
       data.rule = false;
+      if(!data.background){
+        data.background = '#1e2430';
+      }
+      if(!data.color){
+        data.color = '#bdc7db';
+      }
       meta2d.open(data);
       bgColor.value = data.background;
     }
@@ -101,7 +115,7 @@ const opened = () => {
       : (meta2d.store.data as any).scaleMode === '2'
       ? 'width'
       : true;
-  meta2d.fitSizeView(fit, 0);
+  meta2d.fitView(fit, 0);
   meta2d.setOptions({
     scroll: (meta2d.store.data as any).scroll,
     disableScale: (meta2d.store.data as any).isDisableScale,

src/views/components/Graphics.vue

@@ -1273,6 +1273,12 @@ const open = async (item: any) => {
     ret.data.name = ret.name;
     ret.data.case = ret.case;
     autoSave();
+    if(!ret.data.background){
+      ret.data.background = '#1e2430';
+    }
+    if(!ret.data.color){
+      ret.data.color = '#bdc7db';
+    }
     meta2d.open(ret.data);
     meta2d.fitView();
   }

src/views/components/Header.vue

@@ -768,6 +768,12 @@ const openJson = async (file: File) => {
     for (const k of delAttrs) {
       delete (data as any)[k];
     }
+    if(!data.background){
+      data.background = '#1e2430';
+    }
+    if(!data.color){
+      data.color = '#bdc7db';
+    }
     meta2d.open(data);
   } catch (e) {
     console.error(e);
@@ -915,6 +921,12 @@ const openZip = async (file: File) => {
       for (const k of delAttrs) {
         delete (data as any)[k];
       }
+      if(!data.background){
+        data.background = '#1e2430';
+      }
+      if(!data.color){
+        data.color = '#bdc7db';
+      }
       meta2d.open(data);
     }
   } catch (e) {

src/views/components/View.vue

@@ -974,7 +974,7 @@ const meta2dOptions: Options = {
   cdn,
   rule: true,
   ruleColor:'#222E47',
-  background: '#1e2430',
+  // background: '#1e2430',
   ruleOptions:{
     background:'#121924',
     underline:true,
@@ -987,7 +987,7 @@ const meta2dOptions: Options = {
   y: 32,
   width: 1920,
   height: 1080,
-  color: '#bdc7db',
+  // color: '#bdc7db',
   disableAnchor: true,
   defaultFormat: { ...defaultFormat },
 };
@@ -1081,6 +1081,12 @@ const open = async (flag: boolean = false) => {
       ret.data.image = ret.image;
       ret.data.ownerId = ret.ownerId;
       ret.data.case = ret.case;
+      if(!ret.data.background){
+        ret.data.background = '#1e2430';
+      }
+      if(!ret.data.color){
+        ret.data.color = '#bdc7db';
+      }
       meta2d.open(ret.data);
       if (!route.query.c) {
         shared.value = ret.shared;
@@ -1100,6 +1106,8 @@ const open = async (flag: boolean = false) => {
     meta2d.open({
       name: '新建项目',
       pens: [],
+      background: '#1e2430',
+      color: '#bdc7db',
       enableMock: true,
       folder: route.query.folder,
       tags: route.query.tags ? [route.query.tags] : null,