diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java index c0d536e3..bb80ffef 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java @@ -76,4 +76,16 @@ public class Chart { @ApiModelProperty(notes = "主题配置") private Map theme; + + /** + * 边框配置,格式如下 + * { + * type: '', + * titleHeight: 60, + * fontSize: 30, + * color: ['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9'] + */ + @ApiModelProperty(notes = "边框配置") + private Map border; + } diff --git a/data-room-ui/packages/BasicComponents/Button/setting.vue b/data-room-ui/packages/BasicComponents/Button/setting.vue index bf70ef18..a9e1c99a 100644 --- a/data-room-ui/packages/BasicComponents/Button/setting.vue +++ b/data-room-ui/packages/BasicComponents/Button/setting.vue @@ -19,6 +19,14 @@
+ 边框 +
+ +
基础
@@ -115,6 +123,7 @@ diff --git a/data-room-ui/packages/BasicComponents/Texts/setting.vue b/data-room-ui/packages/BasicComponents/Texts/setting.vue index b31aa1ef..ad80faca 100644 --- a/data-room-ui/packages/BasicComponents/Texts/setting.vue +++ b/data-room-ui/packages/BasicComponents/Texts/setting.vue @@ -31,6 +31,14 @@
+ 边框 +
+ +
基础
+ + diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue index 043ad596..852248e6 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue @@ -21,6 +21,13 @@ />
+
+ +
位置