From 16409926f9224af548ab04c7a770c12a0b5f44c6 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Tue, 5 Sep 2023 14:19:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9Etab=E5=88=87?=
=?UTF-8?q?=E6=8D=A2=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
新增tab切换组件配置
---
.../core/constant/PageDesignConstant.java | 5 +++
.../chart/components/ChartTabChart.java | 43 +++++++++++++++++++
.../components/CustomComponentChart.java | 3 ++
3 files changed, 51 insertions(+)
create mode 100644 DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ChartTabChart.java
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java
index 44eb522b..ba7f503f 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java
@@ -151,6 +151,11 @@ public interface PageDesignConstant {
* 飞线地图
*/
String FLY_MAP = "flyMap";
+
+ /**
+ * Tab切换
+ */
+ String TAB_CHART = "chartTab";
}
}
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ChartTabChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ChartTabChart.java
new file mode 100644
index 00000000..305f107e
--- /dev/null
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ChartTabChart.java
@@ -0,0 +1,43 @@
+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.List;
+
+/**
+ * tab切换
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/8/24 17:03
+ */
+@Data
+public class ChartTabChart extends Chart{
+
+
+ @ApiModelProperty(notes = "类型")
+ private String type = PageDesignConstant.BigScreen.Type.TAB_CHART;
+
+ @ApiModelProperty(notes = "个性化")
+ private Customize customize = new Customize();
+
+ @Data
+ public static class Customize {
+
+ @ApiModelProperty(notes = "组件tab列表")
+ private List tabList;
+
+ @ApiModelProperty(notes = "字体大小")
+ private Integer fontSize;
+
+ @ApiModelProperty(notes = "字体粗细")
+ private Integer fontWeight;
+
+ @ApiModelProperty(notes = "字体颜色")
+ private String color;
+
+ }
+
+}
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java
index 91e08be6..3bf9bd47 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java
@@ -16,6 +16,9 @@ import java.util.List;
@Data
public class CustomComponentChart extends Chart {
+ @ApiModelProperty(notes = "父编码")
+ private String parentCode;
+
@ApiModelProperty(notes = "版本")
private String version;
From 81e7acb0e46d347d562849aecbb3b683142f255f Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Tue, 5 Sep 2023 17:42:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=8F=91=E5=B8=83=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E7=89=88=E6=9C=AC1.0.1.2023090501.Alpha=EF=BC=8C?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E9=9B=86=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
发布测试版本1.0.1.2023090501.Alpha，优化数据集获取的数据格式
---
DataRoom/dataroom-core/pom.xml | 2 +-
DataRoom/dataroom-server/pom.xml | 4 ++--
DataRoom/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml
index f00689d3..5d050e56 100644
--- a/DataRoom/dataroom-core/pom.xml
+++ b/DataRoom/dataroom-core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
- <version>1.0.1.2023083001.Alpha</version>
+ <version>1.0.1.2023090501.Alpha</version>
</parent>
<artifactId>dataroom-core</artifactId>
diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml
index 662b7142..93aa36d7 100644
--- a/DataRoom/dataroom-server/pom.xml
+++ b/DataRoom/dataroom-server/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
- <version>1.0.1.2023083001.Alpha</version>
+ <version>1.0.1.2023090501.Alpha</version>
</parent>
<artifactId>dataroom-server</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>com.gccloud</groupId>
<artifactId>dataroom-core</artifactId>
- <version>1.0.1.2023083001.Alpha</version>
+ <version>1.0.1.2023090501.Alpha</version>
</dependency>
<dependency>
diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml
index 01e40c9f..5719a9d1 100644
--- a/DataRoom/pom.xml
+++ b/DataRoom/pom.xml
@@ -12,7 +12,7 @@
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
- <version>1.0.1.2023083001.Alpha</version>
+ <version>1.0.1.2023090501.Alpha</version>
<packaging>pom</packaging>
<description>基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入