From 987923d5f8539dbcad7a8fcd0cfb5e9c8ed5b419 Mon Sep 17 00:00:00 2001
From: xiqiu <xiqiu@fanruan.com>
Date: Wed, 15 Dec 2021 16:47:57 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-64173=20=20=E9=99=90=E5=AE=9A=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E5=AE=9E=E7=8E=B0=E7=9A=84=E6=9C=80=E5=A4=A7=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E5=B8=83=E5=B1=80=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/DatabaseConnectionPane.java       | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 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 2b0df34475..91e8006d10 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
@@ -14,6 +14,7 @@ import com.fr.data.solution.processor.SolutionProcessor;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
@@ -33,6 +34,7 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
@@ -59,6 +61,8 @@ import java.util.concurrent.ExecutionException;
  * Database Connection pane.
  */
 public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connection> extends BasicBeanPane<com.fr.data.impl.Connection> {
+    private static int MAX_MAIN_PANEL_HEIGHT = 430;
+    private static int MAX_MAIN_PANEL_WIDTH = 675;
 
     private UILabel message;
     private UIButton okButton;
@@ -333,11 +337,11 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
         // Center
         mainPanel = mainPanel();
-        mainPanel.setPreferredSize(new Dimension(675, 280));
-        northPane.add(mainPanel, BorderLayout.CENTER);
         JPanel advancedPanel = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_Advanced"));
-        advancedPanel.setPreferredSize(new Dimension(675, 210));
         if (mainPanel instanceof JDBCDefPane) {
+            mainPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, 280));
+            advancedPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, 210));
+            northPane.add(mainPanel, BorderLayout.CENTER);
             ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Advanced_More_Settings"));
             actionLabel.addActionListener(new ActionListener() {
                 @Override
@@ -359,6 +363,16 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
         } else {
             //非jdbc配置布局保持不变
+            advancedPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, 60));
+            if (mainPanel.getPreferredSize().height > MAX_MAIN_PANEL_HEIGHT || mainPanel.getPreferredSize().width > MAX_MAIN_PANEL_WIDTH) {
+                UIScrollPane jp = new
+                        UIScrollPane(mainPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+                jp.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, MAX_MAIN_PANEL_HEIGHT));
+                northPane.add(jp, BorderLayout.CENTER);
+            } else {
+                mainPanel.setPreferredSize(new Dimension(MAX_MAIN_PANEL_WIDTH, MAX_MAIN_PANEL_HEIGHT));
+                northPane.add(mainPanel, BorderLayout.CENTER);
+            }
             // ChartSet
             String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")};
             charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));