From 1c88718c6bd3cec90452c7a8e78728073eda25af Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Tue, 4 Dec 2018 19:10:32 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-12584=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=BD=AC=E6=8D=A2=20=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/data/datapane/connect/DatabaseConnectionPane.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 666778610..0f52a4c5c 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -15,6 +15,7 @@ import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 
 import javax.swing.*;
@@ -48,7 +49,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         uiLabel = new UILabel();
         okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
         cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
-        newCharSetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
+        String[] defaultEncode = new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Encode_Auto")};
+        newCharSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         this.add(northPane, BorderLayout.NORTH);