插入-子报表

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

@@ -1,6 +1,7 @@
 package com.fr.design.report;
 
 import com.fr.base.core.KV;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
@@ -45,7 +46,7 @@ public class SubReportPane extends BasicPane {
         JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 //        northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout());
 		northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null));
-        northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location") + ":"), BorderLayout.WEST);
+        northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location"), ":")), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
         northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER);
 		pathTextField.setEditable(false);
 		UIButton browseButton = new UIButton("...");
@@ -82,7 +83,9 @@ public class SubReportPane extends BasicPane {
 		JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         kcPane.add(kvPane);
         extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
-        kcPane.add(extend, BorderLayout.SOUTH);
+		JPanel extendPanel = new JPanel(new BorderLayout(0, 0));
+		extendPanel.add(extend, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
+        kcPane.add(extendPanel, BorderLayout.SOUTH);
         centerPane.add(kcPane, BorderLayout.CENTER);
 		UITextArea description = new UITextArea(2, 1);
 		centerPane.add(description, BorderLayout.SOUTH);