Merge pull request #1144 in DESIGN/design from ~ZHENG/c-design:refactor/19.4.3 to refactor/19.4.3

* commit '9ce28c7b1cdefa8707cb944ad84c9ca7e85c4ae6':
  大数据模式 reset一些属性
  CHART-10225 属性兼容：大数据相关
  CHART-10225 折现线型 配置界面

designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaSeriesPane.java

@@ -32,7 +32,6 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane {
                 new Component[]{createMarkerPane()},
                 new Component[]{createAreaFillColorPane()},
                 new Component[]{createStackedAndAxisPane()},
-                new Component[]{createLargeDataModelPane()},
                 new Component[]{createTrendLinePane()},
         };
 

designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java

@@ -70,6 +70,7 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha
 
     /**
      * 图表的属性界面数组
+     *
      * @return 属性界面
      */
     public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) {
@@ -82,6 +83,11 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha
                     protected ZoomPane createZoomPane() {
                         return new ZoomPane();
                     }
+
+                    @Override
+                    protected boolean isCurrentChartSupportLargeDataMode() {
+                        return true;
+                    }
                 };
             }
         };

designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java

@@ -65,6 +65,7 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/bubble.png";
     }
+
     @Override
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new VanChartBubbleSeriesPane(parent, plot);
@@ -88,6 +89,7 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
 
     /**
      * 图表的属性界面数组
+     *
      * @return 属性界面
      */
     public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) {
@@ -99,6 +101,11 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
                     protected ZoomPane createZoomPane() {
                         return new ZoomPane();
                     }
+
+                    @Override
+                    protected boolean isCurrentChartSupportLargeDataMode() {
+                        return true;
+                    }
                 };
             }
         };

designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java

@@ -6,8 +6,6 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
-
-import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble;
 import com.fr.van.chart.bubble.component.VanChartBubblePane;
 import com.fr.van.chart.custom.component.VanChartCustomAxisConditionPane;
@@ -44,10 +42,6 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane {
                 new Component[]{null}
         };
 
-        if (!((VanChartBubblePlot)plot).isForceBubble()) {
-            components[3] = new Component[]{createLargeDataModelPane()};
-        }
-
         contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col);
         return contentPane;
     }
@@ -84,7 +78,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane {
     protected void populateCondition(ConditionAttr defaultAttr) {
         super.populateCondition(defaultAttr);
         if (bubblePane != null) {
-            VanChartAttrBubble attrBubble = (VanChartAttrBubble) defaultAttr.getExisted(VanChartAttrBubble.class);
+            VanChartAttrBubble attrBubble = defaultAttr.getExisted(VanChartAttrBubble.class);
             bubblePane.populateBean(attrBubble);
         }
     }
@@ -92,7 +86,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane {
     protected void updateCondition(ConditionAttr defaultAttr) {
         super.updateCondition(defaultAttr);
         if (bubblePane != null) {
-            VanChartAttrBubble attrBubble = (VanChartAttrBubble) defaultAttr.getExisted(VanChartAttrBubble.class);
+            VanChartAttrBubble attrBubble = defaultAttr.getExisted(VanChartAttrBubble.class);
             if (attrBubble != null) {
                 defaultAttr.remove(attrBubble);
             }

designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java

@@ -7,7 +7,6 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
@@ -89,11 +88,12 @@ public class PlotFactory {
     public static boolean plotAutoAdjustLabelPosition(Plot plot) {
         return autoAdjustLabelPlots.contains(plot.getClass());
     }
+
     /**
-     *
      * 标签Map
      */
     private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>>();
+
     static {
         labelMap.put(VanChartGaugePlot.class, VanChartGaugePlotLabelPane.class);
         labelMap.put(VanChartScatterPlot.class, VanChartScatterPlotLabelPane.class);
@@ -104,6 +104,7 @@ public class PlotFactory {
      * 图例Map
      */
     private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLegendPane>> legendMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartPlotLegendPane>>();
+
     static {
         legendMap.put(VanChartGaugePlot.class, VanLegendPaneWidthOutHighlight.class);
         legendMap.put(VanChartMultiPiePlot.class, VanLegendPaneWidthOutHighlight.class);
@@ -119,6 +120,7 @@ public class PlotFactory {
      * 数据点提示Map
      */
     private static Map<Class<? extends Plot>, Class<? extends VanChartPlotTooltipPane>> toolTipMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartPlotTooltipPane>>();
+
     static {
         toolTipMap.put(VanChartGaugePlot.class, VanChartGaugePlotTooltipPane.class);
         toolTipMap.put(VanChartScatterPlot.class, VanChartScatterPlotTooltipPane.class);
@@ -156,18 +158,19 @@ public class PlotFactory {
     }
 
 
-
     /**
      * 监控刷新 自动数据点提示Map
      */
 
 
     private static Map<Class<? extends Plot>, Class<? extends VanChartPlotTooltipPane>> refreshToolTipMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartPlotTooltipPane>>();
+
     static {
         refreshToolTipMap.put(VanChartGaugePlot.class, VanChartGaugePlotRefreshTooltipPane.class);
         refreshToolTipMap.put(VanChartBubblePlot.class, VanChartBubbleRefreshTooltipPane.class);
 
     }
+
     private static Map<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>> refreshTooltipContentMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>>();
 
     static {
@@ -186,6 +189,7 @@ public class PlotFactory {
 
     /**
      * 根据图表类型创建标签界面
+     *
      * @param plot      图表
      * @param stylePane 样式界面
      * @return 标签界面
@@ -206,6 +210,7 @@ public class PlotFactory {
 
     /**
      * 根据图表类型创建图例界面
+     *
      * @param plot      图表
      * @param stylePane 样式界面
      * @return 图例界面
@@ -226,6 +231,7 @@ public class PlotFactory {
 
     /**
      * 根据图表类型创建数据点提示界面
+     *
      * @param plot      图表
      * @param stylePane 样式界面
      * @return 数据点提示界面
@@ -246,6 +252,7 @@ public class PlotFactory {
 
     /**
      * 根据图表类型创建标签的具体内容界面.分类名系列名等
+     *
      * @param plot       图表
      * @param parent     样式界面
      * @param showOnPane formatpane用到
@@ -267,6 +274,7 @@ public class PlotFactory {
 
     /**
      * 根据图表类型创建数据点提示的具体内容界面.分类名系列名等
+     *
      * @param plot       图表
      * @param parent     样式界面
      * @param showOnPane formatpane用到
@@ -287,9 +295,9 @@ public class PlotFactory {
     }
 
 
-
     /**
      * 根据图表类型创建数据点提示界面
+     *
      * @param plot 图表
      * @return 数据点提示界面
      */
@@ -306,8 +314,10 @@ public class PlotFactory {
         }
         return new VanChartPlotRefreshTooltipPane(plot);
     }
+
     /**
      * 根据图表类型创建监控刷新中数据点提示的具体内容界面.分类名系列名等
+     *
      * @param plot       图表
      * @param parent     交互属性界面
      * @param showOnPane formatpane用到
@@ -336,6 +346,7 @@ public class PlotFactory {
                         new Component[]{centerPane, null},
                 };
             }
+
             protected UIComboBoxRenderer createComBoxRender() {
                 return new UIComboBoxRenderer() {
                     @Override
@@ -362,11 +373,7 @@ public class PlotFactory {
      * 判断是否为大数据模式
      */
     public static boolean largeDataModel(Plot plot) {
-        return plot != null && plot.getDataProcessor().getMark() == LargeDataModel.MARK;
-    }
-
-    public static boolean lineMapLargeModel(Plot plot){
-        return plot instanceof VanChartMapPlot && ((VanChartMapPlot) plot).getLineMapDataProcessor().getMark() == LargeDataModel.MARK;
+        return plot != null && plot.convertDataProcessor().getMark() == LargeDataModel.MARK;
     }
 }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/LineTypeComboBox.java

@@ -30,7 +30,7 @@ public class LineTypeComboBox extends UIComboBox {
         this.setRenderer(new CellRenderer());
     }
 
-    private class CellRenderer extends UIComboBoxRenderer {
+    private static class CellRenderer extends UIComboBoxRenderer {
 
         private LineType lineType;
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java

@@ -32,10 +32,11 @@ public class VanChartLineTypePane extends BasicPane {
     protected UIButtonGroup<LineStyle> lineStyle;//形态
     private UIButtonGroup nullValueBreak;//空值断开
 
+    private JPanel lineWidthPane;
+
     public VanChartLineTypePane() {
-        lineTypeComboBox = new LineTypeComboBox(new LineType[]{LineType.NONE, LineType.NORMAL, LineType.DASH});
 
-        lineWidthSpinner = new UISpinner(0.5, Integer.MAX_VALUE, 0.5, 2);
+        JPanel typeAndWidthPane = createTypeAndWidthPane();
 
         createLineStyle();
 
@@ -52,14 +53,10 @@ public class VanChartLineTypePane extends BasicPane {
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
 
-        Component[] lineTypeComponent = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineTypeComboBox},
-                lineWidthComponent = new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Width")),
-                        UIComponentUtils.wrapWithBorderLayoutPane(lineWidthSpinner)},
-                lineStyleComponent = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Present")), lineStyle},
+        Component[] lineStyleComponent = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Present")), lineStyle},
                 nullValueBreakComponent = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")), nullValueBreak};
 
-        Component[][] components = createContentComponent(lineTypeComponent, lineWidthComponent, lineStyleComponent, nullValueBreakComponent);
+        Component[][] components = createContentComponent(lineStyleComponent, nullValueBreakComponent);
 
         double[] row = new double[components.length];
         Arrays.fill(row, p);
@@ -67,16 +64,45 @@ public class VanChartLineTypePane extends BasicPane {
 
         JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
 
-        this.setLayout(new BorderLayout());
+        this.setLayout(new BorderLayout(0, 6));
+        this.add(typeAndWidthPane, BorderLayout.NORTH);
         this.add(contentPane, BorderLayout.CENTER);
     }
 
     private JPanel createTypeAndWidthPane() {
-        //todo@shinerefactor:当前兼容工作到这边，因为finekit和移动端，暂停
-        JPanel panel = new JPanel(new BorderLayout(0, 6));
 
+        lineTypeComboBox = new LineTypeComboBox(new LineType[]{LineType.NONE, LineType.NORMAL, LineType.DASH});
+
+        lineWidthSpinner = new UISpinner(0.5, Integer.MAX_VALUE, 0.5, 2);
+
+        lineTypeComboBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkLineWidth();
+            }
+        });
+
+        Component[][] lineTypeComps = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineTypeComboBox}
+        };
+        Component[][] lineWidthComps = new Component[][]{
+                new Component[]{
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Width")),
+                        UIComponentUtils.wrapWithBorderLayoutPane(lineWidthSpinner)}
+        };
+
+        double p = TableLayout.PREFERRED, f = TableLayout.FILL, e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double[] row = {p}, col = {f, e};
+
+        JPanel lineTypePane = TableLayout4VanChartHelper.createGapTableLayoutPane(lineTypeComps, row, col);
+        lineWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(lineWidthComps, row, col);
+
+        JPanel contentPane = new JPanel(new BorderLayout(0, 6));
+
+        contentPane.add(lineTypePane, BorderLayout.CENTER);
+        contentPane.add(lineWidthPane, BorderLayout.SOUTH);
 
-        return panel;
+        return contentPane;
     }
 
     protected void createLineStyle() {
@@ -85,20 +111,16 @@ public class VanChartLineTypePane extends BasicPane {
         lineStyle = new UIButtonGroup<LineStyle>(textArray, LineStyle.values());
     }
 
-    protected Component[][] createContentComponent(Component[] lineTypeComponent, Component[] lineWidthComponent,
-                                                   Component[] lineStyleComponent, Component[] nullValueBreakComponent) {
+    protected Component[][] createContentComponent(Component[] lineStyleComponent, Component[] nullValueBreakComponent) {
         return new Component[][]{
-                new Component[]{null,null},
-                lineTypeComponent,
-                lineWidthComponent,
                 lineStyleComponent,
                 nullValueBreakComponent
         };
     }
 
     private void checkLineWidth() {
-        if (lineWidthSpinner != null && lineTypeComboBox != null) {
-            lineWidthSpinner.setVisible(!ComparatorUtils.equals(lineTypeComboBox.getSelectedItem(), LineType.NONE));
+        if (lineWidthPane != null && lineTypeComboBox != null) {
+            lineWidthPane.setVisible(!ComparatorUtils.equals(lineTypeComboBox.getSelectedItem(), LineType.NONE));
         }
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java

@@ -9,10 +9,8 @@ public class VanChartLineWidthPane extends VanChartLineTypePane {
     private static final long serialVersionUID = 4537158946119294689L;
 
     @Override
-    protected Component[][] createContentComponent(Component[] lineTypeComponent, Component[] lineWidthComponent, Component[] lineStyleComponent, Component[] nullValueBreakComponent) {
+    protected Component[][] createContentComponent(Component[] lineStyleComponent, Component[] nullValueBreakComponent) {
         return new Component[][]{
-                lineTypeComponent,
-                lineWidthComponent,
                 nullValueBreakComponent
         };
     }

designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

@@ -2,18 +2,30 @@ package com.fr.van.chart.designer.other;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartglyph.ConditionAttr;
+import com.fr.chart.chartglyph.ConditionCollection;
+import com.fr.chartx.attr.LargeDataAttribute;
+import com.fr.chartx.attr.LargeDataModeType;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
 import com.fr.plugin.chart.axis.type.AxisPlotType;
+import com.fr.plugin.chart.base.AttrEffect;
+import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.RefreshMoreLabel;
+import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.base.VanChartTools;
+import com.fr.plugin.chart.map.line.condition.AttrLineEffect;
+import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel;
 import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.custom.component.VanChartHyperLinkPane;
 import com.fr.van.chart.designer.AbstractVanChartScrollPane;
@@ -22,7 +34,10 @@ import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.other.zoom.ZoomPane;
 
 import javax.swing.JPanel;
+import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
@@ -34,6 +49,10 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     protected UICheckBox fullScreenDisplay;
     protected UIToggleButton collapse;
 
+    protected VanChart chart;
+    private UIComboBox largeDataMode;
+    private UISpinner largeModeThresholdNumber;
+
     protected UIButtonGroup isChartAnimation;
 
     //坐标轴翻转属性
@@ -44,12 +63,12 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     private ZoomPane zoomPane;
 
     protected VanChartHyperLinkPane superLink;
-
-    protected Chart chart;
+    private JPanel largeModeThresholdNumberPane;
     protected JPanel interactivePane;
 
     /**
      * 界面标题.
+     *
      * @return 返回标题.
      */
 
@@ -81,6 +100,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
         Component[][] components = new Component[][]{
                 new Component[]{createToolBarPane(getToolBarRowSize(), columnSize), null},
+                new Component[]{createLargeDataModePane(), null},
                 new Component[]{createAnimationPane(), null},
                 new Component[]{createAxisRotationPane(new double[]{p, p}, columnSize, plot), null},
                 new Component[]{createZoomPane(new double[]{p, p, p}, columnSize, plot), null},
@@ -91,6 +111,43 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
+    private JPanel createLargeDataModePane() {
+        if (!isCurrentChartSupportLargeDataMode()) {
+            return null;
+        }
+        largeDataMode = new UIComboBox(new LargeDataModeType[]{LargeDataModeType.CLOSE, LargeDataModeType.OPEN_BEYOND_THRESHOLD});
+        largeModeThresholdNumber = new UISpinner(0, Integer.MAX_VALUE, 100, chart.getPlot().getLargeDataAttribute().getLargeModeThresholdNumber());
+
+        largeDataMode.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkLargeDataMode();
+            }
+        });
+
+        Component[][] comps1 = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Large_Model")), largeDataMode}
+        };
+        Component[][] comps2 = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Threshold_Number")), largeModeThresholdNumber}
+        };
+
+        double[] row = {TableLayout.PREFERRED}, col = {TableLayout.FILL, TableLayout4VanChartHelper.EDIT_AREA_WIDTH};
+
+
+        JPanel contentPane = new JPanel(new BorderLayout(0, 6));
+
+        contentPane.add(TableLayout4VanChartHelper.createGapTableLayoutPane(comps1, row, col), BorderLayout.CENTER);
+        largeModeThresholdNumberPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps2, row, col);
+        contentPane.add(largeModeThresholdNumberPane, BorderLayout.SOUTH);
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Large_Data"), contentPane);
+    }
+
+    protected boolean isCurrentChartSupportLargeDataMode() {
+        return false;
+    }
+
     protected JPanel createZoomPane(double[] row, double[] col, VanChartPlot plot) {
         zoomPane = createZoomPane();
         if (zoomPane == null) {
@@ -169,7 +226,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
     protected AutoRefreshPane getMoreLabelPane(VanChartPlot plot) {
         boolean isLargeModel = largeModel(plot);
-        return new AutoRefreshPane((VanChart) chart, isLargeModel);
+        return new AutoRefreshPane(chart, isLargeModel);
     }
 
     protected JPanel createHyperlinkPane() {
@@ -177,13 +234,50 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), superLink);
     }
 
+    private void checkLargeDataMode() {
+        largeModeThresholdNumberPane.setVisible(largeDataMode.getSelectedItem() == LargeDataModeType.OPEN_BEYOND_THRESHOLD);
+
+        resetAttr();
+    }
+
+    private void resetAttr() {
+        if (largeDataMode.getSelectedItem() == LargeDataModeType.OPEN_BEYOND_THRESHOLD) {
+            VanChartPlot plot = this.chart.getPlot();
+
+            AttrLabel attrLabel = plot.getAttrLabelFromConditionCollection();
+            if (attrLabel == null) {
+                attrLabel = plot.getDefaultAttrLabel();
+                ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr();
+                defaultAttr.addDataSeriesCondition(attrLabel);
+            }
+            attrLabel.setEnable(false);
+
+            resetCustomCondition(plot.getConditionCollection());
+        }
+    }
+
+
+    private void resetCustomCondition(ConditionCollection conditionCollection) {
+        for (int i = 0, len = conditionCollection.getConditionAttrSize(); i < len; i++) {
+            ConditionAttr conditionAttr = conditionCollection.getConditionAttr(i);
+            conditionAttr.remove(AttrLabel.class);
+            conditionAttr.remove(ScatterAttrLabel.class);
+            conditionAttr.remove(AttrEffect.class);
+            conditionAttr.remove(AttrLineEffect.class);
+
+            VanChartAttrMarker attrMarker = conditionAttr.getExisted(VanChartAttrMarker.class);
+            if (attrMarker != null && !attrMarker.isCommon()) {
+                conditionAttr.remove(VanChartAttrMarker.class);
+            }
+        }
+    }
 
     @Override
     public void populateBean(Chart chart) {
         if (chart == null || chart.getPlot() == null) {
             return;
         }
-        this.chart = chart;
+        this.chart = (VanChart) chart;
         VanChartPlot plot = chart.getPlot();
 
         if (interactivePane == null) {
@@ -192,16 +286,17 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         }
 
         if (zoomPane != null) {
-            zoomPane.populateBean(((VanChart) chart).getZoomAttribute());
+            zoomPane.populateBean(this.chart.getZoomAttribute());
         }
 
         if (plot.getAxisPlotType() == AxisPlotType.RECTANGLE) {
             populateChartAxisRotation(plot);
         }
 
-        populateChartTools((VanChart) chart);
-        populateChartAnimate(chart, plot);
-        populateAutoRefresh((VanChart)chart);
+        populateChartTools(this.chart);
+        populateLargeMode(plot);
+        populateChartAnimate(this.chart, plot);
+        populateAutoRefresh(this.chart);
 
         populateHyperlink(plot);
     }
@@ -219,6 +314,15 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         collapse.setSelected(vanChartTools.isHidden());
     }
 
+    private void populateLargeMode(Plot plot) {
+        if (largeDataMode != null) {
+            LargeDataAttribute attribute = plot.getLargeDataAttribute();
+
+            largeDataMode.setSelectedItem(attribute.getLargeDataModeType());
+            largeModeThresholdNumber.setValue(attribute.getLargeModeThresholdNumber());
+        }
+    }
+
     private void populateChartAxisRotation(VanChartPlot plot) {
         axisRotation.setSelectedIndex(plot.isAxisRotation() ? 0 : 1);
     }
@@ -235,7 +339,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected void populateAutoRefresh(VanChart chart) {
-        VanChartPlot plot = (VanChartPlot)chart.getPlot();
+        VanChartPlot plot = chart.getPlot();
 
         RefreshMoreLabel refreshMoreLabel = chart.getRefreshMoreLabel();
         if (refreshMoreLabel == null) {
@@ -252,18 +356,20 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             return;
         }
 
+        VanChart vanChart = (VanChart) chart;
         VanChartPlot plot = chart.getPlot();
 
         if (zoomPane != null) {
-            ((VanChart) chart).setZoomAttribute(zoomPane.updateBean());
+            vanChart.setZoomAttribute(zoomPane.updateBean());
         }
 
         if (plot.getAxisPlotType() == AxisPlotType.RECTANGLE) {
-            updateChartAxisRotation((VanChart)chart);
+            updateChartAxisRotation(vanChart);
         }
-        updateChartTools((VanChart)chart);
-        updateChartAnimate(chart, plot);
-        updateAutoRefresh((VanChart)chart);
+        updateChartTools(vanChart);
+        updateChartAnimate(vanChart, plot);
+        updateLargeData(plot);
+        updateAutoRefresh(vanChart);
         updateHyperlink(plot);
     }
 
@@ -282,7 +388,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
     private void updateChartAxisRotation(VanChart chart) {
         //坐标轴和plot都需要这个属性，因为坐标轴和plot是分开画的
-        VanChartPlot plot = (VanChartPlot) chart.getPlot();
+        VanChartPlot plot = chart.getPlot();
         plot.setAxisRotation(axisRotation.getSelectedIndex() == 0);
         //同时更新坐标轴旋转属性
         for (VanChartAxis axis : ((VanChartRectanglePlot) plot).getXAxisList()) {
@@ -299,6 +405,15 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         }
     }
 
+    private void updateLargeData(Plot plot) {
+        if (largeDataMode != null) {
+            LargeDataAttribute attribute = new LargeDataAttribute();
+            attribute.setLargeDataModeType((LargeDataModeType) largeDataMode.getSelectedItem());
+            attribute.setLargeModeThresholdNumber(largeModeThresholdNumber.getValue());
+            plot.setLargeDataAttribute(attribute);
+        }
+    }
+
     private void updateChartAnimate(Chart chart, Plot plot) {
         if (plot.isSupportAnimate()) {
             chart.setJSDraw(isChartAnimation.getSelectedIndex() == 0);
@@ -317,7 +432,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     @Override
-    public Chart updateBean() {
+    public VanChart updateBean() {
         return null;
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -1,8 +1,5 @@
 package com.fr.van.chart.designer.style.series;
 
-import com.fr.base.chart.chartdata.model.DataProcessor;
-import com.fr.base.chart.chartdata.model.LargeDataModel;
-import com.fr.base.chart.chartdata.model.NormalDataModel;
 import com.fr.chart.base.AttrAlpha;
 import com.fr.chart.base.AttrBorder;
 import com.fr.chart.base.ChartConstants;
@@ -10,11 +7,9 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.design.gui.frpane.UINumberDragPane;
-import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane;
 import com.fr.design.mainframe.chart.gui.style.series.AbstractPlotSeriesPane;
-
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
@@ -28,6 +23,7 @@ import com.fr.plugin.chart.base.VanChartAttrTrendLine;
 import com.fr.plugin.chart.map.line.condition.AttrLineEffect;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel;
 import com.fr.van.chart.custom.style.VanChartCustomStylePane;
+import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.VanChartAreaSeriesFillColorPane;
 import com.fr.van.chart.designer.component.VanChartBeautyPane;
@@ -41,8 +37,6 @@ import com.fr.van.chart.pie.RadiusCardLayoutPane;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 
 /**
@@ -73,8 +67,6 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     private RadiusCardLayoutPane radiusPane;//半径设置界面
     private JPanel radiusPaneWithTitle;
 
-    private UIButtonGroup<DataProcessor> largeDataModelGroup;//大数据模式
-
     protected JPanel contentPane;
 
     public VanChartAbstractPlotSeriesPane(ChartStylePane parent, Plot plot) {
@@ -168,77 +160,23 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
         return ((VanChartPlot) plot).isInCustom() ? null : radiusPaneWithTitle;
     }
 
-    protected JPanel createLargeDataModelPane() {
-        largeDataModelGroup = createLargeDataModelGroup();
-        largeDataModelGroup.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                checkLarge();
-            }
-        });
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Model"), largeDataModelGroup);
-        return createLargeDataModelPane(panel);
-    }
-
-    protected void checkLarge() {
-        if(largeModel()) {
-            AttrLabel attrLabel = ((VanChartPlot) plot).getAttrLabelFromConditionCollection();
-            if (attrLabel == null) {
-                attrLabel = ((VanChartPlot) this.plot).getDefaultAttrLabel();
-                ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr();
-                defaultAttr.addDataSeriesCondition(attrLabel);
-            }
-            attrLabel.setEnable(false);
-
-            resetCustomCondition(plot.getConditionCollection());
-        }
-
-
-        checkCompsEnabledWithLarge();
-    }
-
-    protected void checkCompsEnabledWithLarge() {
-        if(markerPane != null && largeDataModelGroup != null){
-            markerPane.checkLargePlot(largeModel());
+    protected void checkCompsEnabledWithLarge(Plot plot) {
+        if (markerPane != null) {
+            markerPane.checkLargePlot(largeModel(plot));
         }
     }
 
     protected void checkLinePane() {
-        if(lineTypePane != null && largeDataModelGroup != null){
-            lineTypePane.checkLarge(largeModel());
-        }
+        if (lineTypePane != null) {
+            lineTypePane.checkLarge(largeModel(plot));
         }
-
-
-    protected boolean largeModel() {
-        return largeDataModelGroup != null && largeDataModelGroup.getSelectedIndex() == 0;
     }
 
-    protected void resetCustomCondition(ConditionCollection conditionCollection) {
-        for(int i = 0, len = conditionCollection.getConditionAttrSize(); i < len; i++){
-            ConditionAttr conditionAttr = conditionCollection.getConditionAttr(i);
-            conditionAttr.remove(AttrLabel.class);
-            conditionAttr.remove(ScatterAttrLabel.class);
-            conditionAttr.remove(AttrEffect.class);
-            conditionAttr.remove(AttrLineEffect.class);
-
-            VanChartAttrMarker attrMarker = conditionAttr.getExisted(VanChartAttrMarker.class);
-            if(attrMarker != null && !attrMarker.isCommon()){
-                conditionAttr.remove(VanChartAttrMarker.class);
-            }
-        }
-    }
 
-    protected JPanel createLargeDataModelPane(JPanel jPanel) {
-        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Data"), jPanel);
-        return panel;
+    protected boolean largeModel(Plot plot) {
+        return PlotFactory.largeDataModel(plot);
     }
 
-    protected UIButtonGroup<DataProcessor> createLargeDataModelGroup() {
-        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")};
-        DataProcessor[] values = new DataProcessor[]{new LargeDataModel(), new NormalDataModel()};
-        return new UIButtonGroup<DataProcessor>(strings, values);
-    }
 
     protected RadiusCardLayoutPane initRadiusPane() {
         return new RadiusCardLayoutPane();
@@ -284,10 +222,6 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
             stylePane.populateBean(plot.getPlotStyle());
         }
 
-        if(largeDataModelGroup != null){
-            largeDataModelGroup.setSelectedItem(plot.getDataProcessor());
-        }
-
         if (stackAndAxisEditPane != null && plot instanceof VanChartRectanglePlot) {//堆积和坐标轴
             VanChartRectanglePlot rectanglePlot = (VanChartRectanglePlot) plot;
             if (rectanglePlot.isCustomChart()) {
@@ -306,11 +240,12 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
         checkAreaSeriesFillColorPane(plot.getPlotStyle());
 
-        checkCompsEnabledWithLarge();
+        checkCompsEnabledWithLarge(plot);
     }
 
     /**
      * radius界面是否显示
+     *
      * @param plot
      */
     private void checkRadiusPane(Plot plot) {
@@ -339,10 +274,6 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
             plot.setPlotStyle(stylePane.updateBean());
         }
 
-        if(largeDataModelGroup != null){
-            plot.setDataProcessor(largeDataModelGroup.getSelectedItem());
-        }
-
         if (stackAndAxisEditPane != null && plot instanceof VanChartRectanglePlot) {//堆积和坐标轴
             VanChartRectanglePlot rectanglePlot = (VanChartRectanglePlot) plot;
             if (rectanglePlot.isCustomChart()) {
@@ -373,23 +304,23 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
     protected void populateCondition(ConditionAttr defaultAttr) {
         if (trendLinePane != null) {//趋势线
-            VanChartAttrTrendLine attrTrendLine =(VanChartAttrTrendLine)defaultAttr.getExisted(VanChartAttrTrendLine.class);
+            VanChartAttrTrendLine attrTrendLine = defaultAttr.getExisted(VanChartAttrTrendLine.class);
             trendLinePane.populate(attrTrendLine);
         }
         if (lineTypePane != null) {//线-线型、控制断开等
-            VanChartAttrLine attrLine = (VanChartAttrLine)defaultAttr.getExisted(VanChartAttrLine.class);
+            VanChartAttrLine attrLine = defaultAttr.getExisted(VanChartAttrLine.class);
             lineTypePane.populate(attrLine);
         }
         if (markerPane != null) {//标记点
-            VanChartAttrMarker attrMarker = (VanChartAttrMarker)defaultAttr.getExisted(VanChartAttrMarker.class);
+            VanChartAttrMarker attrMarker = defaultAttr.getExisted(VanChartAttrMarker.class);
             markerPane.populate(attrMarker);
         }
         if (areaSeriesFillColorPane != null) {//填充颜色
-            AttrAreaSeriesFillColorBackground seriesFillColorBackground = (AttrAreaSeriesFillColorBackground)defaultAttr.getExisted(AttrAreaSeriesFillColorBackground.class);
+            AttrAreaSeriesFillColorBackground seriesFillColorBackground = defaultAttr.getExisted(AttrAreaSeriesFillColorBackground.class);
             areaSeriesFillColorPane.populate(seriesFillColorBackground);
         }
         if (borderPane != null) {//边框
-            AttrBorder attrBorder = (AttrBorder)defaultAttr.getExisted(AttrBorder.class);
+            AttrBorder attrBorder = defaultAttr.getExisted(AttrBorder.class);
             if (attrBorder != null) {
                 borderPane.populate(attrBorder);
             }
@@ -399,7 +330,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
     protected void populateAlpha(ConditionAttr defaultAttr) {
         if (transparent != null) {//不透明度
-            AttrAlpha attrAlpha = (AttrAlpha)defaultAttr.getExisted(AttrAlpha.class);
+            AttrAlpha attrAlpha = defaultAttr.getExisted(AttrAlpha.class);
             if (attrAlpha != null) {
                 transparent.populateBean(attrAlpha.getAlpha() * VanChartAttrHelper.PERCENT);
             } else {
@@ -412,18 +343,18 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     protected void updateCondition(ConditionAttr defaultAttr) {
         if (trendLinePane != null) {
             VanChartAttrTrendLine newTrendLine = trendLinePane.update();
-            VanChartAttrTrendLine attrTrendLine =(VanChartAttrTrendLine)defaultAttr.getExisted(VanChartAttrTrendLine.class);
+            VanChartAttrTrendLine attrTrendLine = defaultAttr.getExisted(VanChartAttrTrendLine.class);
             defaultAttr.remove(attrTrendLine);
             defaultAttr.addDataSeriesCondition(newTrendLine);
         }
         if (lineTypePane != null) {
-            VanChartAttrLine attrLine = (VanChartAttrLine)defaultAttr.getExisted(VanChartAttrLine.class);
+            VanChartAttrLine attrLine = defaultAttr.getExisted(VanChartAttrLine.class);
             defaultAttr.remove(attrLine);
             defaultAttr.addDataSeriesCondition(lineTypePane.update());
         }
         if (markerPane != null) {
             VanChartAttrMarker newMarker = markerPane.update();
-            VanChartAttrMarker attrMarker = (VanChartAttrMarker)defaultAttr.getExisted(VanChartAttrMarker.class);
+            VanChartAttrMarker attrMarker = defaultAttr.getExisted(VanChartAttrMarker.class);
             defaultAttr.remove(attrMarker);
             defaultAttr.addDataSeriesCondition(newMarker);
         }
@@ -436,7 +367,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
             defaultAttr.addDataSeriesCondition(newFillColorBackground);
         }
         if (borderPane != null) {
-            AttrBorder attrBorder = (AttrBorder)defaultAttr.getExisted(AttrBorder.class);
+            AttrBorder attrBorder = defaultAttr.getExisted(AttrBorder.class);
             if (attrBorder == null) {
                 attrBorder = new AttrBorder();
                 defaultAttr.addDataSeriesCondition(attrBorder);
@@ -448,7 +379,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
 
     protected void updateAlpha(ConditionAttr defaultAttr) {
         if (transparent != null) {
-            AttrAlpha attrAlpha = (AttrAlpha)defaultAttr.getExisted(AttrAlpha.class);
+            AttrAlpha attrAlpha = defaultAttr.getExisted(AttrAlpha.class);
             if (attrAlpha == null) {
                 attrAlpha = new AttrAlpha();
                 defaultAttr.addDataSeriesCondition(attrAlpha);

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java

@@ -6,9 +6,9 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
-
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
+import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.background.VanChartBackgroundPaneWithOutImageAndShadow;
 import com.fr.van.chart.designer.other.VanChartInteractivePaneWithMapZoom;
@@ -123,8 +123,8 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
         if (chart == null || chart.getPlot() == null) {
             return;
         }
-        this.chart = chart;
-        VanChartPlot plot = (VanChartPlot)chart.getPlot();
+        this.chart = (VanChart) chart;
+        VanChartPlot plot = chart.getPlot();
         if (plot instanceof VanChartDrillMapPlot) {
             DrillMapTools drillMapTools = ((VanChartDrillMapPlot) plot).getDrillMapTools();
             openOrClose.setSelectedIndex(drillMapTools.isEnable() ? 0 : 1);
@@ -145,7 +145,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
             return;
         }
 
-        VanChartPlot plot = (VanChartPlot) chart.getPlot();
+        VanChartPlot plot = chart.getPlot();
 
         if (plot instanceof VanChartDrillMapPlot) {
             DrillMapTools drillMapTools = ((VanChartDrillMapPlot) plot).getDrillMapTools();

designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java

@@ -64,13 +64,19 @@ public class HeatMapIndependentVanChartInterface extends MapIndependentVanChartI
 
     /**
      * 图表的属性界面数组
+     *
      * @return 属性界面
      */
     public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) {
         VanChartStylePane stylePane = new VanChartMapStylePane(listener);
         VanChartOtherPane otherPane = new VanChartOtherPane() {
             protected BasicBeanPane<Chart> createInteractivePane() {
-                return new VanChartInteractivePaneWithMapZoom();
+                return new VanChartInteractivePaneWithMapZoom() {
+                    @Override
+                    protected boolean isCurrentChartSupportLargeDataMode() {
+                        return true;
+                    }
+                };
             }
         };
         return new AbstractChartAttrPane[]{stylePane, otherPane};

designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineSeriesPane.java

@@ -29,7 +29,6 @@ public class VanChartLineSeriesPane extends VanChartAbstractPlotSeriesPane{
                 new Component[]{createLineTypePane()},
                 new Component[]{createMarkerPane()},
                 new Component[]{createStackedAndAxisPane()},
-                new Component[]{createLargeDataModelPane()},
                 new Component[]{createTrendLinePane()},
         };
 

designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java

@@ -1,6 +1,5 @@
 package com.fr.van.chart.map;
 
-import com.fr.base.chart.chartdata.model.DataProcessor;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.design.gui.frpane.UINumberDragPane;
@@ -12,7 +11,6 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.base.AttrBorderWithAlpha;
 import com.fr.plugin.chart.base.AttrEffect;
@@ -21,7 +19,6 @@ import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
 import com.fr.plugin.chart.map.VanChartMapPlot;
-import com.fr.plugin.chart.map.attr.AttrMapLabel;
 import com.fr.plugin.chart.map.line.condition.AttrCurve;
 import com.fr.plugin.chart.map.line.condition.AttrLineEffect;
 import com.fr.plugin.chart.type.MapMarkerType;
@@ -79,7 +76,6 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
     //line
     private VanChartCurvePane curvePane;
     private VanChartLineMapEffectPane lineMapEffectPane;
-    private UIButtonGroup<DataProcessor> lineMapLargeDataModelGroup;//大数据模式
 
     private MapType mapType = MapType.AREA;
 
@@ -87,53 +83,20 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
         super(parent, plot);
     }
 
-    @Override
-    protected void checkLarge() {
-        if(largeModel()) {
-            if(plot instanceof VanChartMapPlot) {
-                ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr();
-                AttrMapLabel attrMapLabel =  defaultAttr.getExisted(AttrMapLabel.class);
-                if(attrMapLabel == null){
-                    attrMapLabel = new AttrMapLabel();
-                    defaultAttr.addDataSeriesCondition(attrMapLabel);
-                }
-                attrMapLabel.getPointLabel().setEnable(false);
-
-                resetCustomCondition(((VanChartMapPlot) plot).getPointConditionCollection());
-            }
-        }
-
-        checkPointCompsEnabledWithLarge();
-    }
-
-    protected void checkCompsEnabledWithLarge() {
-        checkPointCompsEnabledWithLarge();
-        checkLineCompsEnabledWithLarge();
+    protected void checkCompsEnabledWithLarge(Plot plot) {
+        checkPointCompsEnabledWithLarge(plot);
+        checkLineCompsEnabledWithLarge(plot);
     }
 
-    private void checkPointCompsEnabledWithLarge() {
+    private void checkPointCompsEnabledWithLarge(Plot plot) {
         if (pointEffectPane != null) {
-            GUICoreUtils.setEnabled(pointEffectPane, !largeModel());
-        }
-    }
-
-    private boolean lineMapLargeModel() {
-        return lineMapLargeDataModelGroup != null && lineMapLargeDataModelGroup.getSelectedIndex() == 0;
+            GUICoreUtils.setEnabled(pointEffectPane, !largeModel(plot));
         }
-
-    private void checkLineMapLarge() {
-        if(lineMapLargeModel()) {
-            if(plot instanceof VanChartMapPlot) {
-                resetCustomCondition(((VanChartMapPlot) plot).getLineConditionCollection());
-            }
-        }
-
-        checkLineCompsEnabledWithLarge();
     }
 
-    private void checkLineCompsEnabledWithLarge() {
+    private void checkLineCompsEnabledWithLarge(Plot plot) {
         if (lineMapEffectPane != null) {
-            GUICoreUtils.setEnabled(lineMapEffectPane, !lineMapLargeModel());
+            GUICoreUtils.setEnabled(lineMapEffectPane, !largeModel(plot));
         }
     }
 
@@ -195,7 +158,6 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
         Component[][] components = new Component[][]{
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), createPointAlphaPane())},
                 new Component[]{createMarkerComPane()},
-                new Component[]{createLargeDataModelPane()},
                 new Component[]{createPointEffectPane()},
         };
 
@@ -212,25 +174,12 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
 
         Component[][] components = new Component[][]{
                 new Component[]{createCurvePane()},
-                new Component[]{createLineMapLargeDataModelPane()},
                 new Component[]{createAnimationPane()}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, row, col);
     }
 
-    private JPanel createLineMapLargeDataModelPane() {
-        lineMapLargeDataModelGroup = createLargeDataModelGroup();
-        lineMapLargeDataModelGroup.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                checkLineMapLarge();
-            }
-        });
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Model"), lineMapLargeDataModelGroup);
-        return createLargeDataModelPane(panel);
-    }
-
     private Component createCurvePane() {
         curvePane = new VanChartCurvePane();
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve"), curvePane);
@@ -382,9 +331,6 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             if (nullValueColorBox != null) {
                 nullValueColorBox.setSelectObject(((VanChartMapPlot) plot).getNullValueColor());
             }
-            if(lineMapLargeDataModelGroup != null){
-                lineMapLargeDataModelGroup.setSelectedItem(((VanChartMapPlot) plot).getLineMapDataProcessor());
-            }
         }
         super.populateBean(plot);
     }
@@ -397,9 +343,6 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             if (nullValueColorBox != null) {
                 ((VanChartMapPlot) plot).setNullValueColor(nullValueColorBox.getSelectObject());
             }
-            if(lineMapLargeDataModelGroup != null){
-                ((VanChartMapPlot) plot).setLineMapDataProcessor(lineMapLargeDataModelGroup.getSelectedItem());
-            }
         }
         super.updateBean(plot);
     }
@@ -427,7 +370,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
     protected void populateArea(ConditionAttr defaultAttr) {
         populateAlpha(defaultAttr);
         if (borderWithAlphaPane != null) {
-            AttrBorderWithAlpha attrBorderWithAlpha = (AttrBorderWithAlpha) defaultAttr.getExisted(AttrBorderWithAlpha.class);
+            AttrBorderWithAlpha attrBorderWithAlpha = defaultAttr.getExisted(AttrBorderWithAlpha.class);
             borderWithAlphaPane.populate(attrBorderWithAlpha);
         }
     }
@@ -435,7 +378,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     private void populatePoint(ConditionAttr defaultAttr) {
         if (pointAlphaPane != null) {
-            AttrMarkerAlpha attrAlpha = (AttrMarkerAlpha)defaultAttr.getExisted(AttrMarkerAlpha.class);
+            AttrMarkerAlpha attrAlpha = defaultAttr.getExisted(AttrMarkerAlpha.class);
             double alpha = VanChartAttrHelper.PERCENT * (attrAlpha == null ? 1 : attrAlpha.getAlpha());
             pointAlphaPane.populateBean(alpha);
         }
@@ -449,7 +392,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             pointEffectPane.populateBean(attrEffect);
         }
 
-        VanChartAttrMarker attrMarker = (VanChartAttrMarker) defaultAttr.getExisted(VanChartAttrMarker.class);
+        VanChartAttrMarker attrMarker = defaultAttr.getExisted(VanChartAttrMarker.class);
         if (commonMarkerPane != null) {
             commonMarkerPane.populateBean(attrMarker);
         }
@@ -457,7 +400,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             imageMarkerPane.populateBean(attrMarker);
         }
         if (bubblePane != null) {
-            VanChartAttrBubble attrBubble = (VanChartAttrBubble) defaultAttr.getExisted(VanChartAttrBubble.class);
+            VanChartAttrBubble attrBubble = defaultAttr.getExisted(VanChartAttrBubble.class);
             bubblePane.populateBean(attrBubble);
         }
     }
@@ -467,7 +410,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             if (defaultAttr.getExisted(AttrCurve.class) == null) {
                 defaultAttr.addDataSeriesCondition(new AttrCurve());
             }
-            curvePane.populateBean((AttrCurve) defaultAttr.getExisted(AttrCurve.class));
+            curvePane.populateBean(defaultAttr.getExisted(AttrCurve.class));
         }
         if (lineMapEffectPane != null) {
             if (defaultAttr.getExisted(AttrLineEffect.class) == null) {
@@ -505,7 +448,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
     protected void updateArea(ConditionAttr defaultAttr) {
         updateAlpha(defaultAttr);
         if (borderWithAlphaPane != null) {
-            AttrBorderWithAlpha attrBorderWithAlpha = (AttrBorderWithAlpha) defaultAttr.getExisted(AttrBorderWithAlpha.class);
+            AttrBorderWithAlpha attrBorderWithAlpha = defaultAttr.getExisted(AttrBorderWithAlpha.class);
             defaultAttr.remove(attrBorderWithAlpha);
             defaultAttr.addDataSeriesCondition(borderWithAlphaPane.update());
         }
@@ -513,7 +456,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     private void updatePoint(ConditionAttr defaultAttr) {
         if (pointAlphaPane != null) {
-            AttrMarkerAlpha attrAlpha = (AttrMarkerAlpha)defaultAttr.getExisted(AttrMarkerAlpha.class);
+            AttrMarkerAlpha attrAlpha = defaultAttr.getExisted(AttrMarkerAlpha.class);
             if (attrAlpha == null) {
                 attrAlpha = new AttrMarkerAlpha();
                 defaultAttr.addDataSeriesCondition(attrAlpha);
@@ -527,9 +470,9 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             defaultAttr.addDataSeriesCondition(pointEffectPane.updateBean());
         }
 
-        VanChartAttrMarker attrMarker = (VanChartAttrMarker) defaultAttr.getExisted(VanChartAttrMarker.class);
+        VanChartAttrMarker attrMarker = defaultAttr.getExisted(VanChartAttrMarker.class);
         defaultAttr.remove(attrMarker);
-        VanChartAttrBubble attrBubble = (VanChartAttrBubble) defaultAttr.getExisted(VanChartAttrBubble.class);
+        VanChartAttrBubble attrBubble = defaultAttr.getExisted(VanChartAttrBubble.class);
         defaultAttr.remove(attrBubble);
         if (markerTypeCom != null) {
             if (markerTypeCom.getSelectedIndex() == 1) {

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java

@@ -1,12 +1,9 @@
 package com.fr.van.chart.map.designer.other;
 
 import com.fr.chart.chartattr.Plot;
-
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.map.VanChartMapPlot;
 import com.fr.plugin.chart.type.MapType;
-import com.fr.plugin.chart.vanchart.VanChart;
-import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.other.AutoRefreshPane;
 import com.fr.van.chart.designer.other.AutoRefreshPaneWithoutTooltip;
@@ -20,11 +17,13 @@ import javax.swing.JPanel;
 public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZoom {
     private static final int HYPERLINK_LEFT_GAP = 36;
     private VanChartMapHyperLinkPane hyperlinkPane;
+
     @Override
     protected JPanel createHyperlinkPane() {
         hyperlinkPane = new VanChartMapHyperLinkPane();
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperlinkPane);
     }
+
     @Override
     protected void populateHyperlink(Plot plot) {
         hyperlinkPane.populateBean(plot);
@@ -36,26 +35,22 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo
     }
 
     @Override
-    protected boolean largeModel(Plot plot) {
-        if(plot instanceof VanChartMapPlot){
-            VanChartMapPlot mapPlot = (VanChartMapPlot)plot;
-            switch (mapPlot.getMapType()){
-                case LINE:
-                    return PlotFactory.lineMapLargeModel(mapPlot);
-                default:
-                    return PlotFactory.largeDataModel(mapPlot);
-            }
-        }
+    protected boolean isCurrentChartSupportLargeDataMode() {
+        if (this.chart == null || this.chart.getPlot() == null) {
             return false;
         }
+        VanChartMapPlot mapPlot = this.chart.getPlot();
+
+        return mapPlot.getMapType() == MapType.POINT || mapPlot.getMapType() == MapType.LINE;
+    }
 
     protected AutoRefreshPane getMoreLabelPane(VanChartPlot plot) {
         boolean isLargeModel = largeModel(plot);
         VanChartMapPlot mapPlot = (VanChartMapPlot) plot;
         if (mapPlot.getMapType().equals(MapType.LINE)) {
-            return new AutoRefreshPaneWithoutTooltip((VanChart) chart, isLargeModel);
+            return new AutoRefreshPaneWithoutTooltip(chart, isLargeModel);
         }
-        return new AutoRefreshPane((VanChart) chart, isLargeModel);
+        return new AutoRefreshPane(chart, isLargeModel);
     }
 
 }

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/pane/VanChartLineMapConditionPane.java

@@ -46,7 +46,7 @@ public class VanChartLineMapConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(AttrCurve.class, new VanChartCurveConditionPane(this));
         classPaneMap.put(AttrTooltip.class, new VanChartLineMapTooltipConditionPane(this, plot));
-        if(!PlotFactory.lineMapLargeModel(plot)){
+        if (!PlotFactory.largeDataModel(plot)) {
             classPaneMap.put(AttrLineEffect.class, new VanChartLineEffectConditionPane(this, EffectHelper.getLineMapDefaultLineEffect()));
         }
     }
@@ -56,6 +56,7 @@ public class VanChartLineMapConditionPane extends DataSeriesConditionPane {
 
     /**
      * 返回图表class对象
+     *
      * @return class对象
      */
     public Class<? extends Plot> class4Correspond() {

designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java

@@ -57,6 +57,7 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/scatter.png";
     }
+
     @Override
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
         return new VanChartScatterSeriesPane(parent, plot);
@@ -87,6 +88,11 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
                     protected ZoomPane createZoomPane() {
                         return new ZoomPane();
                     }
+
+                    @Override
+                    protected boolean isCurrentChartSupportLargeDataMode() {
+                        return true;
+                    }
                 };
             }
 

designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterSeriesPane.java

@@ -5,7 +5,6 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
-
 import com.fr.van.chart.custom.component.VanChartCustomAxisConditionPane;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.VanChartLineTypePane;
@@ -40,7 +39,6 @@ public class VanChartScatterSeriesPane extends VanChartAbstractPlotSeriesPane{
                 new Component[]{createLineTypePane()},
                 new Component[]{createMarkerPane()},
                 new Component[]{createStackedAndAxisPane()},
-                new Component[]{createLargeDataModelPane()},
                 new Component[]{createTrendLinePane()},
         };
 
@@ -77,8 +75,8 @@ public class VanChartScatterSeriesPane extends VanChartAbstractPlotSeriesPane{
     }
 
     @Override
-    protected void checkCompsEnabledWithLarge() {
-        super.checkCompsEnabledWithLarge();
+    protected void checkCompsEnabledWithLarge(Plot plot) {
+        super.checkCompsEnabledWithLarge(this.plot);
 
         checkLinePane();
     }

designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java

@@ -21,11 +21,8 @@ public class VanChartScatterLineTypePane extends VanChartLineTypePane {
     }
 
     @Override
-    protected Component[][] createContentComponent(Component[] lineTypeComponent, Component[] lineWidthComponent, Component[] lineStyleComponent, Component[] nullValueBreakComponent) {
+    protected Component[][] createContentComponent(Component[] lineStyleComponent, Component[] nullValueBreakComponent) {
         return new Component[][]{
-                new Component[]{null, null},
-                lineTypeComponent,
-                lineWidthComponent,
                 lineStyleComponent
         };
     }

designer-chart/src/main/java/com/fr/van/chart/vanchart/AbstractMultiCategoryVanChartUI.java

@@ -27,7 +27,8 @@ public abstract class AbstractMultiCategoryVanChartUI extends  AbstractIndepende
         if (((VanChartPlot) plot).isInCustom() && ((VanChartPlot) plot).getCustomType().equals("CUSTOM")) {
             return new CategoryPlotTableDataContentPane(parent);
         }
-        return new VanChartMoreCateTableDataContentPane(parent);    }
+        return new VanChartMoreCateTableDataContentPane(parent);
+    }
 
     public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
         //自定义组合图特殊处理
@@ -49,6 +50,11 @@ public abstract class AbstractMultiCategoryVanChartUI extends  AbstractIndepende
                     protected ZoomPane createZoomPane() {
                         return new ZoomPane();
                     }
+
+                    @Override
+                    protected boolean isCurrentChartSupportLargeDataMode() {
+                        return true;
+                    }
                 };
             }
         };