模板-报表分栏

designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@@ -209,7 +209,7 @@ public class FRGUIPaneFactory {
      */
     public static JPanel createTitledBorderPane(String string) {
         JPanel jp = new JPanel();
-        UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(string);
+        UITitledBorder explainBorder = (UITitledBorder) BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle(string));
         jp.setBorder(explainBorder);
         jp.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
         return jp;

designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.report;
 
 import com.fr.base.GraphHelper;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.dialog.BasicPane;
@@ -114,10 +115,10 @@ public class ReportColumnsPane extends BasicPane{
         int uiLabelWidth = GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportColumns_Columns"), uiLableFont);
 
         uiLabel.setPreferredSize(new Dimension(uiLabelWidth, 20));
-        north.add(uiLabel,BorderLayout.WEST);
+        north.add(uiLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
         JPanel buttonGroupPane = new JPanel(new FlowLayout(FlowLayout.CENTER, 23,11));
         buttonGroupPane.add(onOffButtonGroup);
-        north.add(buttonGroupPane, BorderLayout.EAST);
+        north.add(buttonGroupPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
         this.add(north, BorderLayout.NORTH);
         this.add(createRowColumnPane(), BorderLayout.CENTER);
     }
@@ -185,14 +186,14 @@ public class ReportColumnsPane extends BasicPane{
         north.add(createRowMaxOrSetPane());
 
         center.add(createRowPane(), BorderLayout.NORTH);
-        JPanel xx = new JPanel(new FlowLayout(FlowLayout.RIGHT,0,0));
+        JPanel xx = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.LEFT : FlowLayout.RIGHT,0,0));
         showBlankCheckBox = new UICheckBox(SHOW_BLANK[rowOrColumn]);
         xx.add(showBlankCheckBox);
         center.add(xx, BorderLayout.CENTER);
 
         divideRowPane.add(north, BorderLayout.NORTH);
         divideRowPane.add(center, BorderLayout.CENTER);
-        return divideRowPane;
+        return BidiUtils.applyOrientationByLocale(divideRowPane);
     }
 
     /**
@@ -306,25 +307,25 @@ public class ReportColumnsPane extends BasicPane{
 	 */
     private JPanel createRowPane() {
         JPanel rowPane = new JPanel();
-        UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Area"));
+        UITitledBorder explainBorder = (UITitledBorder) BidiUtils.applyTitledBorderJustification(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Area")));
         rowPane.setBorder(explainBorder);
         rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13));
         rowPane.setPreferredSize(new Dimension(500,80));
-        rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data") + ":"));
+        rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data"), ":")));
         repeatColDataTextField = new UITextField();
         repeatColDataTextField.setPreferredSize(new Dimension(107,24));
         rowPane.add(repeatColDataTextField);
-        rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 "));
-        copyLabel = new UILabel(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":");
+        rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 ")));
+        copyLabel = new UILabel(BidiUtils.reverseConcatenateStrings(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":"));
         rowPane.add(copyLabel);
 
         copyTitleTextField = new UITextField();
         copyTitleTextField.setPreferredSize(new Dimension(107,24));
         rowPane.add(copyTitleTextField);
-        rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": 1,2-3,5,18"));
+        rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": 1,2-3,5,18")));
 
 
-        return rowPane;
+        return BidiUtils.applyOrientationByLocale(rowPane);
     }
 
     /**