From 178a411131643f27504f76f5117a23323365c12e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 31 Mar 2022 22:51:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=8C=E6=9D=83=E9=99=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/datasource/JdbcProvider.java | 3 +- .../service/datasource/DatasourceService.java | 1 + frontend/src/views/system/datasource/form.vue | 33 ++++++++++--------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 3a92cebe16..d193600cb1 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -367,11 +367,10 @@ public class JdbcProvider extends DatasourceProvider { public String checkStatus(DatasourceRequest datasourceRequest) throws Exception { String queryStr = getTablesSql(datasourceRequest); try (Connection con = getConnection(datasourceRequest); Statement statement = con.createStatement(); ResultSet resultSet = statement.executeQuery(queryStr)) { - return "Success"; } catch (Exception e) { DataEaseException.throwException(e.getMessage()); } - return "Error"; + return "Success"; } @Override diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index fa18dab52e..ee31edf8c3 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -191,6 +191,7 @@ public class DatasourceService { datasource.setDesc(updataDsRequest.getDesc()); datasource.setConfiguration(updataDsRequest.getConfiguration()); datasource.setCreateTime(null); + datasource.setType(updataDsRequest.getType()); datasource.setUpdateTime(System.currentTimeMillis()); checkAndUpdateDatasourceStatus(datasource); DatasourceExample example = new DatasourceExample(); diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index 1b93ca6c75..93007a3de4 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -337,10 +337,10 @@ export default { apiConfiguration: [] }, rule: { - name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'change'}, - {min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'change'}], + name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'}, + {min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}], desc: [{min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur'}], - type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'change'}], + type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur'}], 'configuration.dataBase': [{ required: true, message: i18n.t('datasource.please_input_data_base'), @@ -359,43 +359,43 @@ export default { 'configuration.password': [{ required: true, message: i18n.t('datasource.please_input_password'), - trigger: 'change' + trigger: 'blur' }], - 'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'change'}], - 'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'change'}], - 'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'change'}], + 'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'blur'}], + 'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}], + 'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'blur'}], 'configuration.initialPoolSize': [{ required: true, message: i18n.t('datasource.please_input_initial_pool_size'), - trigger: 'change' + trigger: 'blur' }], 'configuration.minPoolSize': [{ required: true, message: i18n.t('datasource.please_input_min_pool_size'), - trigger: 'change' + trigger: 'blur' }], 'configuration.maxPoolSize': [{ required: true, message: i18n.t('datasource.please_input_max_pool_size'), - trigger: 'change' + trigger: 'blur' }], 'configuration.maxIdleTime': [{ required: true, message: i18n.t('datasource.please_input_max_idle_time'), - trigger: 'change' + trigger: 'blur' }], 'configuration.acquireIncrement': [{ required: true, message: i18n.t('datasource.please_input_acquire_increment'), - trigger: 'change' + trigger: 'blur' }], 'configuration.connectTimeout': [{ required: true, message: i18n.t('datasource.please_input_connect_timeout'), - trigger: 'change' + trigger: 'blur' }], - 'url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'change'}], - 'dataPath': [{required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'change'}] + 'url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}], + 'dataPath': [{required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'blur'}] }, allTypes: [ {name: 'mysql', label: 'MySQL', type: 'jdbc', extraParams: 'characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true'}, @@ -764,6 +764,9 @@ export default { } }, addApiItem(item) { + this.$nextTick(() => { + this.$refs.apiItem.clearValidate() + }) if (item) { this.add_api_item = false this.api_table_title = this.$t('datasource.edit_api_table')