Merge pull request #14014 in DESIGN/design from bugfix/11.0 to feature/x

* commit '54eff4173b170dddec255ac69e27a5f27f399278':
  REPORT-114938 fix:其他语言下，frm按钮移动端设置显示不全

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java

@@ -8,6 +8,7 @@ import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
@@ -210,7 +211,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
 
     private UILabel createConfigLabel(String title) {
         UILabel label = new UILabel(title + ":", UILabel.RIGHT);
-        label.setPreferredSize(new Dimension(75, 20));
+        label.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel"));
         return label;
     }
 

designer-base/src/main/java/com/fr/design/mainframe/mobile/utils/DesignerUtils.java

@@ -4,6 +4,7 @@ import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.UITitleSplitLine;
 import com.fr.design.style.color.NewColorSelectBox;
@@ -44,7 +45,7 @@ public class DesignerUtils {
 
     public static UILabel createConfigLabel(String title) {
         UILabel label = new UILabel(title, UILabel.RIGHT);
-        label.setPreferredSize(new Dimension(100, 20));
+        label.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel"));
         return label;
     }
 

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -27,3 +27,5 @@ com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65
 com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600
 com.fr.design.formula.FormulaPane=900*600
 com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600
+com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20
+com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -26,3 +26,5 @@ com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65
 com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600
 com.fr.design.formula.FormulaPane=900*600
 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
+com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=100*20
+com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=130*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -26,3 +26,5 @@ com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65
 com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600
 com.fr.design.formula.FormulaPane=900*600
 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
+com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20
+com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties

@@ -26,3 +26,5 @@ com.fr.design.report.WatermarkSettingPane=720*600
 com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65
 com.fr.design.formula.FormulaPane=900*600
 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
+com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20
+com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@@ -25,3 +25,5 @@ com.fr.design.report.WatermarkSettingPane=720*600
 com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65
 com.fr.design.formula.FormulaPane=900*600
 com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600
+com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20
+com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20