From f2c3c76e7d60e48a5b4f9d3ab8ddc653c398bcfb Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 8 Mar 2017 16:22:38 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1916=20=E5=81=9A=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=9A=84=E8=BF=87=E7=A8=8B=E5=92=8C=E8=80=97=E6=97=B6=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=3D=E3=80=8B=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E7=BC=96=E8=BE=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/aspectj/designer/TemplateProcessTracker.aj    | 9 +++++----
 designer/src/com/fr/grid/Grid.java                       | 9 +++++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj b/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj
index a2c3565d9..24dfc7351 100644
--- a/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj
+++ b/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj
@@ -6,6 +6,7 @@ package com.fr.aspectj.designer;
  */
 
 import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
+import com.fr.grid.Grid;
 import org.aspectj.lang.reflect.SourceLocation;
 
 import java.awt.event.ActionEvent;
@@ -24,8 +25,8 @@ public aspect TemplateProcessTracker {
             execution(* actionPerformed(ActionEvent)) && args(e);
     pointcut onSetValueAt(Object v, int r, int c) :
             execution(* setValueAt(java.lang.Object, int, int)) && args(v, r, c);
-    pointcut onSetValue4EditingElement(Object v) :
-            execution(* setValue4EditingElement(java.lang.Object)) && args(v);
+    pointcut onSetValue4EditingElement(Grid g, Object v) :
+            call(* setValue4EditingElement(java.lang.Object)) && target(g) && args(v);
 
     //before表示之前的意思
     //这整个表示在MouseAdapter的public void mouseXXX(MouseEvent)方法调用之前，你想要执行的代码
@@ -60,11 +61,11 @@ public aspect TemplateProcessTracker {
 
     }
     //同上
-    before(Object v) : onSetValue4EditingElement(v) {
+    before(Grid g, Object v) : onSetValue4EditingElement(g, v) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
 
 //        String v = "test";
-        String log = String.format("%s:\n%s\nset value: %s\n\n", new Date(), sl, v);
+        String log = String.format("%s:\n%s\nset value: %s at %s\n\n", new Date(), sl, v, g.getEditingCellElement());
         TemplateInfoCollector.appendProcess(log);
 
     }
diff --git a/designer/src/com/fr/grid/Grid.java b/designer/src/com/fr/grid/Grid.java
index 432ea888c..178cd085e 100644
--- a/designer/src/com/fr/grid/Grid.java
+++ b/designer/src/com/fr/grid/Grid.java
@@ -1067,6 +1067,13 @@ public class Grid extends BaseGridComponent {
 
     }
 
+    /**
+     * @return editingCellElement 的字符串表示
+     */
+    public String getEditingCellElement() {
+        return editingCellElement.toString();
+    }
+
     /**
      * 将新值赋给editingCellElement
      *
@@ -1074,8 +1081,6 @@ public class Grid extends BaseGridComponent {
      * @return true if the value changed
      */
     private boolean setValue4EditingElement(Object newValue) {
-        String log = String.format("%s:\nGrid.java\nset value: %s at %s\n\n", new Date(), newValue, editingCellElement);
-        TemplateInfoCollector.appendProcess(log);
         if (newValue instanceof TemplateCellElement) {
             TemplateCellElement cellElement = (TemplateCellElement) newValue;
             editingCellElement.setValue(cellElement.getValue());