From 09b9ffa6a0bf0d344541414fdc280ae82b470c11 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 4 Jun 2018 13:54:25 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6270=20=E5=8F=82=E6=95=B0=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E9=87=8C=E7=9A=84=E7=9B=B8=E5=85=B3bug=3D>=E5=88=A0?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E2=80=9C=E4=BB=A5=E4=B8=8B=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=88=90=E2=80=9D=E6=B2=A1=E6=9C=89=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=EF=BC=8C=E8=A6=81=E5=86=8D=E7=82=B9?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8Bpara=E6=89=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/JForm.java    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/designer-form/src/com/fr/design/mainframe/JForm.java b/designer-form/src/com/fr/design/mainframe/JForm.java
index 757da397e..54c593cac 100644
--- a/designer-form/src/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/com/fr/design/mainframe/JForm.java
@@ -53,15 +53,24 @@ import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.WLayout;
 import com.fr.general.ComparatorUtils;
-import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.web.controller.ViewRequestConstants;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
@@ -246,9 +255,11 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
             private XComponent lastAffectedCreator;
             @Override
             public void fireCreatorModified(DesignerEvent evt) {
-                if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED
-                        || evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
+                if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED) {
                     setPropertyPaneChange(formDesign.getRootComponent());
+                } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
+                    // 在 delete 之前，会先 select 父组件。这里直接传入 lastAffectedCreator 就好了
+                    setPropertyPaneChange(lastAffectedCreator);
                 } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
                     lastAffectedCreator = evt.getAffectedCreator();
                     setPropertyPaneChange(lastAffectedCreator);