Pull request #7098: REPORT-62424 【模板主题】见附件截图，windows的主题配置中的整体预览图显示有点问题

Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x

* commit '8f733e588b7a225e67bed61c07c22cb24a9a6a82':
  REPORT-62424	【模板主题】见附件截图，windows的主题配置中的整体预览图显示有点问题

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

@@ -28,15 +28,14 @@ public abstract class TemplateThemeDialog extends JDialog {
 
     private final JPanel contentContainer;
     private final JPanel actionContainer;
+    private final int dialogContentHeight;
 
     public TemplateThemeDialog(Window parent, String title, int contentWidth, int contentHeight) {
         super(parent, ModalityType.APPLICATION_MODAL);
-
         setTitle(title);
         setResizable(false);
         setLayout(FRGUIPaneFactory.createBorderLayout());
-
-        int dialogContentHeight = contentHeight + DIALOG_BOTTOM_ACTION_BAR_HEIGHT;
+        dialogContentHeight = contentHeight + DIALOG_BOTTOM_ACTION_BAR_HEIGHT;
         int dialogWindowHeight = dialogContentHeight + DIALOG_TITLE_HEIGHT;
 
         setSize(new Dimension(contentWidth, dialogWindowHeight));
@@ -54,6 +53,12 @@ public abstract class TemplateThemeDialog extends JDialog {
         setContentPane(contentContainer);
     }
 
+    @Override
+    public void doLayout() {
+        this.setSize(new Dimension(this.getWidth(), dialogContentHeight + this.getInsets().top));
+        super.doLayout();
+    }
+
     protected void setupContentPane() {
         contentContainer.add(createContentPane(), BorderLayout.CENTER, 0);
     }
@@ -63,10 +68,11 @@ public abstract class TemplateThemeDialog extends JDialog {
     }
 
     protected UIButton[] createLeftButtons() {
-        return new UIButton[] {};
+        return new UIButton[]{};
     }
+
     protected UIButton[] createRightButtons() {
-        return new UIButton[] {};
+        return new UIButton[]{};
     }
 
     public void setupActionButtons() {
@@ -89,7 +95,7 @@ public abstract class TemplateThemeDialog extends JDialog {
     }
 
     private JPanel createActionsContainer(int align, UIButton... buttons) {
-        JPanel container = new JPanel(new FlowLayout(align, DIALOG_BOTTOM_ACTION_BUTTON_GAP,  0));
+        JPanel container = new JPanel(new FlowLayout(align, DIALOG_BOTTOM_ACTION_BUTTON_GAP, 0));
         int paddingVertical = getPaddingVertical();
         container.setBorder(BorderFactory.createEmptyBorder(paddingVertical, 0, paddingVertical, 0));
 
@@ -97,7 +103,7 @@ public abstract class TemplateThemeDialog extends JDialog {
             return container;
         }
 
-        for (UIButton button: buttons) {
+        for (UIButton button : buttons) {
             if (button != null) {
                 button.setPreferredSize(new Dimension(button.getPreferredSize().width, DIALOG_BOTTOM_ACTION_BUTTON_HEIGHT));
                 container.add(button);
@@ -111,7 +117,7 @@ public abstract class TemplateThemeDialog extends JDialog {
         return createActionsContainer(FlowLayout.RIGHT, buttons);
     }
 
-    private int getPaddingVertical(){
+    private int getPaddingVertical() {
         return (DIALOG_BOTTOM_ACTION_BAR_HEIGHT - DIALOG_BOTTOM_ACTION_BUTTON_HEIGHT) / 2;
     }
 

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

@@ -45,8 +45,9 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
         chartPreviewPane.populate(initColumnChart());
         chartPreviewPane.setCallbackEvent(this);
         reportPreviewPane = new ECReportPreviewPane();
-        this.add(reportPreviewPane, BorderLayout.CENTER);
-        this.add(chartPreviewPane, BorderLayout.SOUTH);
+        reportPreviewPane.setPreferredSize(new Dimension(615, 297));
+        this.add(reportPreviewPane, BorderLayout.NORTH);
+        this.add(chartPreviewPane, BorderLayout.CENTER);
     }
 
     @Override