center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 数据源高级设置不能编辑

Browse Source
This commit is contained in:
taojinlong 2021-08-26 12:35:54 +08:00
parent 45e803c8b7
commit 5f0ad8d200
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
View File

@ -1,5 +1,6 @@
package io.dataease.datasource.service;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import io.dataease.base.domain.*;
import io.dataease.base.mapper.*;
@ -14,6 +15,8 @@ import io.dataease.controller.request.DatasourceUnionRequest;
import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.controller.sys.base.ConditionEntity;
import io.dataease.datasource.dto.DBTableDTO;
import io.dataease.datasource.dto.MysqlConfigration;
import io.dataease.datasource.dto.OracleConfigration;
import io.dataease.datasource.provider.DatasourceProvider;
import io.dataease.datasource.provider.ProviderFactory;
import io.dataease.datasource.request.DatasourceRequest;
@ -80,7 +83,12 @@ public class DatasourceService {
request.setSort("update_time desc");
List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
datasourceDTOS.forEach(datasourceDTO -> {
datasourceDTO.getType();
if(datasourceDTO.getType().equalsIgnoreCase("mysql")){
datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), MysqlConfigration.class)) );
};
if(datasourceDTO.getType().equalsIgnoreCase("oracle")){
datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), OracleConfigration.class)));
};
});
return datasourceDTOS;
}

21
frontend/src/views/system/datasource/form.vue
View File

@ -193,27 +193,6 @@ export default {
this.form = Object.assign({}, row)
this.originConfiguration = this.form.configuration
this.form.configuration = JSON.parse(this.form.configuration)
if (!this.form.configuration.initialPoolSize) {
this.form.configuration.initialPoolSize = 5
}
if (!this.form.configuration.minPoolSize) {
this.form.configuration.minPoolSize = 5
}
if (!this.form.configuration.maxPoolSize) {
this.form.configuration.maxPoolSize = 50
}
if (!this.form.configuration.maxIdleTime) {
this.form.configuration.maxIdleTime = 30
}
if (!this.form.configuration.acquireIncrement) {
this.form.configuration.acquireIncrement = 5
}
if (!this.form.configuration.idleConnectionTestPeriod) {
this.form.configuration.idleConnectionTestPeriod = 5
}
if (!this.form.configuration.connectTimeout) {
this.form.configuration.connectTimeout = 5
}
},
reset() {
this.$refs.dsForm.resetFields()