From d56fc70ef5104bace16c9a1241e8f7f16b951707 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Mon, 26 Jul 2021 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-55800=20=E3=80=90=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=88=86=E7=A6=BB=E3=80=91=20=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=BB=84=E4=BB=B6=E6=A0=91=E6=9C=80=E7=BB=88=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=BB=84=E4=BB=B6=E4=B8=8E=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E7=9A=84=E7=BB=84=E4=BB=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E5=90=8C=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/ComponentTree.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java b/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
index f9a9440916..0f39f089f8 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
@@ -411,6 +411,11 @@ public class ComponentTree extends JTree {
             if (e.isControlDown() || e.isShiftDown()) {
                 return;
             }
+            XCreator currentCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
+            // 以当前选中的为准
+            if (currentCreator != selectedCreator) {
+                selectedCreator = currentCreator;
+            }
             if (e.getButton() == MouseEvent.BUTTON1 && selectedCreator != null) {
                 showSelectedPopup(selectedCreator);
             }