单元格条件属性

designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.condition;
 
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.common.annotations.Open;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.beans.BasicBeanPane;
@@ -71,6 +72,7 @@ public abstract class ConditionAttributesPane<T> extends BasicBeanPane<T> {
         selectedItemScrollPane.setMinimumSize(new Dimension((int) selectedItemScrollPane.getPreferredSize().getWidth(), MIN_HEIGHT));
         dealScrollPane(selectedItemScrollPane);
         propertyChangePane.add(selectedItemScrollPane);
+        BidiUtils.applyOrientationByLocale(this);
     }
 
     protected void dealScrollPane(JScrollPane scrollPane){

designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java

@@ -2,6 +2,7 @@ package com.fr.design.condition;
 
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.DataConstants;
 import com.fr.data.condition.CommonCondition;
 import com.fr.data.condition.FormulaCondition;
@@ -400,6 +401,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
     public LiteConditionPane() {
         this.initComponents();
+        BidiUtils.applyOrientationByLocale(this);
     }
 
     protected abstract BasicBeanPane<T> createUnFormulaConditionPane();
@@ -439,7 +441,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         conditionsTree.addTreeSelectionListener(treeSelectionListener);
 
         JPanel buttonPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
-        previewPane.add(GUICoreUtils.createBorderPane(buttonPane, BorderLayout.NORTH), BorderLayout.EAST);
+        previewPane.add(GUICoreUtils.createBorderPane(buttonPane, BorderLayout.NORTH), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
         initButtonPane(buttonPane);
 
         // peter:必须要检查Enabled.
@@ -493,8 +495,8 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         this.add(conditonTypePane, BorderLayout.NORTH);
         conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM));
 
-        UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + ":");
+        UILabel conditionTypeLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type"), ":"));
-        conditonTypePane.add(conditionTypeLabel, BorderLayout.WEST);
+        conditonTypePane.add(conditionTypeLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
         conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0));
 
         JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);

designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java

@@ -4,6 +4,8 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 
 import javax.swing.DefaultComboBoxModel;
+
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -79,7 +81,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
 
 			conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPaneWithGlobalListener();
 
-			Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator") + ":"), new UILabel() },
+			Component[][] components = { { new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator"), ":")), new UILabel() },
 					{ conditionOPComboBox, conditionValuePane } };
 
 			double p = TableLayout.PREFERRED;

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

@@ -429,7 +429,7 @@ public class FRGUIPaneFactory {
      */
     public static JPanel createRightFlowInnerContainer_S_Pane() {
         JPanel jp = new JPanel();
-        jp.setLayout(new FlowLayout(FlowLayout.RIGHT));
+        jp.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.LEFT : FlowLayout.RIGHT));
         return jp;
     }