REPORT-4634 组件叠加体验优化=>埋点

designer-form/src/com/fr/design/designer/beans/actions/CopyAction.java

@@ -10,7 +10,7 @@ import java.awt.event.KeyEvent;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
-public class CopyAction extends FormEditAction {
+public class CopyAction extends FormWidgetEditAction {
 
     public CopyAction(FormDesigner t) {
         super(t);

designer-form/src/com/fr/design/designer/beans/actions/CutAction.java

@@ -11,7 +11,7 @@ import com.fr.design.mainframe.FormDesigner;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
-public class CutAction extends FormEditAction {
+public class CutAction extends FormWidgetEditAction {
 
 	public CutAction(FormDesigner t) {
 		super(t);

designer-form/src/com/fr/design/designer/beans/actions/FormDeleteAction.java

@@ -17,7 +17,7 @@ import com.fr.design.mainframe.FormSelection;
  * @author richer
  * @since 6.5.3
  */
-public class FormDeleteAction extends FormUndoableAction {
+public class FormDeleteAction extends FormWidgetEditAction {
 
     public FormDeleteAction(FormDesigner t) {
         super(t);
@@ -55,9 +55,4 @@ public class FormDeleteAction extends FormUndoableAction {
         creator.deleteRelatedComponent(creator, designer);
         return false;
     }
-
-    @Override
-    public void update() {
-        this.setEnabled(true);
-    }
 }

designer-form/src/com/fr/design/designer/beans/actions/FormEditAction.java

@@ -1,17 +0,0 @@
-package com.fr.design.designer.beans.actions;
-
-import com.fr.design.actions.TemplateComponentAction;
-import com.fr.design.mainframe.FormDesigner;
-
-public abstract class FormEditAction extends TemplateComponentAction<FormDesigner> {
-
-	protected FormEditAction(FormDesigner t) {
-		super(t);
-	}
-
-	@Override
-	public void update() {
-		this.setEnabled(true);
-	}
-
-}

designer-form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java

@@ -0,0 +1,39 @@
+package com.fr.design.designer.beans.actions;
+
+import com.fr.design.actions.TemplateComponentAction;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.plugin.ExtraClassManager;
+import com.fr.stable.ReportFunctionProcessor;
+import com.fr.stable.fun.FunctionProcessor;
+
+import javax.swing.JButton;
+import java.awt.event.ActionEvent;
+
+public abstract class FormWidgetEditAction extends TemplateComponentAction<FormDesigner> {
+
+    protected FormWidgetEditAction(FormDesigner t) {
+        super(t);
+    }
+
+    @Override
+    public void update() {
+        this.setEnabled(true);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent evt) {
+        super.actionPerformed(evt);
+        // 记录功能点
+        FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
+        if (processor != null) {
+            FunctionProcessor functionProcessor;
+            if (evt.getSource() instanceof JButton) {
+                functionProcessor = ReportFunctionProcessor.FORM_WIDGET_EDIT_TOOLBAR;
+            } else {
+                functionProcessor = ReportFunctionProcessor.FORM_WIDGET_EDIT_POPUPMENU;
+            }
+            processor.recordFunction(functionProcessor);
+        }
+    }
+
+}

designer-form/src/com/fr/design/designer/beans/actions/MoveDownAction.java

@@ -20,7 +20,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M
  * Created by plough on 2017/12/4.
  */
 
-public class MoveDownAction extends FormEditAction {
+public class MoveDownAction extends FormWidgetEditAction {
 
     public MoveDownAction(FormDesigner t) {
         super(t);

designer-form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java

@@ -20,7 +20,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M
  * Created by plough on 2017/12/4.
  */
 
-public class MoveToBottomAction extends FormEditAction {
+public class MoveToBottomAction extends FormWidgetEditAction {
 
     public MoveToBottomAction(FormDesigner t) {
         super(t);

designer-form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java

@@ -20,7 +20,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M
  * Created by plough on 2017/12/4.
  */
 
-public class MoveToTopAction extends FormEditAction {
+public class MoveToTopAction extends FormWidgetEditAction {
 
     public MoveToTopAction(FormDesigner t) {
         super(t);

designer-form/src/com/fr/design/designer/beans/actions/MoveUpAction.java

@@ -19,7 +19,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M
  * Created by plough on 2017/12/4.
  */
 
-public class MoveUpAction extends FormEditAction {
+public class MoveUpAction extends FormWidgetEditAction {
 
     public MoveUpAction(FormDesigner t) {
         super(t);

designer-form/src/com/fr/design/designer/beans/actions/PasteAction.java

@@ -11,7 +11,7 @@ import com.fr.design.mainframe.FormDesigner;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
-public class PasteAction extends FormEditAction {
+public class PasteAction extends FormWidgetEditAction {
 
 	public PasteAction(FormDesigner t) {
 		super(t);