From ff12895a40490ee0671a28d73d7851445b48f474 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Mon, 16 Oct 2023 11:14:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BasicComponents/Button/setting.vue | 1 + data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue | 1 + data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue | 1 + data-room-ui/packages/BasicComponents/FlyMap/setting.vue | 1 + data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue | 1 + data-room-ui/packages/BasicComponents/IndexCard/setting.vue | 1 + data-room-ui/packages/BasicComponents/IndexCard2/setting.vue | 1 + data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue | 1 + data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue | 1 + data-room-ui/packages/BasicComponents/Input/setting.vue | 1 + data-room-ui/packages/BasicComponents/Map/setting.vue | 1 + data-room-ui/packages/BasicComponents/Marquee/setting.vue | 1 + .../packages/BasicComponents/ScreenScrollBoard/setting.vue | 1 + data-room-ui/packages/BasicComponents/Select/setting.vue | 1 + data-room-ui/packages/BasicComponents/Tables/setting.vue | 1 + data-room-ui/packages/BasicComponents/TimePicker/setting.vue | 1 + data-room-ui/packages/BasicComponents/VerticalLine/setting.vue | 1 + data-room-ui/packages/BigScreenDesign/BorderSetting.vue | 1 + 18 files changed, 18 insertions(+) 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/IndexCard/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue index ace44f3e..40256581 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue @@ -219,6 +219,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'BarSetting', components: { diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue index 8e4c5f4d..f28ae6a5 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue @@ -219,6 +219,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/IndicatorCard/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue index c23818d8..98a3d2bd 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue @@ -192,6 +192,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/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue index c23818d8..98a3d2bd 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue @@ -192,6 +192,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/Input/setting.vue b/data-room-ui/packages/BasicComponents/Input/setting.vue index 08c4a9ef..00f06d3c 100644 --- a/data-room-ui/packages/BasicComponents/Input/setting.vue +++ b/data-room-ui/packages/BasicComponents/Input/setting.vue @@ -192,6 +192,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: 'InputSetting', components: { diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue index 05ca3e15..e0f782cf 100644 --- a/data-room-ui/packages/BasicComponents/Map/setting.vue +++ b/data-room-ui/packages/BasicComponents/Map/setting.vue @@ -328,6 +328,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/Marquee/setting.vue b/data-room-ui/packages/BasicComponents/Marquee/setting.vue index 2b0124f2..88c0285a 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/setting.vue +++ b/data-room-ui/packages/BasicComponents/Marquee/setting.vue @@ -330,6 +330,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' import IconSvg from 'data-room-ui/SvgIcon' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'TextSetting', components: { diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue index 86c9ff1d..440f26b9 100644 --- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue +++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue @@ -129,6 +129,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/Select/setting.vue b/data-room-ui/packages/BasicComponents/Select/setting.vue index 683887d7..9e9cbf1c 100644 --- a/data-room-ui/packages/BasicComponents/Select/setting.vue +++ b/data-room-ui/packages/BasicComponents/Select/setting.vue @@ -93,6 +93,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: 'Border14Setting', components: { diff --git a/data-room-ui/packages/BasicComponents/Tables/setting.vue b/data-room-ui/packages/BasicComponents/Tables/setting.vue index 7708cd33..becb04e2 100644 --- a/data-room-ui/packages/BasicComponents/Tables/setting.vue +++ b/data-room-ui/packages/BasicComponents/Tables/setting.vue @@ -115,6 +115,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import { chartSettingMixins } from 'data-room-ui/js/mixins/chartSettingMixins' 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 { components: { ColorPicker, diff --git a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue index 93d56416..59c0f984 100644 --- a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue @@ -187,6 +187,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: 'TimePickerSetting', components: { diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue index 65ce3250..4fd1374d 100644 --- a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue +++ b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue @@ -93,6 +93,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: 'Border14Setting', components: { diff --git a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue index 7eedcd2e..aa448283 100644 --- a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue @@ -134,6 +134,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: 'BorderSetting', components: { From 2fd60da4dee09de8a0529e0474d532c4f2cb13e4 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Mon, 16 Oct 2023 11:18:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=8C=87=E6=A0=87=E5=8D=A1?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/ScreenIndexCardChart.java | 12 ++++++++++++ .../chart/components/ScreenIndicatorCardChart.java | 13 +++++++++++++ 2 files changed, 25 insertions(+) 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; + + } } From 7132c758c5bd4bba1f7e962f7522c2a205ad7ff4 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Mon, 16 Oct 2023 11:19:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BasicComponents/IndicatorCard2/setting.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue index 3df11dd3..d7afe917 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue @@ -206,12 +206,11 @@