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

* commit 'cba45e429b1d38edc9b95ee6302e1bb4b0e15959':
  REPORT-109335 回退原方案
  REPORT-109335 换个方案，英文下直接拉伸面板宽度
  REPORT-109043 11.0远程设计服务器列表图标高度异常
  REPORT-109335 国际化中，fr模板公式显示不全

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -34,6 +34,7 @@ import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
@@ -742,7 +743,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     }
 
     public BasicDialog showLargeWindow(Window window, DialogActionListener l) {
-        BasicDialog basicDialog = super.showWindowWithCustomSize(window, l, new Dimension(900, 600));
+        Dimension dimension = DesignSizeI18nManager.getInstance().i18nDimension(this.getClass().getName());
+        BasicDialog basicDialog = super.showWindowWithCustomSize(window, l, dimension);
         basicDialog.setMinimumSize(new Dimension(900, 600));
         basicDialog.setResizable(true);
         return basicDialog;
@@ -1196,7 +1198,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
         private void initDescriptionTextArea() {
             // Description
-            descriptionTextArea = new UITextArea(DESCRIPTION_TEXT_AREA_ROW,DESCRIPTION_TEXT_AREA_COLUMN);
+            descriptionTextArea = new UITextArea(DESCRIPTION_TEXT_AREA_ROW, DESCRIPTION_TEXT_AREA_COLUMN);
             descriptionTextArea.setBackground(Color.white);
             descriptionTextArea.setLineWrap(true);
             descriptionTextArea.setWrapStyleWord(true);
@@ -1282,7 +1284,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             desScrollPane.setBorder(null);
             panel.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.CENTER);
             initVariablesTreeSelectionListener();
-            this.add(panel,BorderLayout.CENTER);
+            this.add(panel, BorderLayout.CENTER);
         }
 
         private void initComponents() {

designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java

@@ -17,6 +17,7 @@ import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
+import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
 import javax.swing.Icon;
 import javax.swing.JLabel;
@@ -359,6 +360,8 @@ public abstract class JListControlPane extends JControlPane implements ListContr
             setLayout(new BorderLayout());
             this.textLabel = new JLabel();
             this.iconLabel = new JLabel();
+            this.textLabel.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 1));
+            this.iconLabel.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 0));
             add(this.textLabel, BorderLayout.CENTER);
             add(this.iconLabel, BorderLayout.WEST);
             this.iconLabel.setBackground(Color.WHITE);

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

@@ -25,3 +25,5 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 com.fr.design.report.WatermarkSettingPane=720*600
 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

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

@@ -24,3 +24,5 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 com.fr.design.report.WatermarkSettingPane=720*600
 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

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

@@ -24,3 +24,5 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 com.fr.design.report.WatermarkSettingPane=720*600
 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

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

@@ -24,3 +24,5 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 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

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

@@ -23,3 +23,5 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 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