public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复桌面版引擎校验的问题

Browse Source
This commit is contained in:
taojinlong
2024-12-12 16:29:40 +08:00
committed by taojinlong
parent 39af8637b7
commit 59a80a97cd
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
View File

@@ -352,6 +352,9 @@ public class CalciteProvider extends Provider {
case redshift:
configuration = JsonUtil.parseObject(coreDatasource.getConfiguration(), Redshift.class);
break;
case h2:
configuration = JsonUtil.parseObject(coreDatasource.getConfiguration(), H2.class);
break;
case ck:
configuration = JsonUtil.parseObject(coreDatasource.getConfiguration(), CK.class);
break;

31
core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue
View File

@@ -60,6 +60,13 @@ const configRules = {
trigger: 'blur'
}
],
'configuration.jdbc': [
{
required: true,
message: t('datasource.please_input_jdbc_url'),
trigger: 'blur'
}
],
'configuration.extraParams': [
{
required: false,
@@ -135,6 +142,7 @@ const defaultInfo = {
fileName: '',
configuration: {
host: '',
jdbc: '',
port: 8081,
dataBase: '',
username: '',
@@ -282,14 +290,33 @@ defineExpose({
/>
</el-select>
</el-form-item>
<el-form-item :label="t('datasource.host')" prop="configuration.host">
<el-form-item
:label="t('datasource.host')"
prop="configuration.jdbc"
v-if="nodeInfo.type === 'h2'"
>
<el-input
v-model="nodeInfo.configuration.jdbc"
:placeholder="t('data_source.jdbc_connection_string')"
autocomplete="off"
/>
</el-form-item>
<el-form-item
:label="t('datasource.host')"
prop="configuration.host"
v-if="nodeInfo.type !== 'h2'"
>
<el-input
v-model="nodeInfo.configuration.host"
:placeholder="t('datasource._ip_address')"
autocomplete="off"
/>
</el-form-item>
<el-form-item :label="t('datasource.port')" prop="configuration.port">
<el-form-item
:label="t('datasource.port')"
prop="configuration.port"
v-if="nodeInfo.type !== 'h2'"
>
<el-input-number
v-model="nodeInfo.configuration.port"
autocomplete="off"