소스 검색

完善大屏新接口的调整

Wind-Breaker1 1 년 전
부모
커밋
c548321e87
3개의 변경된 파일18개의 추가작업 그리고 9개의 파일을 삭제
  1. 12 4
      src/services/common.ts
  2. 5 4
      src/views/components/Graphics.vue
  3. 1 1
      src/views/components/Header.vue

+ 12 - 4
src/services/common.ts

@@ -458,6 +458,7 @@ export const save = async (
       return;
     }
     MessagePlugin.success('成功保存为组件!');
+    meta2d.emit('business-save', vType);
     return;
   }
   //删除老图片  新图片上传
@@ -474,24 +475,27 @@ export const save = async (
     !data.tags.includes('系统方案')
   ) {
     if (vType === 'v-template') {
-      if (data.tags && !data.tags.includes('模板')) {
+      if (!data.tags.includes('模板')) {
         delete data.id;
         delete data._id;
         delete data.folder;
+        data.image = data.image?.split('_').shift();// 避免保存为不同类型会增加不必要的唯一字符串
       }
       data.tags = ['模板'];
     } else if (!vType) {
-      if (data.tags && !data.tags.includes('方案')) {
+      if (!data.tags.includes('方案')) {
         delete data.id;
         delete data._id;
         delete data.folder;
+        data.image = data.image?.split('_').shift();
       }
       data.tags = ['方案'];
     } else if(vType === 'v.component') {
-      if (data.tags && (!data.tags.includes('组件'))) {
+      if (!data.tags.includes('组件')) {
         delete data.id;
         delete data._id;
         delete data.folder;
+        data.image = data.image?.split('_').shift();
       }
       data.tags = ['组件'];
     }
@@ -512,7 +516,8 @@ export const save = async (
   //如果不是自己创建的团队图纸,就不去修改缩略图(没有权限去删除缩略图)
   if (!data.name) {
     // 文件名称
-    data.name = `meta2d.${new Date().toLocaleString()}`;
+    // data.name = `meta2d.${new Date().toLocaleString()}`;
+    data.name = `新建图纸`;
     (meta2d.store.data as Meta2dBackData).name = data.name;
   }
   if (!(data.teams && data.owner?.id !== user.id)) {
@@ -583,6 +588,9 @@ export const save = async (
     shared:true,
     userFlag
   }
+  if (!data.tags || !data.tags.length) {
+    data.tags = [thumbFolder];
+  }
   if (type === SaveType.SaveAs) {
     // 另存为一定走 新增 ,由于后端 未控制 userId 等属性,清空一下
     for (const k of delAttrs) {

+ 5 - 4
src/views/components/Graphics.vue

@@ -780,8 +780,8 @@ const getCaseProjects = async (name: string,systemFlag = 1, current = 1, pageSiz
   const ret: any = await axios.post(
     `/api/data/${collection}/list`,
     {
-      query,
-      shared: 'true',
+      // query,
+      shared: true,
       projection: {
         id: 1,
         _id: 1,
@@ -790,7 +790,7 @@ const getCaseProjects = async (name: string,systemFlag = 1, current = 1, pageSiz
         price: 1,
         case: 1,
       },
-      sort: { createdAt: 1 },
+      // sort: { createdAt: 1 },
       systemFlag
     },
     {
@@ -1673,7 +1673,7 @@ const _delComponent = async () => {
     );
     await axios.post(`/api/files/delete`, {
       fullnames: [delDialog.contextmenuObj.component.filename],
-      physically: false,
+      physically: true,
     });
   }
   delDialog.show = false;
@@ -1946,6 +1946,7 @@ const delFolder = async (item: any) => {
 
   ret = await axios.post('/api/directory/delete', {
     fullpaths: [`/大屏/${activedGroup.value}/${item.name}`],
+    physically: true
   });
   if (ret) {
     const i = subGroups.value.findIndex(

+ 1 - 1
src/views/components/Header.vue

@@ -26,7 +26,7 @@
           <a @click="save()">保存</a>
         </t-dropdown-item>
         <t-dropdown-item>
-          <a @click="save(SaveType.SaveAs)">另保存</a>
+          <a @click="save(SaveType.SaveAs,'',undefined,1)">另保存</a>
         </t-dropdown-item>
         <t-dropdown-item divider="true">
           <a @click="downloadJson">下载JSON文件</a>