From 59a80a97cdebb529cf9ccc55d0e57418da024b22 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 12 Dec 2024 16:29:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=89=88=E5=BC=95=E6=93=8E=E6=A0=A1=E9=AA=8C=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/CalciteProvider.java  |  3 ++
 .../system/parameter/engine/EngineEdit.vue    | 31 +++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

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 8374ee78e4..04ca8792c4 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
@@ -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;
diff --git a/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue b/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue
index 4f0f2f584a..adb8741530 100644
--- a/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/engine/EngineEdit.vue
@@ -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"