Pull request #1683: CHART-13988 散点图大数据模式下标记点特殊处理

Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit '3ea7e6e79b5eaab4ebb59b56a1a61609f27a31c0':
  CHART-13988 散点图大数据模式下标记点特殊处理

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

@@ -23,7 +23,7 @@ import com.fr.van.chart.scatter.component.VanChartScatterLineTypeConditionPane;
 import com.fr.van.chart.scatter.component.VanChartScatterMarkerConditionPane;
 import com.fr.van.chart.scatter.component.label.VanChartScatterLabelConditionPane;
 import com.fr.van.chart.scatter.component.tooltip.VanChartScatterTooltipConditionPane;
-import com.fr.van.chart.scatter.large.VanChartLargeModelMarkerConditionPane;
+import com.fr.van.chart.scatter.large.VanChartScatterLargeModelMarkerConditionPane;
 
 import java.awt.Dimension;
 
@@ -53,7 +53,7 @@ public class VanChartScatterConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(VanChartAttrTrendLine.class, new VanChartTrendLineConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         if(PlotFactory.largeDataModel(plot)){
-            classPaneMap.put(VanChartAttrMarker.class, new VanChartLargeModelMarkerConditionPane(this));
+            classPaneMap.put(VanChartAttrMarker.class, new VanChartScatterLargeModelMarkerConditionPane(this));
         } else {
             classPaneMap.put(VanChartAttrLine.class, new VanChartScatterLineTypeConditionPane(this));
             classPaneMap.put(VanChartAttrMarker.class, new VanChartScatterMarkerConditionPane(this));

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

@@ -0,0 +1,29 @@
+package com.fr.van.chart.scatter.large;
+
+import com.fr.chart.chartglyph.Marker;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.plugin.chart.marker.type.MarkerType;
+import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartMarkerConditionPane;
+
+public class VanChartScatterLargeModelMarkerConditionPane extends VanChartMarkerConditionPane {
+
+    public VanChartScatterLargeModelMarkerConditionPane(ConditionAttributesPane conditionAttributesPane) {
+        super(conditionAttributesPane);
+    }
+
+    protected void initMarkerPane() {
+
+        markerPane = new VanChartLargeModelMarkerPane() {
+            protected VanChartCommonMarkerPane createCommonMarkerPane() {
+
+                return new VanChartCommonMarkerPane() {
+                    protected Marker[] getMarkers() {
+                        return getNormalMarkersWithCustom(new MarkerType[]{MarkerType.MARKER_AUTO});
+                    }
+                };
+            }
+
+        };
+    }
+}