From d0814a9acfbf5be5a488545764b3d67bd086f29a Mon Sep 17 00:00:00 2001
From: "Frank.Qiu" <Frank.Qiu@fanruan.com>
Date: Thu, 20 Feb 2020 17:39:16 +0800
Subject: [PATCH] =?UTF-8?q?DEC-12158=20fix:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=8C=E9=81=87=E5=88=B0=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E7=95=8C=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/constants/constant.ts      |  2 +-
 src/modules/pages/database/database.ts | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts
index 445b57d..6660598 100644
--- a/src/modules/constants/constant.ts
+++ b/src/modules/constants/constant.ts
@@ -597,7 +597,7 @@ export const DATA_BASE_TYPES = [
 
 export const CONNECT_CHARSET = [
     {
-        text: '自动',
+        text: BI.i18nText('Dec-Dcm_Connection_Form_Auto'),
         value: '',
     },
     {
diff --git a/src/modules/pages/database/database.ts b/src/modules/pages/database/database.ts
index a13921e..e7fa658 100644
--- a/src/modules/pages/database/database.ts
+++ b/src/modules/pages/database/database.ts
@@ -140,19 +140,23 @@ export class Datebase extends BI.Widget {
                             items: [
                                 {
                                     el: {
-                                        type: VerticalAdapt,
+                                        type: Htape,
                                         hgap: 20,
                                         invisible: true,
                                         items: [
                                             {
                                                 type: Label,
+                                                width: 70,
+                                                textAlign: 'left',
                                                 text: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
+                                                title: BI.i18nText('Dec-Dcm_Connection_Type_Filter'),
                                             },
                                             {
                                                 type: MultiSelectItem,
                                                 width: 80,
                                                 selected: this.model.isInternal,
                                                 text: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
+                                                title: BI.i18nText('Dec-Dcm_Connection_Support_Inner'),
                                                 ref: (_ref: any) => {
                                                     this.internalWidget = _ref;
                                                 },
@@ -165,6 +169,7 @@ export class Datebase extends BI.Widget {
                                                 width: 80,
                                                 selected: this.model.isPlugin,
                                                 text: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),
+                                                title: BI.i18nText('Dec-Dcm_Connection_Support_Plugin'),
                                                 ref: (_ref: any) => {
                                                     this.pluginWidget = _ref;
                                                 },
@@ -175,14 +180,16 @@ export class Datebase extends BI.Widget {
                                             {
                                                 type: Label,
                                                 cls: 'bi-tips',
+                                                textAlign: 'left',
                                                 text: BI.i18nText('Dec-Dcm_Connection_Filter_Tip'),
+                                                title: BI.i18nText('Dec-Dcm_Connection_Filter_Tip'),
                                             },
                                         ],
                                         ref: (_ref: any) => {
                                             this.typeFilterWidget = _ref;
                                         },
                                     },
-                                    height: 20,
+                                    height: 24,
                                 },
                                 {
                                     type: ButtonGroup,