Merge branch 'fix/DEFECT-1302' into 'main_dev'

fix: DEFECT-1302修复组件复制功能,复制的组件布局信息为初始化布局信息

See merge request yunteng/thingskit-front!632

@@ -12,10 +12,11 @@
   import { addDataComponent, deleteDataComponent } from '/@/api/dataBoard';
   import { addDataComponent, deleteDataComponent } from '/@/api/dataBoard';
   import { useBoardId } from '../../hooks/useBoardId';
   import { useBoardId } from '../../hooks/useBoardId';
   import { unref, toRaw } from 'vue';
   import { unref, toRaw } from 'vue';
-  import { ApiDataBoardDataType } from '../../types';
+  import { ApiDataBoardDataType, ComponentLayoutType } from '../../types';
   import { useCalcNewWidgetPosition } from '../../hooks/useCalcNewWidgetPosition';
   import { useCalcNewWidgetPosition } from '../../hooks/useCalcNewWidgetPosition';
   import { Layout } from 'vue3-grid-layout';
   import { Layout } from 'vue3-grid-layout';
   import { DataComponentRecord } from '/@/api/dataBoard/model';
   import { DataComponentRecord } from '/@/api/dataBoard/model';
+  import { computed } from 'vue';
 
 
   const props = defineProps<{
   const props = defineProps<{
     sourceInfo: WidgetDataType;
     sourceInfo: WidgetDataType;
@@ -72,11 +73,16 @@
     } catch (error) {}
     } catch (error) {}
   }
   }
 
 
+  const getLayout = computed(() => {
+    const { sourceInfo } = props;
+    const { id, w, h, x, y } = sourceInfo;
+    return { id, w, h, x, y } as ComponentLayoutType;
+  });
+
   async function handleCopy() {
   async function handleCopy() {
     const id = props.sourceInfo.id;
     const id = props.sourceInfo.id;
     const copyRecord = props.rawDataSource.componentData.find((item) => item.id === id);
     const copyRecord = props.rawDataSource.componentData.find((item) => item.id === id);
-    const copyLayout = props.rawDataSource.componentLayout.find((item) => item.id === id);
-
+    const copyLayout = unref(getLayout);
     const raw = toRaw(copyRecord) as unknown as DataComponentRecord;
     const raw = toRaw(copyRecord) as unknown as DataComponentRecord;
 
 
     const layout = useCalcNewWidgetPosition(
     const layout = useCalcNewWidgetPosition(

@@ -104,9 +104,10 @@ export const useDataSource = (propsRef: ComputedRef<Recordable>) => {
    */
    */
   const setLayoutInfo = async () => {
   const setLayoutInfo = async () => {
     try {
     try {
+      const layout = getLayoutInfo();
       await updateDataBoardLayout({
       await updateDataBoardLayout({
         boardId: unref(getBoardId),
         boardId: unref(getBoardId),
-        layout: getLayoutInfo(),
+        layout,
       });
       });
     } catch (error) {}
     } catch (error) {}
   };
   };