REPORT-127437 fix:纸张背景布局调整

designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java

@@ -17,10 +17,10 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.widget.FRWidgetFactory;
 
-import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -78,6 +78,7 @@ public class FollowingThemePane extends BasicPane implements UIObserver {
                 TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[] { followingThemeLabel, FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(followingThemeButtonGroup)}},
                         new double[] { p }, new double[] {FineUIScale.scale(SETTING_LABEL_WIDTH), f }, 10, 0);
         followingThemePane.setVisible(false);
+        followingThemePane.setPreferredSize(new Dimension(FineUIScale.scale(275), (int) followingThemePane.getPreferredSize().getHeight()));
 
         add(followingThemePane, BorderLayout.NORTH);
         container = FRGUIPaneFactory.createBorderLayout_S_Pane();

designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java

@@ -121,7 +121,7 @@ public class NewReportBackgroundPane extends BasicPane {
             uiLabelPane.add(uiLabel, BorderLayout.NORTH);
             uiLabelPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0));
             backgroundPane = new ReportBackgroundSpecialPane();
-            backgroundPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 10));
+            backgroundPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0));
             backgroundLabeledPane = TableLayoutHelper.createCommonTableLayoutPane(
                     new Component[][]{ new Component[] { uiLabelPane, backgroundPane } },
                     new double[] { p }, new double[] { FineUIScale.scale(SETTING_LABEL_WIDTH), f}, IntervalConstants.INTERVAL_L1