INO-21074 服务器-定义数据连接

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

@@ -215,6 +215,7 @@ public class JDBCDefPane extends JPanel {
 
         JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         driverPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
+        BidiUtils.applyOrientationByLocale(driverPane);
         // 选择ODBC数据源的时候的提示链接
         JPanel odbcTipsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         odbcTipsLink = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")) {

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.security.ssh.BaseSsh;
 import com.fr.data.security.ssh.Ssh;
@@ -86,13 +87,13 @@ public class SshPane extends BasicPane {
         type.setEditable(false);
         type.setSelectedItem(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key"));
         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[] compIp = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host") + ":", SwingConstants.TRAILING), ip};
-        Component[] compPort = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port") + ":", SwingConstants.RIGHT), port};
+        Component[] compPort = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port") + ":", SwingConstants.TRAILING), port};
-        Component[] compUserName = {new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":", SwingConstants.RIGHT), user};
+        Component[] compUserName = {new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":", SwingConstants.TRAILING), user};
-        Component[] compMethod = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Verify_Method") + ":", SwingConstants.RIGHT), type};
+        Component[] compMethod = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Verify_Method") + ":", SwingConstants.TRAILING), type};
-        Component[] compPassword = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":", SwingConstants.RIGHT), password};
+        Component[] compPassword = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":", SwingConstants.TRAILING), password};
-        Component[] compKey = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key") + ":", SwingConstants.RIGHT), filePanel};
+        Component[] compKey = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Private_Key") + ":", SwingConstants.TRAILING), filePanel};
-        Component[] comSecret = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Secret") + ":", SwingConstants.RIGHT), secret};
+        Component[] comSecret = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssh_Secret") + ":", SwingConstants.TRAILING), secret};
 
         passwordComps = new Component[][]{
                 compIp,
@@ -111,7 +112,9 @@ public class SshPane extends BasicPane {
         };
         usingSsh.setSelected(true);
         contextPane = TableLayoutHelper.createGapTableLayoutPane(keyComps, new double[]{p, p, p, p, p, p}, columnSize, 11, 11);
-        jPanel.add(usingSsh, BorderLayout.NORTH);
+        JPanel sshPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        sshPane.add(usingSsh, BorderLayout.LINE_START);
+        jPanel.add(sshPane, BorderLayout.NORTH);
         jPanel.add(contextPane, BorderLayout.CENTER);
         this.add(jPanel);
 
@@ -145,6 +148,7 @@ public class SshPane extends BasicPane {
                 fileChooser.removeTopPath();
             }
         });
+        BidiUtils.applyOrientationByLocale(this);
     }