From 770f7de9a9caf4cddc5d3e99d24d7c10c71db6c1 Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Wed, 11 Sep 2019 09:41:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BI-51659=20=E4=BF=AE=E5=A4=8D=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=96=B0=E5=BB=BA=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/constants/constant.ts        | 2 +-
 src/modules/pages/maintain/forms/form.ts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts
index a6aae32..1ededbe 100644
--- a/src/modules/constants/constant.ts
+++ b/src/modules/constants/constant.ts
@@ -530,7 +530,7 @@ export const DATA_BASE_TYPES = [
         databaseType: 'other',
         driver: 'org.ha.Driver',
         drivers: ['org.ha.Driver', 'com.fr.third.org.hsqldb.jdbcDriver', 'org.sqlite.JDBC'],
-        url: 'jdbc:h2://hostname:port/../database',
+        url: 'jdbc:h2://hostname:port/database',
         commonly: false,
         internal: true,
         type: 'other',
diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts
index a8f5dde..3e9feaf 100644
--- a/src/modules/pages/maintain/forms/form.ts
+++ b/src/modules/pages/maintain/forms/form.ts
@@ -6,7 +6,7 @@ import { FormPluginXtype } from './components/form.plugin';
 import { connectionType } from '@constants/env';
 import { ConnectionJDBC, Connection } from 'src/modules/crud/crud.typings';
 import { TestStatusXtype, EVENT_RELOAD, EVENT_CLOSE } from 'src/modules/components/test_status/test_status';
-import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATA_BASE_DRIVER_LINK } from '@constants/constant';
+import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATA_BASE_DRIVER_LINK, DATEBASE_FILTER_TYPE } from '@constants/constant';
 import { getJdbcDatabaseType } from 'src/modules/app.service';
 
 export const MaintainFormXtype = 'dec.dcm.maintain.form';
@@ -136,6 +136,8 @@ export class MaintainForm extends BI.Widget {
                 return FormJdbcXtype;
             case connectionType.JNDI:
                 return FormJndiXtype;
+            case DATEBASE_FILTER_TYPE.OTHER:
+                return FormJdbcXtype;
             default:
                 return FormPluginXtype;
         }
@@ -147,6 +149,8 @@ export class MaintainForm extends BI.Widget {
                 return this.getJdbcConnection();
             case connectionType.JNDI:
                 return this.getJndiConnection();
+            case DATEBASE_FILTER_TYPE.OTHER:
+                return this.getJdbcConnection();
             default:
                 return this.getPluginConnection();
         }