Merge branch 'dev'

src/views/chart/ContentEdit/components/EditShapeBox/index.vue

@@ -23,6 +23,8 @@
 <script setup lang="ts">
 import { computed, PropType } from 'vue'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
+
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { CreateComponentType, CreateComponentGroupType } from '@/packages/index.d'
 import { useSizeStyle, usePointStyle } from '../../hooks/useStyle.hook'
@@ -55,6 +57,9 @@ const themeColor = computed(() => {
 
 // 计算当前选中目标
 const hover = computed(() => {
+  const isDrag = chartEditStore.getEditCanvas[EditCanvasTypeEnum.IS_DRAG]
+  if (isDrag) return false
+
   if (props.item.status.lock) return false
   return props.item.id === chartEditStore.getTargetChart.hoverId
 })

src/views/chart/ContentEdit/hooks/useLayout.hook.ts

@@ -5,8 +5,9 @@ import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStor
 const chartEditStore = useChartEditStore()
 
 // 布局处理
-export const useLayout = () => {
-  onMounted(() => {
+export const useLayout = (fn: () => Promise<void>) => {
+  let removeScale: Function = () => { }
+  onMounted(async () => {
     // 设置 Dom 值(ref 不生效先用 document)
     chartEditStore.setEditCanvas(
       EditCanvasTypeEnum.EDIT_LAYOUT_DOM,
@@ -17,13 +18,16 @@ export const useLayout = () => {
       document.getElementById('go-chart-edit-content')
     )
 
+    // 获取数据
+    await fn()
     // 监听初始化
-    const removeScale = chartEditStore.listenerScale()
+    removeScale = chartEditStore.listenerScale()
 
-    onUnmounted(() => {
-      chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_LAYOUT_DOM, null)
-      chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_CONTENT_DOM, null)
-      removeScale()
-    })
+  })
+
+  onUnmounted(() => {
+    chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_LAYOUT_DOM, null)
+    chartEditStore.setEditCanvas(EditCanvasTypeEnum.EDIT_CONTENT_DOM, null)
+    removeScale()
   })
 }

src/views/chart/ContentEdit/index.vue

@@ -109,10 +109,10 @@ const chartEditStore = useChartEditStore()
 const { handleContextMenu } = useContextMenu()
 
 // 编辑时注入scale变量，消除警告
-provide(SCALE_KEY, null);
+provide(SCALE_KEY, null)
 
 // 布局处理
-useLayout()
+useLayout(async () => {})
 
 // 点击事件
 const { mouseenterHandle, mouseleaveHandle, mousedownHandle, mouseClickHandle } = useMouseHandle()

src/views/chart/hooks/useSync.hook.ts

@@ -185,6 +185,11 @@ export const useSync = () => {
           } else {
             await create(comItem as CreateComponentType)
           }
+          if (percentage === 100) {
+            // 清除历史记录
+            chartHistoryStore.clearBackStack()
+            chartHistoryStore.clearForwardStack()
+          }
         }
       } else {
         // 非组件(顺便排除脏数据)

src/views/project/items/components/ProjectItemsCard/index.vue

@@ -131,20 +131,6 @@ const selectOptions = ref([
     key: 'preview',
     icon: renderIcon(BrowsersOutlineIcon)
   },
-  {
-    label: renderLang('global.r_copy'),
-    key: 'copy',
-    icon: renderIcon(CopyIcon)
-  },
-  {
-    label: renderLang('global.r_rename'),
-    key: 'rename',
-    icon: renderIcon(PencilIcon)
-  },
-  {
-    type: 'divider',
-    key: 'd1'
-  },
   {
     label: props.cardData?.release
       ? renderLang('global.r_unpublish')
@@ -152,15 +138,6 @@ const selectOptions = ref([
     key: 'send',
     icon: renderIcon(SendIcon)
   },
-  {
-    label: renderLang('global.r_download'),
-    key: 'download',
-    icon: renderIcon(DownloadIcon)
-  },
-  {
-    type: 'divider',
-    key: 'd2'
-  },
   {
     label: renderLang('global.r_delete'),
     key: 'delete',