feat:conflict

src/services/common.ts

@@ -559,7 +559,17 @@ export const save = async (
     data.name = `新建项目`;
     (meta2d.store.data as Meta2dBackData).name = data.name;
   }
+  let collection = data.component ? 'v.component' : 'v';
+
+  if(data.id && data.ownerId !== user.id){
+    //不是拥有者，判断有无编辑权限
+    let temRet:any = await updateCollection(collection, {id:data.id || data._id, name: data.name});
+    if(temRet.error){
+      return;
+    }
+  }
   // if (!data.id || (data.ownerId === user.id)) {
+    // 图纸不是创建用户的图纸 先不改缩略图
     for (const pen of meta2d.store.data.pens) {
       if (['iframe'].includes(pen.name)) {
         //重新生成绘制图片
@@ -619,7 +629,6 @@ export const save = async (
   } else {
     data.component = false; // 必要值
   }
-  let collection = data.component ? 'v.component' : 'v';
   let ret: any;
 
   !data.version && (data.version = baseVer);
@@ -683,30 +692,6 @@ export const save = async (
   if (ret.error) {
     return;
   }
-  if(data.ownerId !== user.id){
-    //不是拥有者，但有编辑权限 更新最新的缩略图
-    let blob: Blob;
-    try {
-      blob = dataURLtoBlob(meta2d.toPng(10) + '');
-    } catch (e) {
-      MessagePlugin.error(
-        '无法下载，宽度不合法，画布可能没有画笔/画布大小超出浏览器最大限制'
-      );
-      return;
-    }
-    let conflict = 'new';
-    const file:any = await upload(
-      blob,
-      true,
-      data.name,
-      `/大屏/${thumbFolder}/${data.folder || '默认'}`,
-      conflict
-    );
-    if (!file) {
-      return;
-    }
-    await updateCollection(collection, {id:data.id || data._id, image: file.url});
-  }
   //  保存图纸之后的钩子函数
   globalThis.afterSaveMeta2d && (await globalThis.afterSaveMeta2d(ret));
   if (