From 75c06d9318e3d9872a2ee20d2c31f9b14d7d50c2 Mon Sep 17 00:00:00 2001
From: "Austin.Duan" <Austin.Duan@fanruan.com>
Date: Fri, 25 Nov 2022 14:15:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-85619=20feat:=20=E6=8B=93=E5=B1=95?=
 =?UTF-8?q?=E4=B8=8B=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/app.provider.ts | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/modules/app.provider.ts b/src/modules/app.provider.ts
index f3e9a60..791d2be 100644
--- a/src/modules/app.provider.ts
+++ b/src/modules/app.provider.ts
@@ -1,10 +1,11 @@
 import { CONSTANT_PLUGIN_TYPES } from './app.constant';
+import { DATA_BASE_TYPES } from '@constants/constant';
 
-BI.provider('dec.connection.provider.datebase', function() {
+BI.provider('dec.connection.provider.datebase', function () {
     this.resolves = {};
 
     // 原service中resolveUrlInfo方法
-    function jdbcResolve (url: string) {
+    function jdbcResolve(url: string) {
         if (BI.isNull(url)) return {};
         const oracleUlr = url.match(/^jdbc:(oracle):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(:|\/)([^]+)(.*)/i);
         if (oracleUlr) {
@@ -68,14 +69,35 @@ BI.provider('dec.connection.provider.datebase', function() {
         };
     }
 
+    function coverBaseDatabase(config) {
+        const baseDataBase = DATA_BASE_TYPES.find(item => item.text === config.text);
+        if (BI.isNotNull(baseDataBase)) {
+            // 覆盖基础配置
+            Object.assign(baseDataBase, config);
+
+            return true;
+        }
+
+        return false;
+    }
+
     this.registerDatabaseType = (config: any) => {
+        if (coverBaseDatabase(config)) return;
+
         BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, config));
     };
 
     this.registerJdbcDatabase = (config: any, resolve?: Function) => {
-        BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, { ...config, type: 'jdbc' }));
+        config = {
+            ...config,
+            type: 'jdbc',
+        };
 
         BI.isFunction(resolve) && (this.resolves[config.databaseType] = resolve);
+
+        if (coverBaseDatabase(config)) return;
+
+        BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, config));
     };
 
     this.$get = () => BI.inherit(BI.OB, {

From bd0a0f0e17e609afa433d52bc596e0d8e7710cda Mon Sep 17 00:00:00 2001
From: "Aries.lsy" <”Aries.lsy@fanruan.com“>
Date: Fri, 25 Nov 2022 14:57:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-85200=20fix:=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=8C=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BF=9E=E6=8E=A5=E6=95=B0?=
 =?UTF-8?q?=E3=80=8D=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/pages/maintain/forms/components/form.jdbc.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts
index 277f1a7..90ea1b2 100644
--- a/src/modules/pages/maintain/forms/components/form.jdbc.ts
+++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts
@@ -1001,7 +1001,8 @@ export class FormJdbc extends BI.Widget {
                 {
                     el: {
                         type: BI.VerticalLayout.xtype,
-                        bgap: vgap,
+                        vgap: vgap,
+                        top: -15,
                         invisible: true,
                         ref: (_ref: VerticalLayout) => {
                             this.advancedSet = _ref;