From d3239d0d55e370b4503165e6d8785e82017b3282 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 30 Jul 2024 11:28:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC-=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5-=E7=BD=91=E7=BB=9C=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hyperlink/ReportletHyperNorthPane.java    | 27 ++++++++++---------
 .../hyperlink/ReportletHyperlinkPane.java     |  3 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
index 8fa88e9293..4b5e044727 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
@@ -1,6 +1,7 @@
 package com.fr.design.hyperlink;
 
 import com.fr.base.BaseFormula;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -148,7 +149,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         // 选择路径按钮
         browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
         browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
-        reportletNamePane.add(browserButton, BorderLayout.EAST);
+        reportletNamePane.add(browserButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
         browserButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent evt) {
@@ -274,7 +275,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
      */
     @Override
     protected JPanel setFootPanel() {
-        JPanel content = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        JPanel content = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0));
 
         // 参数传递方式下拉框
         postComboBox = new UIComboBox(new String[]{"GET", "POST"});
@@ -285,7 +286,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
 
         showParameterInterface = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Parameter_UI_Display"));
 
-        showParameterInterface.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+        showParameterInterface.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
         content.add(showParameterInterface);
         return content;
     }
@@ -324,7 +325,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         // 是否有重命名属性
         if (this.needRenamePane) {
             itemNameTextField = new UITextField();
-            Component[] renameComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), itemNameTextField};
+            Component[] renameComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name"), ":")), itemNameTextField};
             dialogComponents.add(renameComponents);
             othersComponents.add(renameComponents);
         }
@@ -333,7 +334,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
     private void initHeaderPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
         //最上方位置的面板
         JPanel headerPane = this.setHeaderPanel();
-        Component[] headerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet") + ":"), headerPane};
+        Component[] headerComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet"), ":")), headerPane};
         dialogComponents.add(headerComponents);
         othersComponents.add(headerComponents);
     }
@@ -344,9 +345,9 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         this.setTargetFrameComboBox(targetFrameComboBox);
         targetFrameComboBox.setEditable(false);
         targetFrameComboBox.setPreferredSize(new Dimension(100, 20));
-        JPanel targetFramePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        JPanel targetFramePanel = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0));
         targetFramePanel.add(targetFrameComboBox);
-        Component[] targetComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In") + ":"), targetFramePanel};
+        Component[] targetComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In"), ":")), targetFramePanel};
         dialogComponents.add(targetComponents);
         othersComponents.add(targetComponents);
     }
@@ -357,13 +358,13 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         titleFiled.getUITextField().setColumns(15);
         final JPanel titlePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
         titlePanel.add(titleFiled);
-        Component[] titleComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Title") + ":"), titlePanel};
+        Component[] titleComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Title"), ":")), titlePanel};
         dialogComponents.add(titleComponents);
     }
 
     private void initDialogSizePanel(List<Component[]> dialogComponents) {// 对话框大小
         final JPanel sizeJPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
-        UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height") + ":");
+        UILabel heightLabel = new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Chart_Height"), ":"));
         heightLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
         sizeJPanel.add(heightLabel);
         UINumberField heightTextFiled = new UINumberField();
@@ -373,7 +374,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         heightTextFiled.setPreferredSize(new Dimension(40, 20));
         sizeJPanel.add(heightTextFiled);
         this.setHeightTextFiled(heightTextFiled);
-        UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":");
+        UILabel widthLabel = new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Designer_Width"), ":"));
         widthLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
         sizeJPanel.add(widthLabel);
         UINumberField widthTextFiled = new UINumberField();
@@ -384,7 +385,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         sizeJPanel.add(widthTextFiled);
         this.setWidthTextFiled(widthTextFiled);
         sizeJPanel.setVisible(true);
-        dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size") + ":"), sizeJPanel});
+        dialogComponents.add(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size"), ":")), sizeJPanel});
     }
 
     private void initDialogLocationPanel(List<Component[]> dialogComponents) {
@@ -439,13 +440,13 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         center.addChangeListener(actionListener);
         custom.addChangeListener(actionListener);
 
-        dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Show_Position") + ":"), locationPanel});
+        dialogComponents.add(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Show_Position"), ":")), locationPanel});
     }
 
     private void initFooterPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
         // 最下方的配置面板
         // 参数传递方式
-        Component[] footerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type") + ":"), this.setFootPanel()};
+        Component[] footerComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type"), ":")), this.setFootPanel()};
         dialogComponents.add(footerComponents);
         othersComponents.add(footerComponents);
     }
diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
index 48affb7dc3..022aa0e8ce 100644
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
@@ -2,6 +2,7 @@ package com.fr.design.hyperlink;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -63,7 +64,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));
 
         extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
-        this.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, FlowLayout.LEFT), BorderLayout.SOUTH);
+        this.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT), BorderLayout.SOUTH);
     }
 
     @Override