Merge remote-tracking branch 'origin/2.1.0.RELEASE' into 2.1.0.RELEASE

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

@@ -197,6 +197,11 @@ public interface PageDesignConstant {
              */
             String CUSTOM_HTML = "customHtml";
 
+            /**
+             * K线图
+             */
+            String K_LINE = "kLine";
+
         }
     }
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenCandlestickChart.java

@@ -0,0 +1,26 @@
+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;
+
+import java.util.Map;
+
+/**
+ * 文本
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/3/13 16:44
+ */
+@Data
+public class ScreenCandlestickChart extends Chart {
+    
+    @ApiModelProperty(notes = "组件类型")
+    private String type = PageDesignConstant.BigScreen.Type.K_LINE;
+
+    @ApiModelProperty(notes = "个性化")
+    private Map<String, Object> customize;
+
+
+}

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java

@@ -66,4 +66,24 @@ public class DataSetDataSource extends BaseChartDataSource {
     @ApiModelProperty(notes = "散点大小字段")
     private String sizeField;
 
+    /**
+     * K线图特殊配置
+     */
+
+    @ApiModelProperty(notes = "x轴字段")
+    private String xField;
+
+    @ApiModelProperty(notes = "开盘字段")
+    private String openField;
+
+    @ApiModelProperty(notes = "收盘字段")
+    private String closeField;
+
+    @ApiModelProperty(notes = "最低字段")
+    private String lowField;
+
+    @ApiModelProperty(notes = "最高字段")
+    private String highField;
+
+
 }