From 6b047719bd01d96c66b9772de087fdfecf116b97 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Tue, 14 Nov 2023 10:02:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=BF=BB=E7=89=8C=E5=99=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E4=BD=93=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E6=96=B0=E5=A2=9E=E5=8D=83=E5=88=86=E4=BD=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/module/chart/components/ScreenDigitalFlopChart.java | 2 ++ .../core/module/chart/components/ScreenNumbersChart.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java index 58b259e6..bf75170b 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java @@ -67,6 +67,8 @@ public class ScreenDigitalFlopChart extends Chart { @ApiModelProperty(notes = "边框宽度") private Integer borderWidth; + @ApiModelProperty("字体") + private String fontFamily; diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java index e787742f..5955cfd9 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenNumbersChart.java @@ -44,5 +44,8 @@ public class ScreenNumbersChart extends Chart { @ApiModelProperty(notes = "文字间距") private Integer letterSpacing; + @ApiModelProperty(notes = "千分位") + private Boolean thousands; + } } From 6a687223ce366d869cf24cc9404c17aa45b271aa Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Tue, 14 Nov 2023 10:03:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=89=88=E6=9C=AC=E5=8F=91?= =?UTF-8?q?=E5=B8=832.0.1.2023111401.Alpha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataRoom/dataroom-core/pom.xml | 2 +- DataRoom/dataroom-server/pom.xml | 2 +- DataRoom/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml index 1322471f..df9db37c 100644 --- a/DataRoom/dataroom-core/pom.xml +++ b/DataRoom/dataroom-core/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 2.0.1.2023102701.Alpha + 2.0.1.2023111401.Alpha dataroom-core diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml index 310c64bd..776a9571 100644 --- a/DataRoom/dataroom-server/pom.xml +++ b/DataRoom/dataroom-server/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 2.0.1.2023102701.Alpha + 2.0.1.2023111401.Alpha dataroom-server diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index db2cc667..cee2df2b 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -5,7 +5,7 @@ com.gccloud dataroom - 2.0.1.2023102701.Alpha + 2.0.1.2023111401.Alpha pom dataroom