From 7dd024fba772db268f96cd3938aece86204ff0d5 Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Thu, 9 Jun 2022 11:11:06 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-73106=20=E5=B0=86=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=8E=A7=E4=BB=B6=E5=89=AA=E5=88=87=E5=88=B0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84cpt,=E5=8E=9Ffrm=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=B0=B1=E5=8F=98=E6=88=90=E5=92=8Ccpt=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/beans/models/SelectionModel.java  | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
index df645e2df..082075707 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
@@ -25,7 +25,6 @@ import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
 import com.fr.design.mainframe.FormSelectionUtils;
-import com.fr.design.mainframe.share.encrypt.clipboard.impl.EncryptSelectionClipboardHandler;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
@@ -140,11 +139,28 @@ public class SelectionModel {
             if (cutSelection != null) {
                 cutSelection.cut2ClipBoard(clipboard);
                 designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_CUTED);
+                setSelectedCreator(hasSelectedParaComponent() ? designer.getParaComponent() : designer.getRootComponent());
                 designer.repaint();
             }
         }
     }
 
+    /**
+     * 判断是否选中参数面板中的组件
+     * @return boolean
+     */
+    private boolean hasSelectedParaComponent() {
+        XCreator[] roots = selection.getSelectedCreators();
+        if (roots.length > 0) {
+            for (XCreator creator : roots) {
+                if ((creator.getParent() instanceof XWParameterLayout)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * 复制当前选中的组件到剪切板
      */