Merge pull request #5783 in DESIGN/design from release/11.0 to feature/x

* commit '5d3bb575d8c7c86ff561d6826d5daeef20c4087a':
  REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
  REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
  REPORT-59077 【主题切换】配色修改对保存按钮有影响，可能导致内置主题被删掉
  REPORT-58136 远程设计无法新建决策报表

designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java

@@ -59,17 +59,10 @@ public class FormThemeProfilePane extends TemplateThemeProfilePane<FormTheme> {
     }
 
     @Override
-    public void populateBean(FormTheme theme) {
+    public void populateBean4CustomEditors(FormTheme theme) {
-        super.populateBean(theme);
+        super.populateBean4CustomEditors(theme);
-
-        isPopulating = true;
-
         formBodyStyleSettingPane.populateBean(theme.getBodyStyle());
         componentStyleSettingPane.populateBean(theme.getComponentStyle());
-
-        themePreviewPane.refresh(theme);
-
-        isPopulating = false;
     }
 
     @Override

designer-base/src/main/java/com/fr/design/mainframe/theme/ReportThemeProfilePane.java

@@ -35,15 +35,9 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
     }
 
     @Override
-    public void populateBean(ReportTheme theme) {
+    public void populateBean4CustomEditors(ReportTheme theme) {
-        super.populateBean(theme);
+        super.populateBean4CustomEditors(theme);
-
-        isPopulating = true;
         reportBodyStyleSettingPane.populateBean(theme.getBodyStyle());
-
-        themePreviewPane.refresh(theme);
-
-        isPopulating = false;
     }
 
     @Override

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java

@@ -318,18 +318,15 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         T theme = updateBean();
 
         FineColorManager.traverse(theme, replaceByColorScheme);
-        populateBean(theme);
+        populateBean4CustomEditors(theme);
-
         //图表渐变色
         chartStyleSettingPane.populateGradientBar(colors);
+
+        themePreviewPane.refresh(theme);
     }
 
     public void populateBean(T theme) {
-        try {
+        this.theme = theme;
-            this.theme = (T) theme.clone();
-        } catch (CloneNotSupportedException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
         isPopulating = true;
 
         String name = theme.getName();
@@ -345,14 +342,20 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
             saveAsButton.setEnabled(!currentIsNewTheme);
         }
 
-        cellStyleSettingPane.populateBean(theme.getCellStyleList());
         colorListPane.populate(theme.getColorScheme().getColors());
         colorListExtendedPane.populate(colorListPane.update());
-        chartStyleSettingPane.populateBean(theme.getChartStyle());
+
+        populateBean4CustomEditors(theme);
+
         themePreviewPane.refresh(theme);
         isPopulating = false;
     }
 
+    protected void populateBean4CustomEditors(T theme) {
+        cellStyleSettingPane.populateBean(theme.getCellStyleList());
+        chartStyleSettingPane.populateBean(theme.getChartStyle());
+    }
+
     public T updateBean() {
         if (theme == null) {
             theme = config.createNewTheme();

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

@@ -6,4 +6,5 @@ com.fr.design.report.ReportColumnsPane=800*600
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=490*95
 com.fr.design.version.detail.label=750*30
-com.fr.design.version.detail.dialog=900*500
+com.fr.design.version.detail.dialog=900*500
+com.fr.design.web.pane.text.field=450*20

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

@@ -5,4 +5,5 @@ com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=610*280
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=430*95
 com.fr.design.version.detail.label=650*30
-com.fr.design.version.detail.dialog=800*500
+com.fr.design.version.detail.dialog=800*500
+com.fr.design.web.pane.text.field=400*20

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

@@ -5,4 +5,5 @@ com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=490*280
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=450*95
 com.fr.design.version.detail.label=700*30
-com.fr.design.version.detail.dialog=850*500
+com.fr.design.version.detail.dialog=850*500
+com.fr.design.web.pane.text.field=450*20

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

@@ -6,4 +6,5 @@ com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280
 com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
-com.fr.design.version.detail.dialog=600*500
+com.fr.design.version.detail.dialog=600*500
+com.fr.design.web.pane.text.field=450*20

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

@@ -5,4 +5,5 @@ com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280
 com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
-com.fr.design.version.detail.dialog=600*500
+com.fr.design.version.detail.dialog=600*500
+com.fr.design.web.pane.text.field=450*20

designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java

@@ -5,6 +5,7 @@ import com.fr.design.gui.frpane.EditingStringListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.file.FILE;
@@ -38,7 +39,7 @@ public class WebCssPane extends BasicPane {
 		JPanel outnorth = new JPanel(new BorderLayout(0, 5));
 		JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT,8,0));
 		localText = new UITextField();
-		localText.setPreferredSize(new Dimension(450, 20));
+		localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field"));
 		localText.setEditable(false);
 		chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection"));
 		chooseFile.setPreferredSize(new Dimension(75, 23));

designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@@ -7,6 +7,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.file.FILE;
@@ -66,8 +67,8 @@ public class WebJsPane extends BasicPane {
 		localText = new UITextField();
 		localText.setEditable(false);
 		urlText = new UITextField();
-		localText.setPreferredSize(new Dimension(450, 20));
+		localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field"));
-		urlText.setPreferredSize(new Dimension(450, 20));
+		urlText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field"));
 		urlText.addKeyListener(urlTextListener);
         urlText.setEnabled(false);
 		chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection"));