Merge pull request #6442 in DESIGN/design from final/10.0 to persist/10.0

* commit 'bd1af0df2b8f09988494f14c8be75330bf01c02a':
  REPORT-61736 条件属性背景插入图片以后，点击其他位置，条件属性框空白
  REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
  REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全

designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java

@@ -163,6 +163,8 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
         try {
             latch.await();
         } catch (InterruptedException ignore) {
+        } finally {
+            setShowDialogState(false);
         }
         return selectedFiles.length > 0 ? JFileChooser.APPROVE_OPTION : JFileChooser.CANCEL_OPTION;
     }

designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java

@@ -5,6 +5,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.report.fit.menupane.FitPreviewPane;
@@ -90,9 +91,9 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
         }
         for (int i = 0; i < columnSize.length; i++) {
             if (i == 0) {
-                columnSize[i] = 80;
+                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth();
             } else {
-                columnSize[i] = 100;
+                columnSize[i] = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.column").getWidth();
             }
         }
 

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -4,6 +4,7 @@ import com.fr.design.actions.JTemplateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -66,13 +67,13 @@ public class ReportFitAttrAction extends JTemplateAction {
 
     private void showReportFitDialog(ReportFitAttr fitAttr, final JTemplate jwb, final FitProvider wbTpl, final BasicBeanPane<ReportFitAttr> attrPane) {
         attrPane.populateBean(fitAttr);
-        UIDialog dialog = attrPane.showMediumWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        UIDialog dialog = attrPane.showWindowWithCustomSize(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
             @Override
             public void doOk() {
                 wbTpl.setReportFitAttr(attrPane.updateBean());
                 jwb.fireTargetModified();
             }
-        });
+        }, DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.templatePane.dialog"));
         dialog.setVisible(true);
     }
 

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

@@ -8,4 +8,8 @@ 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.env.SyncFailedPluginsDialog.messageWithLink=316*36
-com.fr.design.web.pane.text.field=450*20
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=800*630
+com.fr.design.report.fit.templatePane.dialog=800*400
+com.fr.design.report.fit.firstColumn=120*20
+com.fr.design.report.fit.column=160*20

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

@@ -7,4 +7,8 @@ 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.env.SyncFailedPluginsDialog.messageWithLink=316*36
-com.fr.design.web.pane.text.field=400*20
+com.fr.design.web.pane.text.field=400*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=170*20
+com.fr.design.report.fit.column=100*20

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

@@ -7,4 +7,8 @@ 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.env.SyncFailedPluginsDialog.messageWithLink=316*36
-com.fr.design.web.pane.text.field=450*20
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=130*20
+com.fr.design.report.fit.column=100*20

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

@@ -8,4 +8,8 @@ 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.env.SyncFailedPluginsDialog.messageWithLink=316*20
-com.fr.design.web.pane.text.field=450*20
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=80*20
+com.fr.design.report.fit.column=100*20

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

@@ -7,4 +7,8 @@ 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.env.SyncFailedPluginsDialog.messageWithLink=316*20
-com.fr.design.web.pane.text.field=450*20
+com.fr.design.web.pane.text.field=450*20
+com.fr.design.actions.server.dialog=700*630
+com.fr.design.report.fit.templatePane.dialog=600*400
+com.fr.design.report.fit.firstColumn=80*20
+com.fr.design.report.fit.column=100*20

designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java

@@ -9,6 +9,7 @@ import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.webattr.EditReportServerParameterPane;
@@ -25,7 +26,7 @@ import java.awt.event.ActionEvent;
  * Server Config Manager
  */
 public class ServerConfigManagerAction extends UpdateAction {
-    public static final Dimension DEFAULT = new Dimension(700, 630);
+    public static final Dimension DEFAULT = DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.actions.server.dialog");
 
     public ServerConfigManagerAction() {
         this.setMenuKeySet(SERVER_CONFIG_MANAGER);