Merge remote-tracking branch 'origin/master'

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";
+
         }
     }
 

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;
     }
 }

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;
+    }
+}

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;
+
     }
 
 

data-room-ui/packages/js/utils/registerConfig.js

@@ -170,7 +170,10 @@ function registerTheme (config) {
 export default function (config, router) {
   window.BS_CONFIG = {}
   window.BS_CONFIG = configDeepMerge(window.BS_CONFIG, config)
-
+  if (!config?.httpConfigs?.fileUrlPrefix) {
+    // 如果没有配置文件访问前缀，使用baseURL加上/static作为文件前缀
+    window.BS_CONFIG.httpConfigs.fileUrlPrefix = window.BS_CONFIG.httpConfigs.baseURL + '/static'
+  }
   // 注册路由
   registerRouters(config, router)
   // 注册自定义主题