From b8ad2b80afbde1b9fccdc3e858369e1a9dcdf524 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 7 Aug 2024 17:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=9B=E5=BB=BA=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E9=87=8D=E6=9E=84=E8=BF=98=E5=8E=9F-designer-chart?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChartHyperPopAttrPane.java               | 15 +++------------
 .../impl/ChartHyperRelateFloatLinkPane.java       |  4 ++--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
index 6a23e0d0df..4075b411a3 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
@@ -1,7 +1,6 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
 import com.fr.base.Parameter;
-import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.design.editor.ValueEditorPane;
@@ -73,9 +72,9 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
 		double[] rowSize = { p,p,p,p,p,p};
 
         Component[][] components = new Component[][]{
-                new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Form_Widget_Style_Title")), getBoldFontTextLabelHorizontalAlignment()), titleField},
-                new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Basic_Designer_Width")), getBoldFontTextLabelHorizontalAlignment()), widthField},
-                new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Chart_Height")), getBoldFontTextLabelHorizontalAlignment()), heightField},
+				new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField},
+				new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":", SwingConstants.RIGHT), widthField},
+				new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ":", SwingConstants.RIGHT), heightField},
         };
 
         widthField.setText(String.valueOf(DEFAULT_V_VALUE));
@@ -91,14 +90,6 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
 
 		return pane;
 	}
-	private int getBoldFontTextLabelHorizontalAlignment() {
-		return SwingConstants.TRAILING;
-	}
-
-	private String getBoldFontTextLabelName(String i18ney) {
-		return BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText(i18ney), ":");
-	}
-
 	public void populateBean(ChartHyperPoplink chartHyperlink) {
 		
 		titleField.setText(chartHyperlink.getChartDigTitle());
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
index 6dccd95aaf..3f1df49531 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@@ -54,7 +54,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
 
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name"), ":")), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), BorderLayout.NORTH);
         }
 
         this.add(centerPane, BorderLayout.CENTER);
@@ -62,7 +62,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
         floatNameBox.setPreferredSize(new Dimension(90, 20));
 
         JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
-        pane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float"), ":")));
+        pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float") + ":"));
         pane.add(floatNameBox);
         BidiUtils.applyOrientationByLocale(pane);
         Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);