diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java index b3de6ac1..44eb522b 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java @@ -137,6 +137,11 @@ public interface PageDesignConstant { */ String THEME_SWITCHER = "themeSwitcher"; + /** + * 主题选择器 + */ + String THEME_SELECT = "themeSelect"; + /** * 跑马灯 */ diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ThemeSelectChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ThemeSelectChart.java new file mode 100644 index 00000000..45bf8fff --- /dev/null +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ThemeSelectChart.java @@ -0,0 +1,41 @@ +package com.gccloud.dataroom.core.module.chart.components; + +import com.gccloud.dataroom.core.constant.PageDesignConstant; +import com.gccloud.dataroom.core.module.chart.bean.Chart; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 主题选择器 + * @author hongyang + * @version 1.0 + * @date 2023/8/24 17:03 + */ +@Data +public class ThemeSelectChart extends Chart{ + + + @ApiModelProperty(notes = "类型") + private String type = PageDesignConstant.BigScreen.Type.THEME_SELECT; + + @ApiModelProperty(notes = "个性化") + private Customize customize = new Customize(); + + @Data + public static class Customize { + + @ApiModelProperty(notes = "标题") + private String title; + + @ApiModelProperty(notes = "字体大小") + private Integer fontSize = 20; + + @ApiModelProperty(notes = "字体权重") + private Integer fontWeight = 700; + + @ApiModelProperty(notes = "字体颜色") + private String color; + + } + +} diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ThemeSwitcherChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ThemeSwitcherChart.java index ddb4e20e..bb69b831 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ThemeSwitcherChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ThemeSwitcherChart.java @@ -35,6 +35,12 @@ public class ThemeSwitcherChart extends Chart{ @ApiModelProperty(notes = "字体颜色") private String color; + @ApiModelProperty(notes = "单选框字体激活状态") + private String activeColor; + + @ApiModelProperty(notes = "单选框字体非激活状态") + private String inactiveColor; + } } diff --git a/data-room-ui/packages/BasicComponents/ThemeSwitcher/index.vue b/data-room-ui/packages/BasicComponents/ThemeSwitcher/index.vue index f4e2c8a3..f48cda9c 100644 --- a/data-room-ui/packages/BasicComponents/ThemeSwitcher/index.vue +++ b/data-room-ui/packages/BasicComponents/ThemeSwitcher/index.vue @@ -3,9 +3,9 @@ class="bs-design-wrap theme-switcher-wrap" :class="`bs-theme-switcher-${customTheme}`" > -