Pull request #2381: CHART-15518 轴数量控制到20个

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '50b2fcfde5e90b817e860a8d535ae56ed1333bbb':
  CHART-15518 轴数量控制到20个
  CHART-15840 图表第一次加载慢

designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java

@@ -6,18 +6,19 @@ import com.fr.data.condition.ListCondition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.LiteConditionPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.plugin.chart.base.AttrSeriesStackAndAxis;
 import com.fr.van.chart.designer.style.series.VanChartSeriesConditionPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
+import javax.swing.ScrollPaneConstants;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -46,10 +47,13 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
 
         //配置界面
         JPanel deployPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.add(deployPane);
 
         deployPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Deploy") + ":", null));
         deployPane.add(createDeployPane());
+        UIScrollPane scrollPane = new UIScrollPane(deployPane);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
+        this.add(scrollPane);
 
         //条件界面
         JPanel conditionPane = FRGUIPaneFactory.createBorderLayout_L_Pane();

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java

@@ -8,7 +8,6 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
@@ -18,6 +17,8 @@ import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -29,8 +30,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 坐标轴-上方按钮界面
@@ -41,9 +40,12 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
     private static final int B_W = 56;
     private static final int B_H = 21;
     private static final int COL_COUNT = 3;
+    private static final int MAX_COUNT = 20;
 
     private UIButton addButton;
     private UIPopupMenu popupMenu;
+    private UIMenuItem itemX;
+    private UIMenuItem itemY;
 
     private List<ChartAxisButton> indexList_X = new ArrayList<ChartAxisButton>();
     private List<ChartAxisButton> indexList_Y = new ArrayList<ChartAxisButton>();
@@ -66,6 +68,20 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 0));
         this.add(buttonPane, BorderLayout.CENTER);
 
+        itemX = new UIMenuItem(VanChartAttrHelper.X_AXIS_PREFIX);
+        itemX.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                addXAxis();
+            }
+        });
+        itemY = new UIMenuItem(VanChartAttrHelper.Y_AXIS_PREFIX);
+        itemY.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                addYAxis();
+            }
+        });
         addButton.addActionListener(addListener);
     }
 
@@ -165,24 +181,12 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
     ActionListener addListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
-            if(popupMenu == null){
             popupMenu = new UIPopupMenu();
-                UIMenuItem item_x = new UIMenuItem(VanChartAttrHelper.X_AXIS_PREFIX);
-                item_x.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        addXAxis();
-                    }
-                });
-                UIMenuItem item_y = new UIMenuItem(VanChartAttrHelper.Y_AXIS_PREFIX);
-                item_y.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        addYAxis();
+            if (indexList_X.size() < MAX_COUNT) {
+                popupMenu.add(itemX);
             }
-                });
-                popupMenu.add(item_x);
-                popupMenu.add(item_y);
+            if (indexList_Y.size() < MAX_COUNT) {
+                popupMenu.add(itemY);
             }
             popupMenu.setVisible(true);
             GUICoreUtils.showPopupMenu(popupMenu, addButton, addButton.getWidth() - popupMenu.getPreferredSize().width, addButton.getY() - 1 + addButton.getHeight());
@@ -219,6 +223,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         public AddButton(Icon icon) {
             super(icon);
         }
+
         /**
          * 组件是否需要响应添加的观察者事件
          *