Kaynağa Gözat

feat: 新增自定义html组件,时间组件新增字体属性

hong.yang 1 yıl önce
ebeveyn
işleme
13547cb11d

+ 5 - 0
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java

@@ -192,6 +192,11 @@ public interface PageDesignConstant {
              */
             String NUMBER = "number";
 
+            /**
+             * 自定义html
+             */
+            String CUSTOM_HTML = "customHtml";
+
         }
     }
 

+ 3 - 0
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCurrentTimeChart.java

@@ -33,5 +33,8 @@ public class ScreenCurrentTimeChart extends Chart {
 
         @ApiModelProperty(notes = "字体颜色")
         private String color;
+
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
     }
 }

+ 30 - 0
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCustomHtmlChart.java

@@ -0,0 +1,30 @@
+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;
+
+/**
+ * 自定义html
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/3/16 16:44
+ */
+@Data
+public class ScreenCustomHtmlChart extends Chart {
+
+    @ApiModelProperty(notes = "类型")
+    private String type = PageDesignConstant.BigScreen.Type.CUSTOM_HTML;
+
+    @ApiModelProperty(notes = "个性化")
+    private Customize customize = new Customize();
+
+
+    @Data
+    public static class Customize {
+
+        @ApiModelProperty(notes = "自定义html")
+        private String htmlStr;
+    }
+}

+ 3 - 0
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimeCountDownChart.java

@@ -46,6 +46,9 @@ public class ScreenTimeCountDownChart extends Chart {
         @ApiModelProperty(notes = "字体颜色")
         private String color;
 
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
+
     }