diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java index b495e655..6b580f5b 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java @@ -68,6 +68,18 @@ public class ScreenIndexCardChart extends Chart { @ApiModelProperty(notes = "第二行字体内容") private String secondLine; + @ApiModelProperty(notes = "字体") + private String fontFamily; + + @ApiModelProperty(notes = "单位") + private String unit; + + @ApiModelProperty(notes = "单位字体大小") + private Integer unitSize; + + @ApiModelProperty(notes = "单位字体颜色") + private String unitColor; + } } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java index 5b033cf8..4db83163 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java @@ -59,6 +59,19 @@ public class ScreenIndicatorCardChart extends Chart { @ApiModelProperty(notes = "第二行字体内容") private String secondLine; + @ApiModelProperty(notes = "字体") + private String fontFamily; + + @ApiModelProperty(notes = "单位") + private String unit; + + @ApiModelProperty(notes = "单位字体大小") + private Integer unitSize; + + @ApiModelProperty(notes = "单位字体颜色") + private String unitColor; + + } } diff --git a/data-room-ui/packages/BasicComponents/Button/setting.vue b/data-room-ui/packages/BasicComponents/Button/setting.vue index 4d2d8c29..147428db 100644 --- a/data-room-ui/packages/BasicComponents/Button/setting.vue +++ b/data-room-ui/packages/BasicComponents/Button/setting.vue @@ -135,6 +135,7 @@ import IconPicker from 'data-room-ui/IconPicker/index.vue' import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'Border14Setting', diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue index 2953e376..86a3f2ef 100644 --- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue @@ -231,6 +231,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue' import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'DateTimePickerSetting', components: { diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue index d2843c9b..09d706e7 100644 --- a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue +++ b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue @@ -165,6 +165,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'BarSetting', components: { diff --git a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue index c3783d4e..3098a0bd 100644 --- a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue +++ b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue @@ -352,6 +352,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'BarSetting', components: { diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue index 1a0fa7a3..5e324ad9 100644 --- a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue +++ b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue @@ -94,6 +94,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'Border14Setting', diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue index ac44f466..03a76328 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue @@ -206,7 +206,7 @@