Merge branch 'fix/data-board-error' into 'main_dev'

fix: 修复数据看板阻塞性报错

See merge request yunteng/thingskit-front!637

@@ -84,6 +84,7 @@
       currentRecord.value = record;
       currentRecord.value = record;
       if (mode === DataActionModeEnum.UPDATE) {
       if (mode === DataActionModeEnum.UPDATE) {
         const config = useGetComponentConfig(record.frontId);
         const config = useGetComponentConfig(record.frontId);
+        if (!config) return;
         selectWidgetKeys.value = {
         selectWidgetKeys.value = {
           componentKey: config.componentConfig.key,
           componentKey: config.componentConfig.key,
           categoryKey: config.componentConfig.package,
           categoryKey: config.componentConfig.package,
@@ -124,8 +125,8 @@
           ...item,
           ...item,
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
         }));
         }));
-        if (window.requestIdleCallback as unknown as boolean) {
-          requestIdleCallback(
+        if ((window as any).requestIdleCallback as unknown as boolean) {
+          (window as any).requestIdleCallback(
             () => {
             () => {
               setFormValues({ dataSource: unref(dataSource) } as WidgetDataType);
               setFormValues({ dataSource: unref(dataSource) } as WidgetDataType);
             },
             },

@@ -7,7 +7,7 @@ import { Component } from 'vue';
  */
  */
 export const transformComponentKey = (string: string) => {
 export const transformComponentKey = (string: string) => {
   const CONNECTION_SYMBOL = '-';
   const CONNECTION_SYMBOL = '-';
-  const needTransformFlag = string.includes(CONNECTION_SYMBOL);
+  const needTransformFlag = (string || '').includes(CONNECTION_SYMBOL);
 
 
   if (needTransformFlag) {
   if (needTransformFlag) {
     return string
     return string

@@ -30,7 +30,6 @@
 
 
   const getComponentConfig = computed(() => {
   const getComponentConfig = computed(() => {
     const { widthPx, heightPx, itemWidthRatio, itemHeightRatio, frontId } = props.sourceInfo;
     const { widthPx, heightPx, itemWidthRatio, itemHeightRatio, frontId } = props.sourceInfo;
-
     return useGetComponentConfig(frontId, {
     return useGetComponentConfig(frontId, {
       widthPx,
       widthPx,
       heightPx,
       heightPx,

@@ -12,3 +12,9 @@
     <slot name="footer"></slot>
     <slot name="footer"></slot>
   </section>
   </section>
 </template>
 </template>
+
+<style lang="less" scoped>
+  :deep(.ant-spin-spinning) {
+    @apply flex justify-center items-center w-full h-full;
+  }
+</style>

@@ -60,12 +60,25 @@ export const useDataSource = (propsRef: ComputedRef<Recordable>) => {
       loading.value = true;
       loading.value = true;
       const { data } = await getDataBoradDetail();
       const { data } = await getDataBoradDetail();
       rawDataSource.value = data;
       rawDataSource.value = data;
+      // const result: WidgetDataType[] = (data.componentData || []).map((item) => {
+      //   const { id } = item;
+
+      //   const layout =
+      //     (data.componentLayout || []).find((item) => item.id === id) ||
+      //     ({} as ComponentLayoutType);
+
+      //   return {
+      //     i: buildUUID(),
+      //     ...layout,
+      //     ...item,
+      //   } as WidgetDataType;
+      // });
       const result: WidgetDataType[] = data.componentLayout.map((item) => {
       const result: WidgetDataType[] = data.componentLayout.map((item) => {
         const { id } = item;
         const { id } = item;
         const dataSource =
         const dataSource =
-          data.componentData.find((item) => item.id == id) || ({} as ComponentDataType);
+          (data.componentData || []).find((item) => item.id == id) || ({} as ComponentDataType);
 
 
-        dataSource.dataSource = dataSource.dataSource.map((item) => ({
+        dataSource.dataSource = (dataSource.dataSource || []).map((item) => ({
           ...item,
           ...item,
           uuid: buildUUID(),
           uuid: buildUUID(),
         }));
         }));