Pull request #14045: REPORT-113994 bugfix: flex布局应用修复滚动

Merge in DESIGN/design from ~VITO/c-design:newui to newui

* commit 'd1f5f4abfe02fc6b3670d853b13654743271ba60':
  REPORT-113994 bugfix: flex布局应用修复滚动

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

@@ -85,7 +85,15 @@ import javax.swing.Timer;
 import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -277,7 +285,7 @@ public class PreferencePane extends BasicPane {
         JPanel contentPane = this;
         contentPane.setLayout(FRGUIPaneFactory.createBorderLayout());
         UITabbedPane tabPane = new UITabbedPane();
-        contentPane.add(tabPane, BorderLayout.NORTH);
+        contentPane.add(tabPane, BorderLayout.CENTER);
         // 常用面板
         JPanel generalPane = column(SETTING_V_GAP,
                 // 功能设置
@@ -416,10 +424,9 @@ public class PreferencePane extends BasicPane {
 
     @NotNull
     private UIScrollPane patchScroll(JPanel generalPane) {
-        JPanel wrapperPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        UIScrollPane uiScrollPane = new UIScrollPane(generalPane, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-        wrapperPane.add(generalPane);
+        uiScrollPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
-        wrapperPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
+        return uiScrollPane;
-        return new UIScrollPane(wrapperPane, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
     }
 
     private void createVcsSettingPane(JPanel generalPane, JPanel parentPane, CardLayout cardLayout) {

designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java

@@ -81,7 +81,7 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
         this.add(column(
                         10,
                         cell(northPane),
-                        cell(cellEditorCardPane)
+                        cell(cellEditorCardPane).weight(1)
                 ).getComponent()
         );
     }