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

fix: 修复看板开关量状态组件颜色不对

See merge request yunteng/thingskit-front!1447

@@ -263,7 +263,7 @@
       // 判断当前自定义组件表单以前的自定义图片呢url
       // 判断当前自定义组件表单以前的自定义图片呢url
       currentRecord.value?.dataSource.forEach((item) => {
       currentRecord.value?.dataSource.forEach((item) => {
         if (item.componentInfo?.customIcon) {
         if (item.componentInfo?.customIcon) {
-          item.componentInfo?.customIcon.forEach((icon: FileItem) => {
+          item.componentInfo?.customIcon?.forEach((icon: FileItem) => {
             currentRecordIconUrl.value.push(icon.url);
             currentRecordIconUrl.value.push(icon.url);
           });
           });
         }
         }
@@ -284,7 +284,7 @@
       oldDataSource?.forEach((item: any) => {
       oldDataSource?.forEach((item: any) => {
         item.dataSource?.forEach((dataSource) => {
         item.dataSource?.forEach((dataSource) => {
           if (dataSource.componentInfo?.customIcon) {
           if (dataSource.componentInfo?.customIcon) {
-            dataSource.componentInfo?.customIcon.forEach((icon: FileItem) => {
+            dataSource.componentInfo?.customIcon?.forEach((icon: FileItem) => {
               customIconUrls.value.push(icon.url);
               customIconUrls.value.push(icon.url);
             });
             });
           }
           }

@@ -83,10 +83,10 @@
     <div class="flex flex-1 flex-col justify-center items-center">
     <div class="flex flex-1 flex-col justify-center items-center">
       <SvgIcon
       <SvgIcon
         v-if="getDesign.defaultCustom !== 'custom'"
         v-if="getDesign.defaultCustom !== 'custom'"
-        :name="isOpenClose ? getDesign.icon : getDesign.iconClose"
+        :name="getDesign.iconClose"
         prefix="iconfont"
         prefix="iconfont"
         :size="getRatio ? getRatio * 70 : 70"
         :size="getRatio ? getRatio * 70 : 70"
-        :style="{ color: getDesign.iconColor }"
+        :style="{ color: isOpenClose ? getDesign.iconColor : getDesign.iconColorClose }"
       />
       />
       <img
       <img
         v-else
         v-else