From 0fa461fb72fcf8ce054353ea4ee3f49eb9b23baa Mon Sep 17 00:00:00 2001
From: xiqiu <xiqiu@fanruan.com>
Date: Thu, 15 Apr 2021 16:21:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-51103=20=E5=8A=A0=E4=B8=8A=E9=81=97?=
 =?UTF-8?q?=E6=BC=8F=E7=9A=84mysql=E5=8F=A6=E4=B8=80=E7=A7=8D=E9=A9=B1?=
 =?UTF-8?q?=E5=8A=A8=EF=BC=9B=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
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, 2 insertions(+), 2 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 16c992b0f3..0a6b10d077 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
@@ -332,10 +332,10 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
         detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
         detailLabel.setForeground(Color.BLUE);
-        hiddenPanel.setLayout(new BorderLayout(10, 0));
+        hiddenPanel.setLayout(new BorderLayout(2, 0));
         hiddenPanel.add(new JPanel(), BorderLayout.WEST);
         hiddenPanel.add(new JPanel(), BorderLayout.EAST);
-        downPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 9));
+        downPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 15, 9));
         downPane.add(okButton);
         downPane.add(cancelButton);
         jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS));

From 93b3afe33a721f0aa0443a3aa7549c9828cf98b0 Mon Sep 17 00:00:00 2001
From: xiqiu <xiqiu@fanruan.com>
Date: Thu, 15 Apr 2021 20:46:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?REPORT-51103=20=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datapane/connect/DatabaseConnectionPane.java       | 6 +++---
 1 file changed, 3 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 743b2b2868..3e1e1f5315 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
@@ -99,7 +99,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                 protected void done() {
                     try {
                         get();
-                        dialog.setSize(new Dimension(380, 118));
+                        dialog.setSize(new Dimension(380, 125));
                         okButton.setEnabled(true);
                         uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
                         message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
@@ -210,7 +210,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                             detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
                             directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
                         } else {
-                            dialog.setSize(new Dimension(380, 260));
+                            dialog.setSize(new Dimension(380, 270));
                             hiddenPanel.setVisible(true);
                             detailLabel.setText(Toolkit.i18nText("Fine_Designer_Hide_Detail"));
                             directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.down"));
@@ -349,7 +349,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
         okButton.setEnabled(false);
         dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true);
-        dialog.setSize(new Dimension(380, 118));
+        dialog.setSize(new Dimension(380, 125));
         okButton.setEnabled(false);
         JPanel jp = new JPanel();
         JPanel upPane = new JPanel();

From 7149acf78ce26599aa5b0270cc812e68d3ea4ee2 Mon Sep 17 00:00:00 2001
From: xiqiu <xiqiu@fanruan.com>
Date: Thu, 15 Apr 2021 23:15:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?REPORT-51103=20=20=E6=94=B9=E4=B8=AA?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=B9=E4=BE=BF=E5=AE=9A=E4=BD=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/gui/UILookAndFeel.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java b/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java
index 90bc60a290..b93953a99e 100644
--- a/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java
+++ b/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java
@@ -205,7 +205,7 @@ public class UILookAndFeel extends MetalLookAndFeel {
                     "com/fr/design/images/lookandfeel/" + fileName, UILookAndFeel.class);
 
             if (url == null) {
-                FineLoggerFactory.getLogger().error("Icon directory could not be resolved.");
+                FineLoggerFactory.getLogger().error(fileName + " :Icon directory could not be resolved.");
                 return null;
             }
         }