diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index e0af11c435..bae2f5c365 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -854,12 +854,14 @@ public class CalciteProvider { DatasourceConfiguration configuration = null; String database = ""; switch (datasourceType) { + case StarRocks: + case doris: + tableSqls.add("show tables"); + break; case mysql: case mongo: case mariadb: case TiDB: - case StarRocks: - case doris: configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Mysql.class); if (StringUtils.isEmpty(configuration.getUrlType()) || configuration.getUrlType().equalsIgnoreCase("hostName")) { database = configuration.getDataBase(); diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue index 0575cf124f..0c2885af10 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue @@ -97,6 +97,7 @@ const showEmpty = ref(false) const edit_api_item = ref(false) const active = ref(1) const loading = ref(false) +const formLoading = ref(false) const columns = shallowRef([]) const valueList = shallowRef([]) const tableData = shallowRef([]) @@ -252,8 +253,12 @@ const next = () => { cancelMap['/datasource/checkApiDatasource']?.() const params = Base64.encode(JSON.stringify(paramsList)) + disabledNext.value = true + formLoading.value = true checkApiItem({ data: Base64.encode(JSON.stringify(apiItem)), paramsList: params }) .then(response => { + disabledNext.value = false + formLoading.value = false apiItem.jsonFields = response.data.jsonFields apiItem.fields = [] handleFiledChange(apiItem) @@ -261,6 +266,8 @@ const next = () => { active.value += 1 }) .catch(error => { + disabledNext.value = false + formLoading.value = false console.log(error?.message) }) } @@ -438,6 +445,7 @@ defineExpose({ label-width="100px" require-asterisk-position="right" :rules="rule" + v-loading="formLoading" >
{{ t('datasource.base_info') }}