From eae60f3eae7c1bd9dc29b7920a81fa2e5a225e27 Mon Sep 17 00:00:00 2001 From: alan Date: Wed, 6 Nov 2019 17:31:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20DEC-10872=20=E4=BF=AE=E5=A4=8D=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=97=A7=E7=89=88=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=97=B6=E4=BA=A7=E7=94=9F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/app.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/app.service.ts b/src/modules/app.service.ts index 9139f32..55b8621 100644 --- a/src/modules/app.service.ts +++ b/src/modules/app.service.ts @@ -27,7 +27,8 @@ export function getPluginWidgetEdit(plugin: string) { export function getJdbcDatabaseType(database: string, driver: string): DatabaseType { let databaseType = null; // KERNEL-1655 兼容旧版 由于旧版设计器创建的数据连接database都为other,所以要根据driber来判断数据类型 - if (database && database !== 'other' && DATA_BASE_TYPES.some(item => item.databaseType === database)) { + // DEC-10872 不能过滤other,因为新版数据连接创建的其他jdbc也是other类型,会混淆,需要和后端讨论一个最佳的解决方案。 + if (database && DATA_BASE_TYPES.some(item => item.databaseType === database)) { databaseType = DATA_BASE_TYPES.find(item => item.databaseType === database); } else { const designDatabase = DESIGN_DRIVER_TYPE.find(item => item.driver === driver);