Merge pull request #1553 in DESIGN/design from ~EASON/design:release/10.0 to release/10.0

* commit '5bc05b40ea18b330abdf8c4b9e0184a67e0ae394':
  feat:CHART-12905 删除phantom相关代码

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

@@ -4,7 +4,6 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.ChartPropertyPane;
 import com.fr.design.module.ChartEmptyDataStyleAction;
 import com.fr.design.module.ChartHyperlinkGroup;
@@ -16,42 +15,37 @@ 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.imgevent.design.DesignImageEvent;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
-import com.fr.van.chart.DownloadOnlineSourcesHelper;
 import com.fr.van.chart.map.server.ChartMapEditorAction;
 
 /**
  * Created by juhaoyu on 2018/6/27.
  */
 public class ChartDesignerActivator extends Activator implements Prepare {
-    
+
     @Override
     public void start() {
-        
+
         StableFactory.registerMarkedClass(ExtraChartDesignClassManagerProvider.XML_TAG, ChartTypeInterfaceManager.class);
         StableFactory.getStaticMarkedInstanceObjectFromClass(ExtraChartDesignClassManagerProvider.XML_TAG, ExtraChartDesignClassManagerProvider.class);
-        
+
         DesignModuleFactory.registerHyperlinkGroupType(new ChartHyperlinkGroup());
-        
+
         DesignModuleFactory.registerChartEditorClass(ChartEditor.class);
         DesignModuleFactory.registerChartComponentClass(ChartComponent.class);
-        
+
         DesignModuleFactory.registerChartDialogClass(ChartDialog.class);
-        
+
         DesignModuleFactory.registerChartPropertyPaneClass(ChartPropertyPane.class);
-        
+
         ActionFactory.registerChartPreStyleAction(new ChartPreStyleAction());
         ActionFactory.registerChartEmptyDataStyleAction(new ChartEmptyDataStyleAction());
         ActionFactory.registerChartMapEditorAction(new ChartMapEditorAction());
-        
+
         ActionFactory.registerChartCollection(ChartCollection.class);
-        
+
         DesignModuleFactory.registerExtraWidgetOptions(ChartTypeInterfaceManager.initWidgetOption());
-        
-        DesignImageEvent.registerDefaultCallbackEvent(HistoryTemplateListPane.getInstance());
-        DesignImageEvent.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
 
         ChartTypeInterfaceManager.addPluginChangedListener();
     }
@@ -63,6 +57,6 @@ public class ChartDesignerActivator extends Activator implements Prepare {
 
     @Override
     public void stop() {
-    
+
     }
 }

designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java

@@ -31,7 +31,7 @@ import java.awt.event.MouseMotionListener;
 * 类说明: 事件说明: 工具栏编辑--> 是刷新ChartComponent 然后响应整个设计块的改变事件
  				       右键编辑 ---> 刷新ChartCompment  刷新对应的工具栏(加入事件) 然后响应整个设计块的改变事件
  */
-public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener, CallbackEvent{
+public class ChartComponent extends MiddleChartComponent implements MouseListener, MouseMotionListener{
 	private static final long serialVersionUID = 744164838619052097L;
 	private final List<PropertyChangeListener> listeners = new ArrayList<PropertyChangeListener>();
     private ChartCollection chartCollection4Design;
@@ -257,12 +257,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
             if (resolution == 0){
                 resolution = ScreenResolution.getScreenResolution();
             }
-            painter.paint(g2d, chartWidth, chartHeight, resolution, null, this);
+            painter.paint(g2d, chartWidth, chartHeight, resolution, null);
         }
     }
-
-    @Override
-    public void callback() {
-        this.repaint();
-    }
 }

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -115,12 +115,6 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
 
             if (!ComparatorUtils.equals(collection, lastCollection)) {
 
-                VanChart vanChart = collection.getSelectedChartProvider(VanChart.class);
-                if (vanChart != null) {
-                    //此处画图
-                    vanChart.demoImgEvent(true);
-                }
-
                 try {
                     lastCollection = collection.clone();
                 } catch (CloneNotSupportedException e) {