diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml
index 19a5a367..79cd414d 100644
--- a/DataRoom/dataroom-core/pom.xml
+++ b/DataRoom/dataroom-core/pom.xml
@@ -6,7 +6,7 @@
com.gccloud
dataroom
- 0.0.1.2023070702.Alpha
+ 0.0.1.2023071001.Alpha
dataroom-core
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java
index 3ff051ef..8f85ad32 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java
@@ -17,6 +17,9 @@ import java.util.List;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "className")
public class Chart {
+ @ApiModelProperty(notes = "版本")
+ private String version;
+
@ApiModelProperty(notes = "图表唯一标识")
private String code;
diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml
index 1cc7d87e..00a77e84 100644
--- a/DataRoom/dataroom-server/pom.xml
+++ b/DataRoom/dataroom-server/pom.xml
@@ -6,7 +6,7 @@
com.gccloud
dataroom
- 0.0.1.2023070702.Alpha
+ 0.0.1.2023071001.Alpha
dataroom-server
@@ -22,7 +22,7 @@
com.gccloud
dataroom-core
- 0.0.1.2023070702.Alpha
+ 0.0.1.2023071001.Alpha
io.springfox
diff --git a/DataRoom/doc/init.sql b/DataRoom/doc/init.sql
index f450ac01..22430661 100644
--- a/DataRoom/doc/init.sql
+++ b/DataRoom/doc/init.sql
@@ -132,6 +132,7 @@ CREATE TABLE `ds_datasource` (
`username` varchar(255) DEFAULT NULL COMMENT '用户名',
`password` text COMMENT '密码',
`module_code` varchar(255) DEFAULT NULL COMMENT '模块编码',
+ `table_name` varchar(255) DEFAULT NULL COMMENT '表名',
`editable` tinyint(2) DEFAULT '0' COMMENT '是否可编辑,0 不可编辑 1 可编辑',
`remark` varchar(255) DEFAULT NULL,
`update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
diff --git a/DataRoom/doc/update.sql b/DataRoom/doc/update.sql
index 055f2a0b..ac313a1c 100644
--- a/DataRoom/doc/update.sql
+++ b/DataRoom/doc/update.sql
@@ -1,10 +1,9 @@
--- 更新大屏配置的类名
+#20230621 配置表中的类名替换
UPDATE big_screen_page SET config = REPLACE(config, '"className":"com.gccloud.bigscreen', '"className":"com.gccloud.dataroom');
UPDATE big_screen_page SET config = REPLACE(config, '"className":"com.gccloud.dataroom.core.module.manage.dto.BigScreenPageDTO', '"className":"com.gccloud.dataroom.core.module.manage.dto.DataRoomPageDTO');
--- 新增数据集相关的表
-
+#20230621 新增数据集相关的表
DROP TABLE IF EXISTS `ds_category_tree`;
CREATE TABLE `ds_category_tree` (
`id` bigint(64) NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -77,4 +76,31 @@ ALTER TABLE `ds_datasource` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COM
ALTER TABLE `ds_dataset` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
ALTER TABLE `ds_dataset` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
ALTER TABLE `ds_category_tree` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
-ALTER TABLE `ds_category_tree` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
\ No newline at end of file
+ALTER TABLE `ds_category_tree` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+
+
+# 20230710 添加数据集标签表
+DROP TABLE IF EXISTS `ds_label`;
+CREATE TABLE `ds_label` (
+ `id` bigint(32) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `label_name` varchar(255) DEFAULT NULL COMMENT '标签名称',
+ `label_type` varchar(255) DEFAULT NULL COMMENT '标签类型',
+ `label_desc` varchar(255) DEFAULT NULL COMMENT '标签描述',
+ `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+ `create_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `create_by` bigint(64) null default 2 comment '创建人',
+ `update_by` bigint(64) null default 2 comment '更新人',
+ `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='标签';
+
+DROP TABLE IF EXISTS `ds_dataset_label`;
+CREATE TABLE `ds_dataset_label` (
+ `id` bigint(32) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `dataset_id` bigint(32) DEFAULT NULL COMMENT '数据集ID',
+ `label_id` bigint(32) DEFAULT NULL COMMENT '标签ID',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='数据集与标签关联表';
+
+# 20230710 数据源新增字段
+ALTER TABLE `ds_datasource` ADD COLUMN `table_name` varchar(255) DEFAULT NULL COMMENT '表名' AFTER `module_code`;
\ No newline at end of file
diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml
index 26240bcc..f5a184b6 100644
--- a/DataRoom/pom.xml
+++ b/DataRoom/pom.xml
@@ -12,7 +12,7 @@
com.gccloud
dataroom
- 0.0.1.2023070702.Alpha
+ 0.0.1.2023071001.Alpha
pom
基于G2Plot、Echarts的大屏设计服务端,具备设计、预览能力,支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入
@@ -59,7 +59,7 @@
42.3.3
0.3.2
2.2
- 0.0.1.2023070702.Alpha
+ 0.0.1.2023071001.Alpha
diff --git a/data-room-ui/packages/BasicComponents/Button/settingConfig.js b/data-room-ui/packages/BasicComponents/Button/settingConfig.js
index 773249dc..21d7932c 100644
--- a/data-room-ui/packages/BasicComponents/Button/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Button/settingConfig.js
@@ -37,7 +37,7 @@ const customConfig = {
// 名称
title: '查询',
root: {
- version: 0
+ version: '2023071001'
},
// 自定义属性
customize: {
diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js b/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
index 9ef9dc8a..24fc47fb 100644
--- a/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/HorizontalLine/settingConfig.js
@@ -12,7 +12,7 @@ export const settingConfig = {
const customConfig = {
type: 'horizontalLine',
root: {
- version: 0
+ version: '2023071001'
},
customize: {
// 边框线颜色
diff --git a/data-room-ui/packages/BasicComponents/Input/settingConfig.js b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
index 3a23e355..c283ca29 100644
--- a/data-room-ui/packages/BasicComponents/Input/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Input/settingConfig.js
@@ -12,7 +12,7 @@ export const settingConfig = {
const customConfig = {
type: 'input',
root: {
- version: 0
+ version: '2023071001'
},
// 自定义属性
customize: {
diff --git a/data-room-ui/packages/BasicComponents/Picture/settingConfig.js b/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
index d35c0aeb..75ff995c 100644
--- a/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Picture/settingConfig.js
@@ -17,7 +17,7 @@ export const settingConfig = {
const customConfig = {
type: 'picture',
root: {
- version: 0
+ version: '2023071001'
},
customize: {
url: '',
diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
index f6ea8a9d..5d4aacba 100644
--- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/settingConfig.js
@@ -25,7 +25,7 @@ export const settingConfig = {
const customConfig = {
type: 'screenScrollRanking',
root: {
- version: '0.0.1',
+ version: '2023071001',
contribution: false
},
customize: {
diff --git a/data-room-ui/packages/BasicComponents/Tables/settingConfig.js b/data-room-ui/packages/BasicComponents/Tables/settingConfig.js
index e8bf5f45..f1133ea3 100644
--- a/data-room-ui/packages/BasicComponents/Tables/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Tables/settingConfig.js
@@ -33,7 +33,7 @@ export const settingConfig = {
const customConfig = {
type: 'tables',
root: {
- version: '0.0.1',
+ version: '2023071001',
contribution: false
},
customize: {
diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js b/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
index 2a49756f..29807e74 100644
--- a/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/VerticalLine/settingConfig.js
@@ -12,7 +12,7 @@ export const settingConfig = {
const customConfig = {
type: 'verticalLine',
root: {
- version: 0
+ version: '2023071001'
},
customize: {
// 边框线颜色
diff --git a/data-room-ui/packages/BasicComponents/Video/settingConfig.js b/data-room-ui/packages/BasicComponents/Video/settingConfig.js
index bb5a0d23..51cd0b07 100644
--- a/data-room-ui/packages/BasicComponents/Video/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Video/settingConfig.js
@@ -12,7 +12,7 @@ export const settingConfig = {
const customConfig = {
type: 'video',
root: {
- version: 0
+ version: '2023071001'
},
customize: {
videoType: 'application/x-mpegURL',
diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线图.js b/data-room-ui/packages/G2Plots/折线图/基础折线图.js
index adbb627c..fe5ddadf 100644
--- a/data-room-ui/packages/G2Plots/折线图/基础折线图.js
+++ b/data-room-ui/packages/G2Plots/折线图/基础折线图.js
@@ -4,7 +4,7 @@
* @Author: xing.heng
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js
index e654ad77..779451bc 100644
--- a/data-room-ui/packages/G2Plots/折线图/基础折线点图.js
+++ b/data-room-ui/packages/G2Plots/折线图/基础折线点图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js
index 3f500dfb..4427495c 100644
--- a/data-room-ui/packages/G2Plots/折线图/基础曲线图.js
+++ b/data-room-ui/packages/G2Plots/折线图/基础曲线图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/多折线动画图.js b/data-room-ui/packages/G2Plots/折线图/多折线动画图.js
index c8f23935..468eeaee 100644
--- a/data-room-ui/packages/G2Plots/折线图/多折线动画图.js
+++ b/data-room-ui/packages/G2Plots/折线图/多折线动画图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/多折线图.js b/data-room-ui/packages/G2Plots/折线图/多折线图.js
index 7dae776e..aadbe759 100644
--- a/data-room-ui/packages/G2Plots/折线图/多折线图.js
+++ b/data-room-ui/packages/G2Plots/折线图/多折线图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js b/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js
index 94389651..0d1fd9ff 100644
--- a/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js
+++ b/data-room-ui/packages/G2Plots/折线图/多阶梯折线图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js b/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js
index a894522f..f9fd5b55 100644
--- a/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js
+++ b/data-room-ui/packages/G2Plots/折线图/折线趋势填充图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js b/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js
index df12e2c1..a3a39927 100644
--- a/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js
+++ b/data-room-ui/packages/G2Plots/折线图/迷你基础折线图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'TinyLine'
// 标题
diff --git a/data-room-ui/packages/G2Plots/折线图/迷你面积图.js b/data-room-ui/packages/G2Plots/折线图/迷你面积图.js
index 547b4d58..e08017b1 100644
--- a/data-room-ui/packages/G2Plots/折线图/迷你面积图.js
+++ b/data-room-ui/packages/G2Plots/折线图/迷你面积图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'TinyArea'
// 标题
diff --git a/data-room-ui/packages/G2Plots/条形图/分组条形图.js b/data-room-ui/packages/G2Plots/条形图/分组条形图.js
index da0627ed..5d899628 100644
--- a/data-room-ui/packages/G2Plots/条形图/分组条形图.js
+++ b/data-room-ui/packages/G2Plots/条形图/分组条形图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Bar'
// 标题
diff --git a/data-room-ui/packages/G2Plots/条形图/基础条形图.js b/data-room-ui/packages/G2Plots/条形图/基础条形图.js
index 55c43d1d..83fe37f8 100644
--- a/data-room-ui/packages/G2Plots/条形图/基础条形图.js
+++ b/data-room-ui/packages/G2Plots/条形图/基础条形图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Bar'
// 标题
diff --git a/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js b/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js
index a3664cce..67f46cde 100644
--- a/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js
+++ b/data-room-ui/packages/G2Plots/柱状图/分组柱状图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Column'
// 标题
diff --git a/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js b/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js
index 348135e4..c58fde50 100644
--- a/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js
+++ b/data-room-ui/packages/G2Plots/柱状图/圆角柱状图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Column'
// 标题
diff --git a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js
index 99361a26..91c66d03 100644
--- a/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js
+++ b/data-room-ui/packages/G2Plots/柱状图/基础柱状图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Column'
// 标题
diff --git a/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js b/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js
index c3807345..8bec6acd 100644
--- a/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js
+++ b/data-room-ui/packages/G2Plots/柱状图/堆叠柱状图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Column'
// 标题
diff --git a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js
index 7ae6cc20..5c85829b 100644
--- a/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js
+++ b/data-room-ui/packages/G2Plots/漏斗图/分面漏斗图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Funnel'
// 标题
diff --git a/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js
index 6189a614..52443a19 100644
--- a/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js
+++ b/data-room-ui/packages/G2Plots/漏斗图/基础漏斗图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Funnel'
// 标题
diff --git a/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js b/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js
index c296b534..226ed283 100644
--- a/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js
+++ b/data-room-ui/packages/G2Plots/漏斗图/对比漏斗图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Funnel'
// 标题
diff --git a/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js b/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js
index 9e41a5d7..80a410f7 100644
--- a/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js
+++ b/data-room-ui/packages/G2Plots/矩形树图/基础矩形树图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Treemap'
// 标题
diff --git a/data-room-ui/packages/G2Plots/词云图/词云图.js b/data-room-ui/packages/G2Plots/词云图/词云图.js
index c9bb301b..34f03cdf 100644
--- a/data-room-ui/packages/G2Plots/词云图/词云图.js
+++ b/data-room-ui/packages/G2Plots/词云图/词云图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'WordCloud'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/仪表盘.js b/data-room-ui/packages/G2Plots/进度图/仪表盘.js
index 5ec3402b..fd3c4a31 100644
--- a/data-room-ui/packages/G2Plots/进度图/仪表盘.js
+++ b/data-room-ui/packages/G2Plots/进度图/仪表盘.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Gauge'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js
index b21a2835..3ff43b7c 100644
--- a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js
+++ b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Progress'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/水波图.js b/data-room-ui/packages/G2Plots/进度图/水波图.js
index e1b9e58f..638e0846 100644
--- a/data-room-ui/packages/G2Plots/进度图/水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/水波图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Liquid'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js
index e9706107..10269cc3 100644
--- a/data-room-ui/packages/G2Plots/进度图/矩形水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/矩形水波图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Liquid'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js b/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
index e30b9ad6..35c49602 100644
--- a/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
+++ b/data-room-ui/packages/G2Plots/进度图/进度仪表盘.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Gauge'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/进度条.js b/data-room-ui/packages/G2Plots/进度图/进度条.js
index 94f90f0c..03087d91 100644
--- a/data-room-ui/packages/G2Plots/进度图/进度条.js
+++ b/data-room-ui/packages/G2Plots/进度图/进度条.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Progress'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/进度环图.js b/data-room-ui/packages/G2Plots/进度图/进度环图.js
index fd93e272..f09d9b57 100644
--- a/data-room-ui/packages/G2Plots/进度图/进度环图.js
+++ b/data-room-ui/packages/G2Plots/进度图/进度环图.js
@@ -1,5 +1,5 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'RingProgress'
// 标题
diff --git a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
index e1f3bb75..ea51835d 100644
--- a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
+++ b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Liquid'
// 标题
diff --git a/data-room-ui/packages/G2Plots/配置说明.md b/data-room-ui/packages/G2Plots/配置说明.md
index 7f8f0c67..b235c900 100644
--- a/data-room-ui/packages/G2Plots/配置说明.md
+++ b/data-room-ui/packages/G2Plots/配置说明.md
@@ -35,6 +35,8 @@ export default [
/*
* @description: 配置,参考https://g2plot.antv.antgroup.com/examples
*/
+// 配置版本号
+const version = '2023071001'
// 分类
const category = 'Line'
// 标题
@@ -163,6 +165,7 @@ const option = {
export default {
category,
+ version,
title,
chartType,
name,
diff --git a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js
index 3a351def..e9252c8f 100644
--- a/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js
+++ b/data-room-ui/packages/G2Plots/雷达图/分组雷达图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Radar'
// 标题
diff --git a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js
index 699d9732..2c75173f 100644
--- a/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js
+++ b/data-room-ui/packages/G2Plots/雷达图/基础雷达图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Radar'
// 标题
diff --git a/data-room-ui/packages/G2Plots/面积图/基础面积图.js b/data-room-ui/packages/G2Plots/面积图/基础面积图.js
index 570fef08..2c073c1e 100644
--- a/data-room-ui/packages/G2Plots/面积图/基础面积图.js
+++ b/data-room-ui/packages/G2Plots/面积图/基础面积图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Area'
// 标题
diff --git a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js
index 3dafab3b..01c15b55 100644
--- a/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js
+++ b/data-room-ui/packages/G2Plots/面积图/堆叠面积图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Area'
// 标题
diff --git a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js
index 564daaa0..3ef51c29 100644
--- a/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js
+++ b/data-room-ui/packages/G2Plots/面积图/渐变色面积图.js
@@ -5,7 +5,7 @@
*/
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Area'
// 标题
diff --git a/data-room-ui/packages/G2Plots/饼图/基础环图.js b/data-room-ui/packages/G2Plots/饼图/基础环图.js
index d7eedbf5..c83c549c 100644
--- a/data-room-ui/packages/G2Plots/饼图/基础环图.js
+++ b/data-room-ui/packages/G2Plots/饼图/基础环图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Pie'
// 标题
diff --git a/data-room-ui/packages/G2Plots/饼图/基础饼图.js b/data-room-ui/packages/G2Plots/饼图/基础饼图.js
index b42d1e18..ac095856 100644
--- a/data-room-ui/packages/G2Plots/饼图/基础饼图.js
+++ b/data-room-ui/packages/G2Plots/饼图/基础饼图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Pie'
// 标题
diff --git a/data-room-ui/packages/G2Plots/饼图/玫瑰图.js b/data-room-ui/packages/G2Plots/饼图/玫瑰图.js
index d9364fe9..9879bab7 100644
--- a/data-room-ui/packages/G2Plots/饼图/玫瑰图.js
+++ b/data-room-ui/packages/G2Plots/饼图/玫瑰图.js
@@ -1,6 +1,6 @@
// 配置版本号
-const version = '0.0.1'
+const version = '2023071001'
// 分类
const category = 'Rose'
// 标题
diff --git a/data-room-ui/packages/PlotRender/settingConfig.js b/data-room-ui/packages/PlotRender/settingConfig.js
index 3e7ca4a7..0239edad 100644
--- a/data-room-ui/packages/PlotRender/settingConfig.js
+++ b/data-room-ui/packages/PlotRender/settingConfig.js
@@ -4,7 +4,7 @@ export const settingConfig = {
}
const customConfig = {
root: {
- version: '0.0.1',
+ version: '2023071001',
contribution: false
},
customize: {
diff --git a/data-room-ui/packages/js/utils/datasetConfigService.js b/data-room-ui/packages/js/utils/datasetConfigService.js
index e5a0f983..6da4f7f8 100644
--- a/data-room-ui/packages/js/utils/datasetConfigService.js
+++ b/data-room-ui/packages/js/utils/datasetConfigService.js
@@ -11,6 +11,14 @@ import { get, post } from 'packages/js/utils/http'
*/
const datasetPage = (params = {}, flag = false) => get('/dataset/page', params, flag)
+/**
+ * 数据集列表查询
+ * @param params
+ * @param flag
+ * @returns {*}
+ */
+const datasetList = (params = {}, flag = false) => get('/dataset/list', params, flag)
+
/**
* 数据集名称校验
* @param params
@@ -98,6 +106,7 @@ const categoryRemove = (id = '-1', flag = false) => post(`/category/delete/${id}
export {
datasetPage,
+ datasetList,
datasetAdd,
datasetUpdate,
datasetRemove,