Merge pull request #1587 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '14a6040285cf6d9e0b9193b17956155b77cd72eb':
  CHART-13460 打包报错
  CHART-13481 大数据模式下的高亮不显示

designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java

@@ -1,7 +1,6 @@
 package com.fr.design.chart;
 
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.chart.gui.ChartComponent;
@@ -16,6 +15,7 @@ import com.fr.locale.LocaleMarker;
 import com.fr.locale.LocaleScope;
 import com.fr.module.Activator;
 import com.fr.module.extension.Prepare;
+import com.fr.plugin.chart.vanchart.export.ImagePainter;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
 import com.fr.van.chart.DownloadOnlineSourcesHelper;
@@ -49,7 +49,7 @@ public class ChartDesignerActivator extends Activator implements Prepare {
 
         DesignModuleFactory.registerExtraWidgetOptions(ChartTypeInterfaceManager.initWidgetOption());
 
-        GEOJSONHelper.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
+        ImagePainter.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
 
         ChartTypeInterfaceManager.addPluginChangedListener();
     }

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

@@ -68,6 +68,7 @@ public class VanChartLegendPane extends AbstractVanChartScrollPane<VanChart> {
         if (plot == null) {
             return;
         }
+        legendContent.setPlot(plot);
         VanChartLegend legend = (VanChartLegend) plot.getLegend();
         if (legendContent != null) {
             legendContent.populateBean(legend);

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

@@ -2,14 +2,15 @@ package com.fr.van.chart.designer.style;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
+import com.fr.chart.chartattr.Plot;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
 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.ilable.UILabel;
-import com.fr.design.i18n.Toolkit;
 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.design.mainframe.chart.PaneTitleConstants;
@@ -18,6 +19,7 @@ import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.plugin.chart.attr.VanChartLegend;
 import com.fr.plugin.chart.type.LayoutType;
 import com.fr.stable.Constants;
+import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.VanChartFloatPositionPane;
 import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutImagePane;
@@ -46,6 +48,8 @@ public class VanChartPlotLegendPane extends BasicPane {
     private static final int HEIGHT = 100;
     private static final int GAP = 20;
 
+    private Plot plot;
+
     private UICheckBox isLegendVisible;
     private JPanel legendPane;
 
@@ -80,6 +84,10 @@ public class VanChartPlotLegendPane extends BasicPane {
         initComponents();
     }
 
+    public void setPlot(Plot plot) {
+        this.plot = plot;
+    }
+
     public JPanel getHighlightPane() {
         return highlightPane;
     }
@@ -421,6 +429,7 @@ public class VanChartPlotLegendPane extends BasicPane {
             //limitPane.populateBean(legend.getLimitAttribute());
             if(highlightButton != null){
                 highlightButton.setSelectedItem(legend.isHighlight());
+                highlightButton.setEnabled(!PlotFactory.largeDataModel(plot));
             }
         }