REPORT-65857 界面调整

designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java

@@ -39,7 +39,7 @@ public class AdvancePane extends BasicPane {
         double p = TableLayout.PREFERRED;
         DBCP_VALIDATION_QUERY.setColumns(20);
         double[] rowSizeDbcp = {p, p, p, p};
-        double[] columnDbcp = {200, p};
+        double[] columnDbcp = {190, p};
         Component[][] comps = {
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
                 {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},

designer-base/src/main/java/com/fr/design/data/datapane/connect/SshPane.java

@@ -73,7 +73,7 @@ public class SshPane extends BasicPane {
     private double f = TableLayout.FILL;
     private JPanel jPanel;
     private UIButton fileChooserButton = new UIButton();
-    private double[] columnSize = new double[]{208, p};
+    private double[] columnSize = new double[]{195, p};
 
     public SshPane() {
         fileChooserButton.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT));
@@ -85,9 +85,7 @@ public class SshPane extends BasicPane {
         fileChooserButton.setPreferredSize(new Dimension(20, 20));
         type.setEditable(false);
         type.setSelectedItem(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key"));
-        JPanel filePanel = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        filePanel.add(keyPath);
-        filePanel.add(fileChooserButton);
+        JPanel filePanel = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPath, fileChooserButton}}, new double[]{p}, new double[]{f, 20}, 0);
         Component[] compIp = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host") + ":", SwingConstants.RIGHT), ip};
         Component[] compPort = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port") + ":", SwingConstants.RIGHT), port};
         Component[] compUserName = {new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":", SwingConstants.RIGHT), user};

designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java

@@ -54,7 +54,7 @@ public class SslPane extends BasicPane {
     private double p = TableLayout.PREFERRED;
     private double f = TableLayout.FILL;
     private JPanel contextPane;
-    private double[] columnSize = new double[]{208, p};
+    private double[] columnSize = new double[]{195, p};
 
     public SslPane() {
         fileChooserButtonCa.setIcon(new ImageIcon(UIConstants.ACCESSIBLE_EDITOR_DOT));
@@ -67,18 +67,12 @@ public class SslPane extends BasicPane {
         fileChooserButtonCa.setPreferredSize(dimension);
         fileChooserButtonClientCert.setPreferredSize(dimension);
         fileChooserButtonClientKey.setPreferredSize(dimension);
-        JPanel filePanelCa = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        filePanelCa.add(keyPathCa);
-        filePanelCa.add(fileChooserButtonCa);
+        JPanel filePanelCa = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathCa, fileChooserButtonCa}}, new double[]{p}, new double[]{f, 20}, 0);
         Component[] compCa = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Ca") + ":", SwingConstants.RIGHT), filePanelCa};
         Component[] compVerifyCa = {null, verifyCa};
-        JPanel filePanelClientCert = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        filePanelClientCert.add(keyPathClientCert);
-        filePanelClientCert.add(fileChooserButtonClientCert);
+        JPanel filePanelClientCert = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientCert, fileChooserButtonClientCert}}, new double[]{p}, new double[]{f, 20}, 0);
         Component[] compClientCert = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Cert") + ":", SwingConstants.RIGHT), filePanelClientCert};
-        JPanel filePanelClientKey = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        filePanelClientKey.add(keyPathClientKey);
-        filePanelClientKey.add(fileChooserButtonClientKey);
+        JPanel filePanelClientKey = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientKey, fileChooserButtonClientKey}}, new double[]{p}, new double[]{f, 20}, 0);
         Component[] compClientKey = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Key") + ":", SwingConstants.RIGHT), filePanelClientKey};
         Component[] comCipher = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Cipher") + ":", SwingConstants.RIGHT), cipher};
         usingComps = new Component[][]{