From 458bbcc3836106ed39746545cdd2f2a51524a082 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 31 Jul 2024 14:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5-=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E8=B6=85=E9=93=BE-=E8=81=94=E5=8A=A8=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/columnrow/ColumnRowVerticalPane.java   | 9 +++++----
 .../impl/ChartHyperRelateCellLinkPane.java               | 8 ++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java
index a269359b73..c816dd5e97 100644
--- a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java
@@ -2,6 +2,7 @@ package com.fr.design.gui.columnrow;
 
 import java.awt.BorderLayout;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JPanel;
 
@@ -25,19 +26,19 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
 		this.add(pane, BorderLayout.NORTH);
 		
 		JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column") + ":"));
+		colPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), ":")));
 		pane.add(colPane);
 		
 		initColSpinner();
 		colPane.add(columnSpinner);
-		
+
 		JPanel rowPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		pane.add(rowPane);
 		
-		rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") + ":"));
+		rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"), ":")));
 		initRowSpinner();
 		rowPane.add(rowSpinner);
-		
+		BidiUtils.applyOrientationByLocale(colPane, rowPane);
 		this.addDocumentListener(d);
 	}
 }
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
index 185f776159..3f918bab37 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
@@ -1,17 +1,20 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
 import com.fr.base.Utils;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.design.gui.columnrow.ColumnRowVerticalPane;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.hyperlink.AbstractHyperLinkPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.ParameterProvider;
 
 import javax.swing.JPanel;
+import javax.swing.border.TitledBorder;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.util.HashMap;
@@ -47,8 +50,9 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
 
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(centerPane, BorderLayout.CENTER);
-
-        centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell")));
+        TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell"));
+        titledBorder.setTitleJustification(BidiUtils.rtl() ? TitledBorder.RIGHT : TitledBorder.LEFT);
+        centerPane.setBorder(titledBorder);
 
         colRowPane = new ColumnRowVerticalPane();
         centerPane.add(colRowPane, BorderLayout.NORTH);