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] }) 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':