From 4f749b94f782d15bf9654649caf839dc10f5f546 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 6 Aug 2024 14:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E9=A2=84=E5=AE=9A=E4=B9=89=E9=85=8D=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/module/ChartPreFillStylePane.java     | 5 +++--
 .../main/java/com/fr/design/module/ChartPreStylePane.java    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java
index 4cc8466fd4..b7db5e9787 100644
--- a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java
@@ -1,6 +1,7 @@
 package com.fr.design.module;
 
 import com.fr.base.ChartColorMatching;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
@@ -73,12 +74,12 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
         double[] columnSize = {p, p};
         double[] rowSize = {p, p, p};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")), null},
+                new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(" ", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match"))), null},
                 new Component[]{null, customPane},
         };
 
         this.setLayout(new BorderLayout());
-        this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.WEST);
+        this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
     }
 
     private void initListener() {
diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java
index 9cce2be7c3..d9720d1957 100644
--- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java
@@ -1,6 +1,7 @@
 package com.fr.design.module;
 
 import com.fr.base.ChartColorMatching;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.base.ChartUtils;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
@@ -36,7 +37,7 @@ public class ChartPreStylePane extends BasicBeanPane<ChartColorMatching> {
 		fillStylePane = new ChartPreFillStylePane();
 
 		JPanel pane = new JPanel();
-		pane.setLayout(new FlowLayout(FlowLayout.LEFT));
+		pane.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
 
 		pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")));