From 8baa97fbea811f3af5f5c3c034d34b96c9ea0b94 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Wed, 30 Aug 2023 14:24:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

地图组件新增配置
---
 .../core/module/chart/components/ScreenMapChart.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java
index b0b3cefc..26c3af26 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java
@@ -80,6 +80,15 @@ public class ScreenMapChart extends Chart {
         @ApiModelProperty(notes = "值")
         private String value;
 
+        @ApiModelProperty(notes = "图形字体颜色")
+        private String fontGraphicColor;
+
+        @ApiModelProperty(notes = "图形字体大小")
+        private String fontSize;
+
+        @ApiModelProperty(notes = "是否开启下钻")
+        private Boolean down;
+
     }
 
 

From 875ad805f004b7dcfabc36a80a5bc2ed4913c00b Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 30 Aug 2023 14:36:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=BC=B9=E7=AA=97=E6=B7=BB=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSetManagement/src/DatasetTypeDialog.vue | 15 +++++++++++----
 .../packages/DataSetManagement/src/index.vue    | 17 +++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue b/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue
index 95a4e99b..ca03c023 100644
--- a/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue
+++ b/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue
@@ -26,7 +26,14 @@
               class="type-item"
               @click="openAddForm(dataset.datasetType,dataset.componentName)"
             >
-              {{ dataset.name }}
+              <span>
+                {{ dataset.name }}
+              </span>
+              <p>
+                <span class="description">
+                  {{ dataset.description }}
+                </span>
+              </p>
             </div>
           </el-card>
         </el-col>
@@ -49,6 +56,7 @@ export default {
     }
   },
   created () { },
+  mounted () { },
   methods: {
     // 选择新增类型
     openAddForm (type, componentName) {
@@ -62,17 +70,16 @@ export default {
 <style lang="scss" scoped>
 .type-item {
   height: 104px;
-  line-height: 90px;
   text-align: center;
   font-size: 16px;
   font-weight: 400;
   cursor: pointer;
   position: relative;
+  padding-top: 35px;
   color: var(--bs-el-text);
   p {
-    position: absolute;
     width: 100%;
-    bottom: 20px;
+    margin-top: 10px;
     font-size: 14px;
     line-height: 16px;
     color: #909399;
diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue
index 9da78106..bd9eafae 100644
--- a/data-room-ui/packages/DataSetManagement/src/index.vue
+++ b/data-room-ui/packages/DataSetManagement/src/index.vue
@@ -546,15 +546,16 @@ export default {
       this.current = 1
       const list = [
         { name: '全部', datasetType: '' },
-        { name: '原始数据集', datasetType: 'original', componentName: 'OriginalEditForm' },
-        { name: '自助数据集', datasetType: 'custom', componentName: 'CustomEditForm' },
-        { name: '存储过程数据集', datasetType: 'storedProcedure', componentName: 'StoredProcedureEditForm' },
-        { name: 'JSON数据集', datasetType: 'json', componentName: 'JsonEditForm' },
-        { name: '脚本数据集', datasetType: 'script', componentName: 'ScriptEditForm' },
-        { name: 'JS数据集', datasetType: 'js', componentName: 'JsEditForm' },
-        { name: 'HTTP数据集', datasetType: 'http', componentName: 'HttpEditForm' }
+        { name: '原始数据集', datasetType: 'original', componentName: 'OriginalEditForm', description: '直接查询某个数据库表' },
+        { name: '自助数据集', datasetType: 'custom', componentName: 'CustomEditForm', description: '自定义SQL语句查询' },
+        { name: '存储过程数据集', datasetType: 'storedProcedure', componentName: 'StoredProcedureEditForm', description: '调用数据库存储过程查询' },
+        { name: 'JSON数据集', datasetType: 'json', componentName: 'JsonEditForm', description: '直接定义静态数据' },
+        { name: 'JS数据集', datasetType: 'js', componentName: 'JsEditForm', description: '编写JS代码进行动态模拟数据创建' },
+        { name: 'HTTP数据集', datasetType: 'http', componentName: 'HttpEditForm', description: '接入第三方HTTP服务查询' },
+        { name: '脚本数据集', datasetType: 'script', componentName: 'ScriptEditForm', description: '支持ES、Mongodb、国产化数据库、自定义Java代码查询' }
+
       ]
-      if (window.BS_CONFIG?.datasetTypeList && window.BS_CONFIG?.datasetTypeList?.length != 0) {
+      if (window.BS_CONFIG?.datasetTypeList && window.BS_CONFIG?.datasetTypeList?.length !== 0) {
         this.datasetTypeList = [{ name: '全部', datasetType: '' }, ...list.filter(item => window.BS_CONFIG?.datasetTypeList.findIndex(x => x === item.datasetType) !== -1)]
       } else {
         this.datasetTypeList = [