Commit 7f8f0cdddb5325dbd3b4d23a6ee6424582023692
Merge branch 'fix/DEFECT-2620' into 'main_dev'
fix: 修复看板开关量状态组件颜色不对 See merge request yunteng/thingskit-front!1447
Showing
2 changed files
with
4 additions
and
4 deletions
| ... | ... | @@ -263,7 +263,7 @@ |
| 263 | 263 | // 判断当前自定义组件表单以前的自定义图片呢url |
| 264 | 264 | currentRecord.value?.dataSource.forEach((item) => { |
| 265 | 265 | if (item.componentInfo?.customIcon) { |
| 266 | - item.componentInfo?.customIcon.forEach((icon: FileItem) => { | |
| 266 | + item.componentInfo?.customIcon?.forEach((icon: FileItem) => { | |
| 267 | 267 | currentRecordIconUrl.value.push(icon.url); |
| 268 | 268 | }); |
| 269 | 269 | } |
| ... | ... | @@ -284,7 +284,7 @@ |
| 284 | 284 | oldDataSource?.forEach((item: any) => { |
| 285 | 285 | item.dataSource?.forEach((dataSource) => { |
| 286 | 286 | if (dataSource.componentInfo?.customIcon) { |
| 287 | - dataSource.componentInfo?.customIcon.forEach((icon: FileItem) => { | |
| 287 | + dataSource.componentInfo?.customIcon?.forEach((icon: FileItem) => { | |
| 288 | 288 | customIconUrls.value.push(icon.url); |
| 289 | 289 | }); |
| 290 | 290 | } | ... | ... |
| ... | ... | @@ -83,10 +83,10 @@ |
| 83 | 83 | <div class="flex flex-1 flex-col justify-center items-center"> |
| 84 | 84 | <SvgIcon |
| 85 | 85 | v-if="getDesign.defaultCustom !== 'custom'" |
| 86 | - :name="isOpenClose ? getDesign.icon : getDesign.iconClose" | |
| 86 | + :name="getDesign.iconClose" | |
| 87 | 87 | prefix="iconfont" |
| 88 | 88 | :size="getRatio ? getRatio * 70 : 70" |
| 89 | - :style="{ color: getDesign.iconColor }" | |
| 89 | + :style="{ color: isOpenClose ? getDesign.iconColor : getDesign.iconColorClose }" | |
| 90 | 90 | /> |
| 91 | 91 | <img |
| 92 | 92 | v-else | ... | ... |