From 7c727e4e373484408d83dcd9572eb9918b251645 Mon Sep 17 00:00:00 2001
From: dailer <Dailer@fanruan.com>
Date: Mon, 13 Dec 2021 16:17:46 +0800
Subject: [PATCH] =?UTF-8?q?DEC-21809=20fix:=20=E3=80=90=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E8=BF=9E=E6=8E=A5=E6=B1=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E6=9C=80=E5=A4=A7=E7=A9=BA=E9=97=B2?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=95=B0=E6=9C=AA=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connection_jdbc/connection_jdbc.ts        |  9 ++-----
 .../maintain/forms/components/form.jdbc.ts    | 27 ++-----------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
index 5bb8a27..a65d97b 100644
--- a/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
+++ b/src/modules/pages/connection/connection_jdbc/connection_jdbc.ts
@@ -109,7 +109,7 @@ export class ConnectionJdbc extends BI.Widget {
                 },
                 {
                     type: FormItem.xtype,
-                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'),
+                    name: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'),
                     value: api.getPlain(connectionPoolAttr.validationQuery || ''),
                 },
                 {
@@ -121,7 +121,7 @@ export class ConnectionJdbc extends BI.Widget {
                 {
                     type: Collapse.xtype,
                     width: 70,
-                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'),
+                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_More_Setting'),
                     listeners: [
                         {
                             eventName: EVENT_CHANGE,
@@ -145,11 +145,6 @@ export class ConnectionJdbc extends BI.Widget {
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'),
                             value: connectionPoolAttr.initialSize,
                         },
-                        {
-                            type: FormItem.xtype,
-                            name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'),
-                            value: connectionPoolAttr.maxIdle,
-                        },
                         {
                             type: FormItem.xtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'),
diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts
index af4dbca..b432d04 100644
--- a/src/modules/pages/maintain/forms/components/form.jdbc.ts
+++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts
@@ -54,7 +54,6 @@ export class FormJdbc extends BI.Widget {
         url: null,
         initialSize: null,
         maxActive: null,
-        maxIdle: null,
         maxWait: null,
         validationQuery: null,
         testOnBorrow: null,
@@ -87,7 +86,6 @@ export class FormJdbc extends BI.Widget {
         const {
             initialSize,
             maxActive,
-            maxIdle,
             maxWait,
             validationQuery,
             testOnBorrow,
@@ -481,7 +479,7 @@ export class FormJdbc extends BI.Widget {
                         $value: 'validation-query',
                         cls: 'bi-border',
                         allowBlank: true,
-                        watermark: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'),
+                        watermark: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query_Watermark'),
                         value: api.getPlain(validationQuery || ''),
                         width: 300,
                         height: 100,
@@ -522,7 +520,7 @@ export class FormJdbc extends BI.Widget {
                     type: Collapse.xtype,
                     bgap: -15,
                     width: 70,
-                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'),
+                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_More_Setting'),
                     listeners: [
                         {
                             eventName: EVENT_CHANGE,
@@ -562,26 +560,6 @@ export class FormJdbc extends BI.Widget {
                                 },
                             }],
                         },
-                        {
-                            type: FormItem.xtype,
-                            name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'),
-                            forms: [{
-                                type: TextChecker.xtype,
-                                $value: 'max-idle',
-                                width: 300,
-                                allowBlank: false,
-                                value: maxIdle,
-                                watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'),
-                                validationChecker: [{
-                                    errorText: BI.i18nText('Dec-Dcm_Connection_Check_Integer'),
-                                    checker: (value: string) => this.checkInteger(value),
-                                    autoFix: true,
-                                }, valueRangeConfig],
-                                ref: (_ref: TextChecker) => {
-                                    this.form.maxIdle = _ref;
-                                },
-                            }],
-                        },
                         {
                             type: FormItem.xtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'),
@@ -862,7 +840,6 @@ export class FormJdbc extends BI.Widget {
                 connectionPoolAttr: {
                     initialSize: this.form.initialSize.getValue(),
                     maxActive: this.form.maxActive.getValue(),
-                    maxIdle: this.form.maxIdle.getValue(),
                     minIdle: this.form.minIdle.getValue(),
                     maxWait: this.form.maxWait.getValue(),
                     validationQuery: api.getCipher(this.form.validationQuery.getValue()),