From 48eff3e882badbb9233d36f808437363660c06dc Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Fri, 21 Oct 2016 14:13:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=85=B1=E4=BA=ABfireTargetChange=E4=BC=9A=E5=A4=9A?=
 =?UTF-8?q?=E8=AE=B0=E4=BD=8F=E4=B8=80=E6=AC=A1=E7=8A=B6=E6=80=81ctrl+z?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=BE=97=E5=A4=9A=E6=8C=89=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/data/datapane/TableDataTreePane.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
index 618c2edec..2e605cafc 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
@@ -292,7 +292,6 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             }
             tds.putTableData(tdName, td);
         }
-        tc.fireTargetModified();
         tc.parameterChanged();
         dataTree.refresh();
     }

From d92bc1810816e2cbe25ae6885d66f94026801c09 Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Fri, 21 Oct 2016 15:53:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/CoverReportPane.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/CoverReportPane.java b/designer_form/src/com/fr/design/mainframe/CoverReportPane.java
index 42dc62040..63ec66f5a 100644
--- a/designer_form/src/com/fr/design/mainframe/CoverReportPane.java
+++ b/designer_form/src/com/fr/design/mainframe/CoverReportPane.java
@@ -62,15 +62,17 @@ public class CoverReportPane extends JPanel {
         editButton.setBackground(new Color(176, 196, 222));
         add(editButton);
         add(controlButton);
-        WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() {
-            @Override
-            public void fireCreatorModified(DesignerEvent evt) {
-                if (evt.getCreatorEventID() == (DesignerEvent.CREATOR_DELETED)
-                        || evt.getCreatorEventID() == (DesignerEvent.CREATOR_RESIZED)) {
-                    destroyHelpDialog();
+        if (WidgetPropertyPane.getInstance().getEditingFormDesigner() != null) {
+            WidgetPropertyPane.getInstance().getEditingFormDesigner().addDesignerEditListener(new DesignerEditListener() {
+                @Override
+                public void fireCreatorModified(DesignerEvent evt) {
+                    if (evt.getCreatorEventID() == (DesignerEvent.CREATOR_DELETED)
+                            || evt.getCreatorEventID() == (DesignerEvent.CREATOR_RESIZED)) {
+                        destroyHelpDialog();
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     public String getHelpMsg() {