From f3708aadeb90e02d8dce8725a18333496aa512e4 Mon Sep 17 00:00:00 2001
From: "Yuan.Wang" <1536296691@qq.com>
Date: Mon, 7 Sep 2020 20:38:16 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-38969=20=E4=BF=AE=E6=94=B9=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E7=82=B9=E5=87=BB=E5=9D=90=E6=A0=87=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/creator/XCreatorUtils.java  |  7 +++++++
 .../com/fr/design/mainframe/FormDesigner.java   | 17 +++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
index 42069e4d8a..072e21fa9f 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
@@ -336,4 +336,11 @@ public class XCreatorUtils {
         }
         return IOUtils.readIcon(iconPath);
     }
+
+    public static boolean containComponent(Container ancestor, Container xCreator) {
+        while (xCreator != null && xCreator.getParent() != ancestor) {
+            xCreator = xCreator.getParent();
+        }
+        return xCreator != null;
+    }
 }
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
index d66f1f2a6a..40da109cf2 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
@@ -191,6 +191,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
 
         this.switchAction = switchAction;
         topXCreators=new TopXCreators(this);
+        topXCreators.setVisible(true);
         add(topXCreators);
 
         // 必须刷新"参数/控件树"面板，否则，若最近一次打开模版为 cpt，重启设计器，打开 frm，控件树消失
@@ -836,12 +837,16 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     /**
      * 从已选择的组件中找x,y所在的组件
      */
-    private XCreator xCreatorAt(int x, int y, XCreator[] xCreators) {
+    private XCreator xCreatorAt(int x, int y,XCreator root) {
+        XCreator[] xCreators = selectionModel.getSelection().getSelectedCreators();
         for (XCreator creator : xCreators) {
-            if (creator == null || !creator.isVisible()) {
-                continue;
-            }
-            if (creator instanceof XWAbsoluteBodyLayout || creator instanceof XWFitLayout || creator instanceof XWParameterLayout) {
+            boolean shouldContinue = creator == null
+                    || !creator.isVisible()
+                    || !XCreatorUtils.containComponent(root, creator)
+                    || creator instanceof XWAbsoluteBodyLayout
+                    || creator instanceof XWFitLayout
+                    || creator instanceof XWParameterLayout;
+            if (shouldContinue) {
                 continue;
             }
             x -= creator.getX();
@@ -1072,7 +1077,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         }
         int relativeX = x + (int) (formArea.getHorizontalValue() / scale) - container.getX();
         int relativeY = y + (int) (formArea.getVerticalValue() / scale) - container.getY();
-        XCreator result = xCreatorAt(relativeX, relativeY, selectionModel.getSelection().getSelectedCreators());
+        XCreator result = xCreatorAt(relativeX, relativeY, container);
         return result == null ? getComponentAt(x, y, null) : result;
     }