Merge pull request #7866 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '25eb0f1bc65c3ce2c5438cca0a79296a1e0aa3ab':
  REPORT-66167 解决图表栏有时候无法显示某些图表的问题

designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

@@ -41,10 +41,6 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Cursor;
@@ -55,6 +51,10 @@ import java.awt.event.ComponentEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author null
@@ -196,7 +196,9 @@ public class FormParaWidgetPane extends JPanel {
             JPanel componentsPara = new JPanel(new FlowLayout(FlowLayout.LEFT));
             WidgetOption[] chartOptions = loadChartOptions();
             for (WidgetOption chartOption : chartOptions) {
-                componentsPara.add(new ToolBarButton(chartOption));
+                ToolBarButton button = new ToolBarButton(chartOption);
+                button.setPreferredSize(new Dimension(widgetButtonWidth, widgetButtonHeight));
+                componentsPara.add(button);
             }
             int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP);
             int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP);