From de75ef5d1f0ad1acfad68e88897a2c12cfa5584b Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Sat, 8 Dec 2018 15:43:19 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-12854=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E7=BC=96=E7=A0=81=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=20=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20bug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/DatabaseConnectionPane.java       | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

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 0f52a4c5c7..0b37855c92 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
@@ -17,6 +17,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -36,8 +37,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private JDialog dialog;
     private UILabel uiLabel;
     // 编码转换.
-    private UIComboBox newCharSetComboBox;
-    private String oirginalCharSet = null;
+    private UIComboBox charSetComboBox;
+    private String originalCharSet = null;
 
     // Database pane
     public DatabaseConnectionPane() {
@@ -50,7 +51,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         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"));
         String[] defaultEncode = new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Encode_Auto")};
-        newCharSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
+        charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         this.add(northPane, BorderLayout.NORTH);
@@ -72,7 +73,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                 new ModLineBorder(ModLineBorder.TOP),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced")
         ));
-        chartSetPane.add(GUICoreUtils.createNamedPane(newCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_New_Charset") + ":"));
+        chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_New_Charset") + ":"));
     }
 
     protected abstract JPanel mainPanel();
@@ -81,8 +82,13 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     @Override
     public void populateBean(com.fr.data.impl.Connection ob) {
-        this.oirginalCharSet = ob.getOriginalCharsetName();
-        this.newCharSetComboBox.setSelectedItem(ob.getNewCharsetName());
+        this.originalCharSet = ob.getOriginalCharsetName();
+        if (StringUtils.isBlank(originalCharSet)) {
+            this.charSetComboBox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Encode_Auto"));
+
+        } else {
+            this.charSetComboBox.setSelectedItem(ob.getOriginalCharsetName());
+        }
 
         populateSubDatabaseConnectionBean((E) ob);
     }
@@ -93,11 +99,14 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     public com.fr.data.impl.Connection updateBean() {
         E ob = updateSubDatabaseConnectionBean();
 
-        ob.setOriginalCharsetName(this.oirginalCharSet);
-        if (this.newCharSetComboBox.getSelectedIndex() == 0) {
+        ob.setOriginalCharsetName(this.originalCharSet);
+        if (this.charSetComboBox.getSelectedIndex() == 0) {
             ob.setNewCharsetName(null);
+            ob.setOriginalCharsetName(null);
         } else {
-            ob.setNewCharsetName((String) this.newCharSetComboBox.getSelectedItem());
+            ob.setNewCharsetName(EncodeConstants.ENCODING_GBK);
+            ob.setOriginalCharsetName(((String) this.charSetComboBox.getSelectedItem()));
+
         }
 
         return ob;