Merge pull request #249 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit 'e51bfb69a3499db0df18b75b25cb712a6e0aae20':
  CORE-113 功能点监控，全部使用注解 @Focus来实现

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

@@ -18,21 +18,12 @@ import com.fr.design.gui.imenutable.UIMenuNameableCreator;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.mainframe.chart.gui.ChartTypePane.ComboBoxPane;
 import com.fr.general.ComparatorUtils;
-import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.Image;
-import java.awt.Rectangle;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
@@ -140,7 +131,6 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
                 try {
                     Chart newChart = (Chart) chart.clone();
                     editingCollection.addNamedChart(name, newChart);
-                    editingCollection.addFunctionRecord(newChart);
                 } catch (CloneNotSupportedException e1) {
                     FineLoggerFactory.getLogger().error("Error in Clone");
                 }

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java

@@ -1,6 +1,5 @@
 package com.fr.van.chart.drillmap.designer.data.comp;
 
-import com.fr.base.chart.BaseChart;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.beans.BasicBeanPane;
@@ -13,7 +12,7 @@ import com.fr.plugin.chart.drillmap.data.DrillMapDefinition;
 import com.fr.plugin.chart.type.MapType;
 import com.fr.van.chart.map.designer.data.MapDataPaneHelper;
 
-import java.awt.BorderLayout;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -102,11 +101,7 @@ public class DrillMapDataPane extends BasicBeanPane<ChartCollection> {
         }
         if(dataDefinitionType.getSelectedIndex() == 0){
             drillMapDefinition.setFromBottomData(true);
-            ChartCollection temp = new ChartCollection(new Chart()){
-                @Override
-                public void addFunctionRecord(BaseChart chart) {
-                }
-            };
+            ChartCollection temp = new ChartCollection(new Chart());
             bottomDataDefinitionPane.updateBean(temp);
             drillMapDefinition.setBottomDataDefinition(temp.getSelectedChart().getFilterDefinition());
         } else {

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/EachLayerDataDefinitionPane.java

@@ -1,6 +1,5 @@
 package com.fr.van.chart.drillmap.designer.data.comp;
 
-import com.fr.base.chart.BaseChart;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
@@ -18,7 +17,7 @@ import com.fr.plugin.chart.type.MapType;
 import com.fr.van.chart.map.designer.data.MapDataPaneHelper;
 
 import javax.swing.tree.DefaultMutableTreeNode;
-import java.awt.CardLayout;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -116,11 +115,7 @@ public class EachLayerDataDefinitionPane extends MultiTabPane<ChartCollection> {
         List<TopDefinitionProvider> eachLayerDataDefinitionList = new ArrayList<TopDefinitionProvider>();
         for(BasicPane basicPane : paneList){
             if(basicPane instanceof SingleLayerDataDefinitionPane){
-                ChartCollection temp = new ChartCollection(new Chart()){
-                    @Override
-                    public void addFunctionRecord(BaseChart chart) {
-                    }
-                };
+                ChartCollection temp = new ChartCollection(new Chart());
                 ((SingleLayerDataDefinitionPane) basicPane).updateBean(temp);
                 eachLayerDataDefinitionList.add(temp.getSelectedChart().getFilterDefinition());
             }

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -18,20 +18,12 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;
-import com.fr.form.FormFunctionProcessor;
 import com.fr.form.ui.BaseChartEditor;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.Inter;
-import com.fr.plugin.ExtraClassManager;
-import com.fr.stable.fun.FunctionProcessor;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
+
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
@@ -175,11 +167,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
                 updateTipLabel();
                 ChartMobileFitAttrState selectedAttr = (ChartMobileFitAttrState)((Item)e.getItem()).getValue();
                 if (selectedAttr.getState() != ChartMobileFitAttrState.AUTO.getState()) {
-                    // 功能埋点
-                    FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
-                    if (processor != null) {
-                        processor.recordFunction(FormFunctionProcessor.MOBILE_CHART_ADAPTIVITY);
-                    }
+
                 }
             }
         });