Merge pull request #938 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '2a9fcf77e653c8cf87f87ce262e020b6f4a099fd':
  REPORT-17277 frm的body点击事件不见了  && REPORT-17897 设计器文件-选项显示不完整  && REPORT-17873 模板-报表填报属性-刷新按钮提示框的国际化问题

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -8,6 +8,7 @@ import com.fr.design.RestartHelper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.editor.editor.IntegerEditor;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ibutton.UIButton;
@@ -31,6 +32,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.general.log.Log4jConfig;
 import com.fr.locale.InterProviderFactory;
@@ -79,6 +81,7 @@ public class PreferencePane extends BasicPane {
     private static final int CACHING_DEFAULT = 5;
     private static final int CACHING_GAP = 5;
     private static final int MEMORY_TIP_LABEL_MAX_WIDTH = 230;
+    private static final int OFFSET_HEIGHT = 50;
 
     private static final String TYPE = "pressed";
     private static final String DISPLAY_TYPE = "+";
@@ -133,7 +136,6 @@ public class PreferencePane extends BasicPane {
     private UIComboBox logLevelComboBox, pageLengthComboBox, reportLengthComboBox;
     private UIDictionaryComboBox<Locale> languageComboBox;
     private IntegerEditor portEditor;
-    private UITextField jdkHomeTextField;
     private UICheckBox oracleSpace;
     private UISpinner cachingTemplateSpinner;
     private UICheckBox openDebugComboBox;
@@ -393,10 +395,10 @@ public class PreferencePane extends BasicPane {
 
         new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color"));
 
-        gridLineColorTBButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
+        gridLineColorTBButton = new UIColorButton(IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
         gridLineColorTBButton.setEnabled(this.isEnabled());
 
-        paginationLineColorTBButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
+        paginationLineColorTBButton = new UIColorButton(IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
         paginationLineColorTBButton.setEnabled(this.isEnabled());
 
         JPanel leftPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
@@ -790,4 +792,9 @@ public class PreferencePane extends BasicPane {
             }
         });
     }
+
+    @Override
+    public BasicDialog showWindow(Window window, DialogActionListener l) {
+        return showWindowWithCustomSize(window, l, new Dimension(BasicDialog.DEFAULT.width, this.getPreferredSize().height + OFFSET_HEIGHT));
+    }
 }

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@@ -32,6 +32,7 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
@@ -331,7 +332,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         DBUtils.refreshDatabase();
         String schema = StringUtils.isEmpty(schemaBox.getSelectedItem()) ? null : schemaBox.getSelectedItem();
         DataCoreUtils.refreshTables(getConnection(), TableProcedure.TABLE, schema);
-        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Database"),
+        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Database"),
                 JOptionPane.INFORMATION_MESSAGE);
     }
 
@@ -343,7 +344,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
                 DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
                 Object userObj = node.getUserObject();
                 if (userObj instanceof String) {
-                    this.setIcon(BaseUtils.readIcon("com/fr/design/images/m_insert/expandCell.gif"));
+                    this.setIcon(IOUtils.readIcon("com/fr/design/images/m_insert/expandCell.gif"));
                 } else if (userObj instanceof TableProcedure) {
                     this.setText(((TableProcedure) userObj).getName());
                 }

designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@@ -40,21 +40,7 @@ public abstract class BasicPane extends JPanel {
      * @return 对话框
      */
     public BasicDialog showWindow(Window window, DialogActionListener l) {
-        BasicDialog dg;
+        return showWindowWithCustomSize(window, l, BasicDialog.DEFAULT);
-        if (window instanceof Frame) {
-            dg = new DIALOG((Frame) window);
-        } else {
-            dg = new DIALOG((Dialog) window);
-        }
-
-        if (l != null) {
-            dg.addDialogActionListener(l);
-        }
-
-        dg.setBasicDialogSize(BasicDialog.DEFAULT);
-        GUICoreUtils.centerWindow(dg);
-        dg.setResizable(false);
-        return dg;
     }
 
     /**
@@ -100,21 +86,7 @@ public abstract class BasicPane extends JPanel {
      * @return 对话框
      */
     public BasicDialog showWindow4ChartType(Window window, DialogActionListener l) {
-        BasicDialog dg;
+        return showWindowWithCustomSize(window, l, BasicDialog.CHART);
-        if (window instanceof Frame) {
-            dg = new DIALOG((Frame) window);
-        } else {
-            dg = new DIALOG((Dialog) window);
-        }
-
-        if (l != null) {
-            dg.addDialogActionListener(l);
-        }
-
-        dg.setBasicDialogSize(BasicDialog.CHART);
-        GUICoreUtils.centerWindow(dg);
-        dg.setResizable(false);
-        return dg;
     }
 
     /**
@@ -125,20 +97,7 @@ public abstract class BasicPane extends JPanel {
      * @return 对话框
      */
     public BasicDialog showSmallWindow(Window window, DialogActionListener l) {
-        BasicDialog dg;
+        return showWindowWithCustomSize(window, l, BasicDialog.SMALL);
-        if (window instanceof Frame) {
-            dg = new DIALOG((Frame) window);
-        } else {
-            dg = new DIALOG((Dialog) window);
-        }
-
-        if (l != null) {
-            dg.addDialogActionListener(l);
-        }
-        dg.setBasicDialogSize(BasicDialog.SMALL);
-        GUICoreUtils.centerWindow(dg);
-        dg.setResizable(false);
-        return dg;
     }
 
     /**
@@ -149,20 +108,7 @@ public abstract class BasicPane extends JPanel {
      * @return 对话框
      */
     public BasicDialog showMediumWindow(Window window, DialogActionListener l) {
-        BasicDialog dg;
+        return showWindowWithCustomSize(window, l, BasicDialog.MEDIUM);
-        if (window instanceof Frame) {
-            dg = new DIALOG((Frame) window);
-        } else {
-            dg = new DIALOG((Dialog) window);
-        }
-
-        if (l != null) {
-            dg.addDialogActionListener(l);
-        }
-        dg.setBasicDialogSize(BasicDialog.MEDIUM);
-        GUICoreUtils.centerWindow(dg);
-        dg.setResizable(false);
-        return dg;
     }
 
     /**
@@ -173,6 +119,17 @@ public abstract class BasicPane extends JPanel {
      * @return 对话框
      */
     public BasicDialog showLargeWindow(Window window, DialogActionListener l) {
+        return showWindowWithCustomSize(window, l, BasicDialog.LARGE);
+    }
+
+    /**
+     * 以自定义的宽高显示窗口
+     * @param window 窗口
+     * @param l       对话框监听器
+     * @param dimension 自定义尺寸
+     * @return 对话框
+     */
+    protected BasicDialog showWindowWithCustomSize(Window window, DialogActionListener l, Dimension dimension) {
         BasicDialog dg;
         if (window instanceof Frame) {
             dg = new DIALOG((Frame) window);
@@ -183,7 +140,7 @@ public abstract class BasicPane extends JPanel {
         if (l != null) {
             dg.addDialogActionListener(l);
         }
-        dg.setBasicDialogSize(BasicDialog.LARGE);
+        dg.setBasicDialogSize(dimension);
         GUICoreUtils.centerWindow(dg);
         dg.setResizable(false);
         return dg;
@@ -350,6 +307,7 @@ public abstract class BasicPane extends JPanel {
             }
         }
 
+        @Override
         public void setVisible(boolean isVisible) {
             this.nameTextField.setVisible(isVisible);
             this.Name.setVisible(isVisible);
@@ -377,6 +335,7 @@ public abstract class BasicPane extends JPanel {
          *
          * @throws Exception 异常
          */
+        @Override
         public void checkValid() throws Exception {
             super.checkValid();
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -195,7 +195,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
                 Component[] components = xWFitLayout.getComponents();
                 xWFitLayout.removeAll();
                 layout.resetStyle();
-                XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
+                XWAbsoluteBodyLayout xwAbsoluteBodyLayout = xWFitLayout.getBackupParent() == null ? new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0)) : (XWAbsoluteBodyLayout) xWFitLayout.getBackupParent();
                 xWFitLayout.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
                 for (Component component : components) {
                     XCreator xCreator = (XCreator) component;
@@ -208,6 +208,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
                     }
                     xwAbsoluteBodyLayout.add(component);
                 }
+                xWFitLayout.setBackupParent(xwAbsoluteBodyLayout);
                 FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
                 formDesigner.getSelectionModel().setSelectedCreators(
                         FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{wAbsoluteBodyLayout}));