From 226feab07787ca81d236f968561c129a1ce0be0c Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Sun, 8 Oct 2023 14:42:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E6=9C=AA=E9=9A=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0=E5=90=8C=E6=AD=A5=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复组件参数配置未随数据集参数同步变动的问题
---
 .../BigScreenDesign/RightSetting/DataSetting.vue    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index f91c0116..50eb20da 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -764,6 +764,19 @@ export default {
                 })
               }
             }
+            if (res.params) {
+              // 如果数据集中有新增的参数，需要显示出来
+              res.params.forEach(param => {
+                if (!this.params.find(item => item.name === param.name)) {
+                  this.params.push({
+                    name: param.name,
+                    value: param.value,
+                    type: param.type,
+                    remark: param.remark
+                  })
+                }
+              })
+            }
             deleteKeys.forEach(key => {
               delete this.config.dataSource.params[key]
             })

From 0c49a75c09f4e8545803923da88439f668941f4a Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Sun, 8 Oct 2023 14:43:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20sqlServer=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=BB=98=E8=AE=A4=E9=93=BE=E6=8E=A5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0encrypt=EF=BC=8C=E8=A7=A3=E5=86=B3jdk17?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=97=A0=E6=B3=95=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sqlServer 数据源默认链接添加参数encrypt，解决jdk17环境下无法连接的问题
---
 .../packages/DataSourceManagement/src/setDatasource.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
index 92ec8ffa..95329d9d 100644
--- a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
+++ b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue
@@ -339,7 +339,7 @@ export default {
         case 'com.ibm.db2.jcc.DB2Driver':
           return 'jdbc:db2://localhost:5000/db_name'
         case 'com.microsoft.sqlserver.jdbc.SQLServerDriver':
-          return 'jdbc:sqlserver://localhost:1433;databaseName=db_name'
+          return 'jdbc:sqlserver://localhost:1433;databaseName=db_name;encrypt=false'
         case 'org.postgresql.Driver':
           return 'jdbc:postgresql://localhost:13308/db_name'
         case 'org.apache.hive.jdbc.HiveDriver':