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

fix: DEFECT-1380 修复看板管理控制组件首次进入时属性被重置

See merge request yunteng/thingskit-front!682

@@ -61,7 +61,7 @@
     return isBoolean(componetDesign) ? componetDesign : true;
     return isBoolean(componetDesign) ? componetDesign : true;
   });
   });
 
 
-  const setDataSourceFormsEl = (uuid: string, instance: PublicFormInstaceType, index) => {
+  const setDataSourceFormsEl = (uuid: string, instance: PublicFormInstaceType, index: number) => {
     const findIndex = unref(props.dataSource).findIndex((item) => item.uuid === uuid);
     const findIndex = unref(props.dataSource).findIndex((item) => item.uuid === uuid);
     if (~findIndex) {
     if (~findIndex) {
       dataSourceFormsEl.value[index] = { uuid, instance };
       dataSourceFormsEl.value[index] = { uuid, instance };

@@ -49,6 +49,8 @@
 
 
   const dataSourceFormSpinning = ref(false);
   const dataSourceFormSpinning = ref(false);
 
 
+  let firstEnter = true;
+
   const selectWidgetKeys = ref<SelectedWidgetKeys>({
   const selectWidgetKeys = ref<SelectedWidgetKeys>({
     componentKey: TextComponent1Config.key,
     componentKey: TextComponent1Config.key,
     categoryKey: PackagesCategoryEnum.TEXT,
     categoryKey: PackagesCategoryEnum.TEXT,
@@ -69,7 +71,7 @@
     } as DataSourceType;
     } as DataSourceType;
   };
   };
 
 
-  const dataSource = ref<DataSourceType[]>(Array.from({ length: 1 }, () => genNewDataSourceItem()));
+  const dataSource = ref<DataSourceType[]>([]);
 
 
   const currentMode = ref<DataActionModeEnum>(DataActionModeEnum.CREATE);
   const currentMode = ref<DataActionModeEnum>(DataActionModeEnum.CREATE);
 
 
@@ -83,6 +85,7 @@
       const { mode, record } = params;
       const { mode, record } = params;
       currentMode.value = mode;
       currentMode.value = mode;
       currentRecord.value = record;
       currentRecord.value = record;
+      firstEnter = false;
       if (mode === DataActionModeEnum.UPDATE) {
       if (mode === DataActionModeEnum.UPDATE) {
         const config = useGetComponentConfig(record.frontId);
         const config = useGetComponentConfig(record.frontId);
         if (!config) return;
         if (!config) return;
@@ -128,12 +131,17 @@
         const category = useGetCategoryByComponentKey(value);
         const category = useGetCategoryByComponentKey(value);
         const needReset =
         const needReset =
           [oldCategory, category].some((item) => item === PackagesCategoryEnum.CONTROL) &&
           [oldCategory, category].some((item) => item === PackagesCategoryEnum.CONTROL) &&
-          oldCategory !== category;
+          oldCategory !== category &&
+          firstEnter;
+
+        firstEnter = true;
+
         dataSource.value = unref(dataSource).map((item) => ({
         dataSource.value = unref(dataSource).map((item) => ({
           ...item,
           ...item,
           ...(needReset ? { attribute: null } : {}),
           ...(needReset ? { attribute: null } : {}),
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
         }));
         }));
+
         if ((window as any).requestIdleCallback as unknown as boolean) {
         if ((window as any).requestIdleCallback as unknown as boolean) {
           (window as any).requestIdleCallback(
           (window as any).requestIdleCallback(
             () => {
             () => {

@@ -57,7 +57,6 @@
       offset: item.value,
       offset: item.value,
       color: item.color,
       color: item.color,
     }));
     }));
-    console.log(array, colorList);
     return colorList as any;
     return colorList as any;
   };
   };