关联数据集、文件数据集

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.base.Utils;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.core.datasource.FileDataSource;
 import com.fr.data.core.datasource.URLDataSource;
 import com.fr.data.core.define.XMLColumnNameType;
@@ -137,12 +138,12 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         this.setLayout(new BorderLayout(gap, 0));
         JPanel northPanel = new JPanel(new BorderLayout());
         JPanel type = new JPanel();
-        type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"));
+        type.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type"), ":")));
         String[] item = {"TXT", "Excel", "XML"};
         fileTypeComboBox = new UIComboBox(item);
         fileTypeComboBox.setPreferredSize(new Dimension(100, 20));
         type.add(fileTypeComboBox);
-        northPanel.add(type, BorderLayout.WEST);
+        northPanel.add(type, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
 
         // 最上面的pane，文件选择
         JPanel centerPanel = new JPanel();
@@ -172,7 +173,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
         this.add(northPanel, BorderLayout.NORTH);
         this.add(centerPanel, BorderLayout.CENTER);
-        this.add(southPanel, BorderLayout.EAST);
+        this.add(southPanel, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
+        BidiUtils.applyOrientationByLocale(this);
     }
 
     private void addToCenterPanel(JPanel centerPanel) {
@@ -207,9 +209,9 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         buttonPanel.add(chooseFile);
         buttonPanel.add(testConnection);
         filePath = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        filePath.add(textPanel, BorderLayout.WEST);
+        filePath.add(textPanel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
         filePath.add(textFieldPanel, BorderLayout.CENTER);
-        filePath.add(buttonPanel, BorderLayout.EAST);
+        filePath.add(buttonPanel, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
         centerPanel.add(filePath, BorderLayout.NORTH);
 
         // 中间的pane，提示信息
@@ -272,7 +274,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         controlPane.setLayout(new BorderLayout(8, 8));
         controlPane.setPreferredSize(new Dimension(width, height));
         JPanel comboboxPanel = new JPanel(new BorderLayout(8, 8));
-        encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
+        encodeLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type"), ":")
+        );
         encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         encodingComboBox.setSelectedIndex(4);
         encodingComboBox.setPreferredSize(new Dimension(90, 20));

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java

@@ -60,7 +60,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
         this.setLayout(new BorderLayout());
         this.add(initNorthPane(multiName), BorderLayout.CENTER);
         this.add(initSouthPanel(), BorderLayout.SOUTH);
-        BidiUtils.applyOrientationByLocale(this);
+
     }
 
     private JPanel initNorthPane(String multiName) {
@@ -133,7 +133,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
 
         jpanel.add(editorPane, BorderLayout.CENTER);
 
-        return jpanel;
+        return BidiUtils.applyOrientationByLocale(jpanel);
     }
 
     private class RefreshAction extends UITableEditAction {
@@ -313,13 +313,13 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
             formulaButton.setEnabled(false);
             formulaButton.setPreferredSize(new Dimension(25, 23));
             formulaButton.addActionListener(getFormulaActionListener());
-            rightPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Conditions_Formula") + " ="));
+            rightPanel.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Conditions_Formula"), " =")));
             rightPanel.add(formulaContentTextField);
             rightPanel.add(formulaButton);
 
             this.setPreferredSize(new Dimension(-1, BAR_HEIGHT));
-            this.add(leftPanel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
-            this.add(rightPanel, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.CENTER);
+            this.add(leftPanel, BorderLayout.WEST);
+            this.add(rightPanel, BorderLayout.CENTER);
         }
 
         public void populate() {