Merge branch 'pgsql' of https://github.com/le5le-com/visualization-design into pgsql

src/services/common.ts

@@ -482,7 +482,7 @@ export const save = async (
         delete data.id;
         delete data._id;
         delete data.folder;
-        data.image = data.image?.split('_').shift();// 避免保存为不同类型会增加不必要的唯一字符串
+        // data.image = data.image?.split('_').pop();// 避免保存为不同类型会增加不必要的唯一字符串
       }
       data.tags = ['模板'];
     } else if (!vType) {
@@ -490,7 +490,7 @@ export const save = async (
         delete data.id;
         delete data._id;
         delete data.folder;
-        data.image = data.image?.split('_').shift();
+        // data.image = data.image?.split('_').pop();   
       }
       data.tags = ['方案'];
     } else if(vType === 'v.component') {
@@ -498,7 +498,7 @@ export const save = async (
         delete data.id;
         delete data._id;
         delete data.folder;
-        data.image = data.image?.split('_').shift();
+        // data.image = data.image?.split('_').pop();
       }
       data.tags = ['组件'];
     }
@@ -552,7 +552,7 @@ export const save = async (
       true,
       // 更新是缩略图路径一般为/file/2023/1025/1/1/新建项目_dfa573a5
       // data.image?.split('/').pop()更新操作项目名不变
-      data.image?.split('/').pop() || data.name,
+      data.name,
       `/大屏/${thumbFolder}/${data.folder || '默认'}`,
       conflict
     );
@@ -593,6 +593,9 @@ export const save = async (
     shared:true,
     userFlag
   }
+  delete data.name;
+  delete data.image;
+  delete data.folder;
   if (!data.tags || !data.tags.length) {
     data.tags = [thumbFolder];
   }

src/views/components/Graphics.vue

@@ -150,9 +150,7 @@
                   @click.stop="dragStart($event, elem)"
                   @dblclick.stop="open(elem)"
                   @contextmenu="onContextMenu($event, item, elem)"
-                  @touchstart.passive="
-                  dragStart($event, elem)
-                "
+                  @touchstart.passive="dragStart($event, elem)"
                 >
                 <!-- img 路径这样拼凑避免更新后路径一致图片使用缓存不更新 -->
                   <t-image
@@ -1800,7 +1798,7 @@ const delComponent = async () => {
   }
   await axios.post(`/api/files/delete`, {
     fullnames: [fullname],
-    physically: false,
+    physically: true,
   });
   delDialog.show = false;
   delDialog.contextmenuObj = {};

src/views/components/View.vue

@@ -937,6 +937,7 @@ const open = async (flag: boolean = false) => {
       }
       ret.data.id = ret.id;
       ret.data.folder = ret.folder;
+      ret.data.name = ret.name;
       meta2d.open(ret.data);
       if (!route.query.c) {
         shared.value = ret.shared;