feat:conflict

src/services/common.ts

@@ -234,7 +234,7 @@ export const _save = async (
   }
 
   //如果不是自己创建的团队图纸，就不去修改缩略图（没有权限去删除缩略图）
-  if (!(data.teams && data.owner?.id !== user.id)) {
+  if (!(data.teams && data.ownerId !== user.id)) {
     for (const pen of meta2d.store.data.pens) {
       if (['iframe'].includes(pen.name)) {
         //重新生成绘制图片
@@ -377,7 +377,7 @@ export const _save = async (
   globalThis.afterSaveMeta2d && (await globalThis.afterSaveMeta2d(ret));
   if (
     !data._id ||
-    data.owner?.id !== user.id ||
+    data.ownerId !== user.id ||
     router.currentRoute.value.query.version ||
     type === SaveType.SaveAs // 另存为肯定走新增，也会产生新的 id
   ) {
@@ -555,7 +555,7 @@ export const save = async (
     data.name = `新建项目`;
     (meta2d.store.data as Meta2dBackData).name = data.name;
   }
-  // if (!(data.teams && data.owner?.id !== user.id)) {
+  // if (!(data.teams && data.ownerId !== user.id)) {
     for (const pen of meta2d.store.data.pens) {
       if (['iframe'].includes(pen.name)) {
         //重新生成绘制图片
@@ -804,8 +804,8 @@ export function autoSave(force = false) {
     user.vip &&
     (data.id||data._id) &&
     !data.component &&
-    data.owner &&
-    data.owner.id === user.id
+    // data.owner &&
+    data.ownerId === user.id
   ) {
     let _vType = '';
     if (data.tags.includes('模板')) {