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 dialogComponents, List 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 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 dialogComponents) { @@ -439,13 +440,13 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane dialogComponents, List 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