From 318f3ca76b420a0b8ee093e00c0fa2297488ac15 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Mon, 9 Oct 2017 15:45:00 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4883=20=E6=A8=A1=E6=9D=BF=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=8E=A7=E4=BB=B6=E9=97=AE=E9=A2=98=3D>=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=90=8E=EF=BC=8C=E9=80=89=E4=B8=AD=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/designer/beans/models/SelectionModel.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java b/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
index 2fde27019..354ba3f63 100644
--- a/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
+++ b/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
@@ -227,7 +227,11 @@ public class SelectionModel {
         XCreator[] roots = selection.getSelectedCreators();
 
         if (roots.length > 0) {
+            boolean isInPara = true;  // 在参数面板内删除控件
             for (XCreator creator : roots) {
+                if (isInPara && !(creator.getParent() instanceof XWParameterLayout)) {
+                    isInPara = false;
+                }
                 if (creator.acceptType(XWParameterLayout.class)) {
                     designer.removeParaComponent();
                 }
@@ -236,8 +240,7 @@ public class SelectionModel {
                 // 清除被选中的组件
                 selection.reset();
             }
-            setSelectedCreator(designer.getRootComponent());
-            FormSelectionUtils.rebuildSelection(designer);
+            setSelectedCreator(isInPara ? designer.getParaComponent() : designer.getRootComponent());
             // 触发事件
             designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_DELETED);
             designer.repaint();