From a0f2479cc0b88c4b47219aea7ef4829484811d6c Mon Sep 17 00:00:00 2001
From: dailer <Dailer@fanruan.com>
Date: Mon, 9 Aug 2021 16:59:23 +0800
Subject: [PATCH] =?UTF-8?q?DEC-20078=20fix:=20=E3=80=90=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=94=AF=E6=8C=81fetchSize=E3=80=91JNDI=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5=E6=96=B0=E5=BB=BA=E3=80=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84=E3=80=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E3=80=8D=E3=80=81=E3=80=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E3=80=8D=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E6=97=A0=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/maintain/components/driverselector/driverselector.ts | 3 ++-
 src/modules/pages/maintain/forms/components/form.jdbc.ts       | 2 ++
 src/modules/pages/maintain/forms/form.ts                       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/pages/maintain/components/driverselector/driverselector.ts b/src/modules/pages/maintain/components/driverselector/driverselector.ts
index 564dc9a..d59f956 100644
--- a/src/modules/pages/maintain/components/driverselector/driverselector.ts
+++ b/src/modules/pages/maintain/components/driverselector/driverselector.ts
@@ -118,7 +118,8 @@ export class DriverSelector extends BI.Widget {
                         watermark: BI.i18nText('Dec-Please_Input'),
                         items: this.model.driverClassItems,
                         value: this.model.customDriver.driver,
-                        text: () => this.model.customDriver.text || BI.i18nText('Dec-Please_Select'),
+                        text: () => this.model.customDriver.text || '',
+                        defaultText: BI.i18nText('Dec-Please_Select'),
                         warningTitle: BI.i18nText('Dec-Dcm-Driver_Driver_File_Lost'),
                         listeners: [
                             {
diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts
index fa18f6a..baf83ff 100644
--- a/src/modules/pages/maintain/forms/components/form.jdbc.ts
+++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts
@@ -71,6 +71,7 @@ export class FormJdbc extends BI.Widget {
         const { connectionName, connectionData } = this.options.formData;
         const {
             driver,
+            driverSource,
             user,
             password,
             originalCharsetName,
@@ -138,6 +139,7 @@ export class FormJdbc extends BI.Widget {
                                 this.form.driver = _ref;
                             },
                             driver,
+                            driverSource,
                             connectionData,
                             listeners: [
                                 {
diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts
index 84201e6..4900051 100644
--- a/src/modules/pages/maintain/forms/form.ts
+++ b/src/modules/pages/maintain/forms/form.ts
@@ -235,7 +235,7 @@ export class MaintainForm extends BI.Widget {
             return false;
         }
 
-        if (!this.form.validation || !this.form.validation()) {
+        if (this.form.validation && !this.form.validation()) {
             return false;
         }