From 16409926f9224af548ab04c7a770c12a0b5f44c6 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Tue, 5 Sep 2023 14:19:49 +0800 Subject: [PATCH 1/4] =?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" Date: Tue, 5 Sep 2023 17:42:31 +0800 Subject: [PATCH 2/4] =?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 @@ com.gccloud dataroom - 1.0.1.2023083001.Alpha + 1.0.1.2023090501.Alpha dataroom-core 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 @@ com.gccloud dataroom - 1.0.1.2023083001.Alpha + 1.0.1.2023090501.Alpha dataroom-server @@ -29,7 +29,7 @@ com.gccloud dataroom-core - 1.0.1.2023083001.Alpha + 1.0.1.2023090501.Alpha 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 @@ com.gccloud dataroom - 1.0.1.2023083001.Alpha + 1.0.1.2023090501.Alpha pom 基于G2Plot、Echarts的大屏设计服务端,具备设计、预览能力,支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入 From 9805a01195bac7d2bf87378002368a2ecd4be083 Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Tue, 5 Sep 2023 18:01:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E4=B8=9A=E5=8A=A1=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9Eecharts=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BizComponent/Preview.vue | 12 +- .../config/defaultEchartsConfig.js | 186 ++++++++++++++++++ .../BizComponent/config/defaultG2Config.js | 2 +- data-room-ui/packages/BizComponent/index.vue | 6 +- 4 files changed, 197 insertions(+), 9 deletions(-) create mode 100644 data-room-ui/packages/BizComponent/config/defaultEchartsConfig.js diff --git a/data-room-ui/packages/BizComponent/Preview.vue b/data-room-ui/packages/BizComponent/Preview.vue index 3b4404d4..bcb834b8 100644 --- a/data-room-ui/packages/BizComponent/Preview.vue +++ b/data-room-ui/packages/BizComponent/Preview.vue @@ -40,7 +40,6 @@ export default { // eslint-disable-next-line prefer-const, no-unused-vars let title = '' - let chartType = '' // eslint-disable-next-line prefer-const, no-unused-vars let data = [] let g2Plots=g2Plot @@ -56,7 +55,6 @@ export default { setting, echarts, g2Plots, - chartType } }, set (val) {} @@ -194,17 +192,17 @@ export default { +` + +// 配置 片段 +export const defaultEchartsSettingContent = ` +// 这是一个配置案例 +// 组件备注名称 +const title = 'echarts案例' + +// 右侧配置项 +const setting = [ + { + label: '维度', + // 设置组件类型, select / input / colorPicker + type: 'select', + // 字段 + field: 'xField', + optionField: 'xField', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + // tab页。 data: 数据, custom: 自定义 + tabName: 'data' + }, + { + label: '指标', + // 设置组件类型 + type: 'select', + // 字段 + field: 'yField', + // 对应options中的字段 + optionField: 'yField', + // 是否多选 + multiple: false, + value: '', + tabName: 'data' + }, + { + label: 'x轴类型', + type: 'input', + field: 'xAxis_type', + optionField: 'xAxis.type', + value: 'category', + tabName: 'custom', + groupName: 'xAxis' + }, + { + label: 'y轴类型', + type: 'input', + field: 'yAxis_type', + optionField: 'yAxis.type', + value: 'value', + tabName: 'custom', + groupName: 'yAxis' + } +] + +// 模拟数据 +const data = [ + { Date: '2010-01', scales: 1998 }, + { Date: '2010-02', scales: 1850 }, + { Date: '2010-03', scales: 1720 }, + { Date: '2010-04', scales: 1818 }, + { Date: '2010-05', scales: 1920 }, + { Date: '2010-06', scales: 1802 }, + { Date: '2010-07', scales: 1945 }, + { Date: '2010-08', scales: 1856 }, + { Date: '2010-09', scales: 2107 }, + { Date: '2010-10', scales: 2140 } +] + +const option = { + // 数据将要放入到哪个字段中 + dataKey: 'data', + data, + color: '', + appendPadding: [16, 16, 16, 16], // 设置图标的边距 + xField: 'Date', + yField: 'scales', + smooth: true, + xAxis: { + type:'category', + data: [] + }, + yAxis: { + type: 'value' + }, + series:[ + { + data: [], + type:'line' + } + ] +} + +export default { + title, + option, + setting +} +` diff --git a/data-room-ui/packages/BizComponent/config/defaultG2Config.js b/data-room-ui/packages/BizComponent/config/defaultG2Config.js index 753b310d..0ce58ecc 100644 --- a/data-room-ui/packages/BizComponent/config/defaultG2Config.js +++ b/data-room-ui/packages/BizComponent/config/defaultG2Config.js @@ -9,7 +9,7 @@ export const defaultG2VueContent = `