CHART-12733 大数据模式 回退

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

@@ -32,6 +32,8 @@ public class VanChartAreaSeriesPane extends VanChartLineSeriesPane {
                 new Component[]{createMarkerPane()},
                 new Component[]{createAreaFillColorPane()},
                 new Component[]{createStackedAndAxisPane()},
+                //大数据模式 恢复用注释。下面1行删除。
+                new Component[]{createLargeDataModelPane()},
                 new Component[]{createTrendLinePane()},
         };
 

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

@@ -6,6 +6,7 @@ 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;
@@ -42,6 +43,10 @@ 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;
     }

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

@@ -369,11 +369,19 @@ public class PlotFactory {
         return formatPane;
     }
 
-    /**
-     * 判断是否为大数据模式
-     */
+
+    //大数据模式 恢复用注释。取消注释。
+//    public static boolean largeDataModel(Plot plot) {
+//        return plot != null && plot.convertDataProcessor().getMark() == LargeDataModel.MARK;
+//    }
+
+    //大数据模式 恢复用注释。删除下面2个方法 largeDataModel lineMapLargeModel。
     public static boolean largeDataModel(Plot plot) {
-        return plot != null && plot.convertDataProcessor().getMark() == LargeDataModel.MARK;
+        return plot != null && plot.getDataProcessor().getMark() == LargeDataModel.MARK;
+    }
+
+    public static boolean lineMapLargeModel(Plot plot) {
+        return plot instanceof VanChartMapPlot && ((VanChartMapPlot) plot).getLineMapDataProcessor().getMark() == LargeDataModel.MARK;
     }
 }
 

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

@@ -6,7 +6,6 @@ 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.formula.TinyFormulaPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
@@ -15,7 +14,6 @@ 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;
@@ -120,7 +118,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
         Component[][] components = new Component[][]{
                 new Component[]{createToolBarPane(getToolBarRowSize(), columnSize), null},
-                new Component[]{createLargeDataModePane(), 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},
@@ -131,38 +130,39 @@ 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);
-    }
+    //大数据模式 恢复用注释。取消注释。
+//    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;
@@ -415,7 +415,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
 
-    private void resetCustomCondition(ConditionCollection conditionCollection) {
+    public static void resetCustomCondition(ConditionCollection conditionCollection) {
         for (int i = 0, len = conditionCollection.getConditionAttrSize(); i < len; i++) {
             ConditionAttr conditionAttr = conditionCollection.getConditionAttr(i);
             conditionAttr.remove(AttrLabel.class);
@@ -483,12 +483,13 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     private void populateLargeMode(Plot plot) {
-        if (largeDataMode != null) {
-            LargeDataAttribute attribute = plot.getLargeDataAttribute();
-
-            largeDataMode.setSelectedItem(attribute.getLargeDataModeType());
-            largeModeThresholdNumber.setValue(attribute.getLargeModeThresholdNumber());
-        }
+        //大数据模式 恢复用注释。取消注释。
+//        if (largeDataMode != null) {
+//            LargeDataAttribute attribute = plot.getLargeDataAttribute();
+//
+//            largeDataMode.setSelectedItem(attribute.getLargeDataModeType());
+//            largeModeThresholdNumber.setValue(attribute.getLargeModeThresholdNumber());
+//        }
     }
 
     private void populateChartAxisRotation(VanChartPlot plot) {
@@ -579,12 +580,13 @@ 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);
-        }
+        //大数据模式 恢复用注释。取消注释。
+//        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) {

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

@@ -1,12 +1,15 @@
 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;
 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;
@@ -15,13 +18,10 @@ import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
 import com.fr.plugin.chart.attr.radius.VanChartRadiusPlot;
 import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground;
-import com.fr.plugin.chart.base.AttrEffect;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.VanChartAttrLine;
 import com.fr.plugin.chart.base.VanChartAttrMarker;
 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;
@@ -32,11 +32,14 @@ import com.fr.van.chart.designer.component.VanChartLineTypePane;
 import com.fr.van.chart.designer.component.VanChartMarkerPane;
 import com.fr.van.chart.designer.component.VanChartTrendLinePane;
 import com.fr.van.chart.designer.component.border.VanChartBorderPane;
+import com.fr.van.chart.designer.other.VanChartInteractivePane;
 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;
 
 /**
@@ -67,6 +70,9 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     private RadiusCardLayoutPane radiusPane;//半径设置界面
     private JPanel radiusPaneWithTitle;
 
+    //大数据模式 恢复用注释。下面1行删除。
+    private UIButtonGroup<DataProcessor> largeDataModelGroup;//大数据模式
+
     protected JPanel contentPane;
 
     public VanChartAbstractPlotSeriesPane(ChartStylePane parent, Plot plot) {
@@ -160,6 +166,47 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
         return ((VanChartPlot) plot).isInCustom() ? null : radiusPaneWithTitle;
     }
 
+    //大数据模式 恢复用注释。删除下面4个方法 createLargeDataModelPane checkLarge createLargeDataModelPane createLargeDataModelGroup。
+    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(plot)) {
+            AttrLabel attrLabel = ((VanChartPlot) plot).getAttrLabelFromConditionCollection();
+            if (attrLabel == null) {
+                attrLabel = ((VanChartPlot) this.plot).getDefaultAttrLabel();
+                ConditionAttr defaultAttr = plot.getConditionCollection().getDefaultAttr();
+                defaultAttr.addDataSeriesCondition(attrLabel);
+            }
+            attrLabel.setEnable(false);
+
+            VanChartInteractivePane.resetCustomCondition(plot.getConditionCollection());
+        }
+
+
+        checkCompsEnabledWithLarge(plot);
+    }
+
+    protected JPanel createLargeDataModelPane(JPanel jPanel) {
+        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Data"), jPanel);
+        return panel;
+    }
+
+    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 void checkCompsEnabledWithLarge(Plot plot) {
         if (markerPane != null) {
             markerPane.checkLargePlot(largeModel(plot));
@@ -222,6 +269,11 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
             stylePane.populateBean(plot.getPlotStyle());
         }
 
+        //大数据模式 恢复用注释。下面3行删除。
+        if (largeDataModelGroup != null) {
+            largeDataModelGroup.setSelectedItem(plot.getDataProcessor());
+        }
+
         if (stackAndAxisEditPane != null && plot instanceof VanChartRectanglePlot) {//堆积和坐标轴
             VanChartRectanglePlot rectanglePlot = (VanChartRectanglePlot) plot;
             if (rectanglePlot.isCustomChart()) {
@@ -274,6 +326,11 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
             plot.setPlotStyle(stylePane.updateBean());
         }
 
+        //大数据模式 恢复用注释。下面3行删除。
+        if (largeDataModelGroup != null) {
+            plot.setDataProcessor(largeDataModelGroup.getSelectedItem());
+        }
+
         if (stackAndAxisEditPane != null && plot instanceof VanChartRectanglePlot) {//堆积和坐标轴
             VanChartRectanglePlot rectanglePlot = (VanChartRectanglePlot) plot;
             if (rectanglePlot.isCustomChart()) {

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

@@ -29,6 +29,8 @@ public class VanChartLineSeriesPane extends VanChartAbstractPlotSeriesPane {
                 new Component[]{createLineTypePane()},
                 new Component[]{createMarkerPane()},
                 new Component[]{createStackedAndAxisPane()},
+                //大数据模式 恢复用注释。下面1行删除。
+                new Component[]{createLargeDataModelPane()},
                 new Component[]{createTrendLinePane()},
         };
 

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

@@ -1,5 +1,6 @@
 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;
@@ -19,6 +20,7 @@ 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;
@@ -27,6 +29,7 @@ import com.fr.van.chart.bubble.component.VanChartBubblePane;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.border.VanChartBorderWithAlphaPane;
 import com.fr.van.chart.designer.component.marker.VanChartImageMarkerPane;
+import com.fr.van.chart.designer.other.VanChartInteractivePane;
 import com.fr.van.chart.designer.style.series.VanChartAbstractPlotSeriesPane;
 import com.fr.van.chart.designer.style.series.VanChartEffectPane;
 import com.fr.van.chart.map.designer.style.series.VanChartMapScatterMarkerPane;
@@ -77,12 +80,63 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
     private VanChartCurvePane curvePane;
     private VanChartLineMapEffectPane lineMapEffectPane;
 
+    //大数据模式 恢复用注释。下面1行删除。
+    private UIButtonGroup<DataProcessor> lineMapLargeDataModelGroup;//大数据模式
+
     private MapType mapType = MapType.AREA;
 
     public VanChartMapSeriesPane(ChartStylePane parent, Plot plot) {
         super(parent, plot);
     }
 
+    //大数据模式 恢复用注释。删除下面4个方法 checkLarge lineMapLargeModel checkLineMapLarge createLineMapLargeDataModelPane。
+    @Override
+    protected void checkLarge() {
+        if (largeModel(plot)) {
+            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);
+
+                VanChartInteractivePane.resetCustomCondition(((VanChartMapPlot) plot).getPointConditionCollection());
+            }
+        }
+
+        checkPointCompsEnabledWithLarge(plot);
+    }
+
+
+    private boolean lineMapLargeModel() {
+        return lineMapLargeDataModelGroup != null && lineMapLargeDataModelGroup.getSelectedIndex() == 0;
+    }
+
+    private void checkLineMapLarge() {
+        if (lineMapLargeModel()) {
+            if (plot instanceof VanChartMapPlot) {
+                VanChartInteractivePane.resetCustomCondition(((VanChartMapPlot) plot).getLineConditionCollection());
+            }
+        }
+
+        checkLineCompsEnabledWithLarge(plot);
+    }
+
+    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);
+    }
+
+
     protected void checkCompsEnabledWithLarge(Plot plot) {
         checkPointCompsEnabledWithLarge(plot);
         checkLineCompsEnabledWithLarge(plot);
@@ -96,7 +150,10 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     private void checkLineCompsEnabledWithLarge(Plot plot) {
         if (lineMapEffectPane != null) {
-            GUICoreUtils.setEnabled(lineMapEffectPane, !largeModel(plot));
+            //大数据模式 恢复用注释。下面1行删除。
+            GUICoreUtils.setEnabled(lineMapEffectPane, !lineMapLargeModel());
+            //大数据模式 恢复用注释。取消注释。
+            //GUICoreUtils.setEnabled(lineMapEffectPane, !largeModel(plot));
         }
     }
 
@@ -158,6 +215,8 @@ 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()},
+                //大数据模式 恢复用注释。下面1行删除。
+                new Component[]{createLargeDataModelPane()},
                 new Component[]{createPointEffectPane()},
         };
 
@@ -174,6 +233,8 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
 
         Component[][] components = new Component[][]{
                 new Component[]{createCurvePane()},
+                //大数据模式 恢复用注释。下面1行删除。
+                new Component[]{createLineMapLargeDataModelPane()},
                 new Component[]{createAnimationPane()}
         };
 
@@ -331,6 +392,10 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             if (nullValueColorBox != null) {
                 nullValueColorBox.setSelectObject(((VanChartMapPlot) plot).getNullValueColor());
             }
+            //大数据模式 恢复用注释。下面3行删除。
+            if (lineMapLargeDataModelGroup != null) {
+                lineMapLargeDataModelGroup.setSelectedItem(((VanChartMapPlot) plot).getLineMapDataProcessor());
+            }
         }
         super.populateBean(plot);
     }
@@ -343,6 +408,10 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             if (nullValueColorBox != null) {
                 ((VanChartMapPlot) plot).setNullValueColor(nullValueColorBox.getSelectObject());
             }
+            //大数据模式 恢复用注释。下面3行删除。
+            if (lineMapLargeDataModelGroup != null) {
+                ((VanChartMapPlot) plot).setLineMapDataProcessor(lineMapLargeDataModelGroup.getSelectedItem());
+            }
         }
         super.updateBean(plot);
     }

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

@@ -4,6 +4,7 @@ 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.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;
@@ -34,6 +35,21 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo
         hyperlinkPane.updateBean(plot);
     }
 
+    //大数据模式 恢复用注释。删除下面方法。
+    @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);
+            }
+        }
+        return false;
+    }
+
     @Override
     protected boolean isCurrentChartSupportLargeDataMode() {
         if (this.chart == null || this.chart.getPlot() == null) {

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

@@ -46,7 +46,10 @@ 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.largeDataModel(plot)) {
+        //大数据模式 恢复用注释。下面1行删除。
+        if (!PlotFactory.lineMapLargeModel(plot)) {
+            //大数据模式 恢复用注释。取消注释。
+            //if (!PlotFactory.largeDataModel(plot)) {
             classPaneMap.put(AttrLineEffect.class, new VanChartLineEffectConditionPane(this, EffectHelper.getLineMapDefaultLineEffect()));
         }
     }

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

@@ -39,6 +39,8 @@ public class VanChartScatterSeriesPane extends VanChartAbstractPlotSeriesPane {
                 new Component[]{createLineTypePane()},
                 new Component[]{createMarkerPane()},
                 new Component[]{createStackedAndAxisPane()},
+                //大数据模式 恢复用注释。下面1行删除。
+                new Component[]{createLargeDataModelPane()},
                 new Component[]{createTrendLinePane()},
         };