Pull request #15071: REPORT-137556 & REPORT-137644 fix 服务器配置颜色块布局 & 背景默认值

Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/release to fbp/release

* commit 'e466a761b63d2743f99f9a8c52e91df6e499a375':
  REPORT-137556 & REPORT-137644 fix 服务器配置颜色块布局 & 背景默认值
  无 jira fix: 网络报表滚动条问题

designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java

@@ -15,7 +15,6 @@ import java.awt.CardLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import static com.fine.swing.ui.layout.Layouts.column;
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
 
@@ -37,7 +36,7 @@ public class ReportletPane extends BasicPane {
         UILabel tipLabel = new UILabel();
         tipLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Schedule_The_Selected_File_Must_Be_End_With_Filter"));
         tipLabel.setForeground(FineUIUtils.getUIColor("Label.tipColor", "Label.tipColor"));
-        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel centerPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(0, 6));
         this.add(centerPane, BorderLayout.CENTER);
 
         switchButton = new UIButton("switch");
@@ -53,13 +52,14 @@ public class ReportletPane extends BasicPane {
         cardPane.setLayout(card = new CardLayout());
         templateReportletTree = new TemplateFileTree();
         templateReportletTree.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal"));
-        templateReportletTree.setBorder(FineBorderFactory.createWrappedRoundBorder());
         IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form", ".cptx"});
         templateReportletTree.setFileNodeFilter(filter);
         cardPane.add(t_panel = new JScrollPane(templateReportletTree), "TEMPLATE");
         classReportletTree = new ClassFileTree();
         cardPane.add(c_panel = new JScrollPane(classReportletTree), "CLASS");
-        centerPane.add(column(6, cell(buttonPane), cell(cardPane)).getComponent());
+        cardPane.setBorder(FineBorderFactory.createWrappedRoundBorder());
+        centerPane.add(buttonPane, BorderLayout.NORTH);
+        centerPane.add(cardPane, BorderLayout.CENTER);
         this.refreshEnv();
     }
 

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java

@@ -7,6 +7,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.general.Background;
 import com.fr.design.mainframe.widget.wrappers.BackgroundWrapper;
 import com.fr.design.dialog.BasicDialog;
@@ -29,7 +30,7 @@ public class AccessibleBackgroundEditor extends UneditableAccessibleEditor {
     protected void showEditorPane() {
         if (backgroundPane == null) {
             backgroundPane = new BackgroundPane();
-            backgroundPane.setPreferredSize(new Dimension(600, 400));
+            backgroundPane.setPreferredSize(FineUIScale.createScaleDimension(600, 400));
         }
         BasicDialog dlg = backgroundPane.showWindow(SwingUtilities.getWindowAncestor(this));
         dlg.addDialogActionListener(new DialogActionAdapter() {

designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java

@@ -92,6 +92,7 @@ public class BackgroundPane extends BasicPane {
             quickPane = BackgroundFactory.createIfAbsent(background == null ? null : background.getClass());
             cacheMap.put(index, quickPane);
         }
+        tabbedPane.setSelectedIndex(index);
         return quickPane;
     }
 

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -267,7 +267,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
 
     private void initMenuColorPane() {
-        menuColorPane.setLayout(new GridLayout(5, 8, DEFAULT_COLOR_HOR_INTERVAL, 0));
+        menuColorPane.setLayout(new GridLayout(4, 10, DEFAULT_COLOR_HOR_INTERVAL, 0));
         Color[] colorArray = this.getColorArray();
         for (int i = 0; i < colorArray.length; i++) {
             Color color = colorArray[i] == null ? UsedColorPane.DEFAULT_COLOR : colorArray[i];