From 6ddf7a3e6115907e1423b042fcd8b8da67b3aca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Mon, 21 Feb 2022 17:38:28 +0800
Subject: [PATCH] REPORT-66939

---
 .../main/java/com/fr/design/mainframe/FormDesigner.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 7837f8b008..24ed004fff 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
@@ -1318,7 +1318,14 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         DraggingModel model = this.draggingModel;
         MouseEvent dragEvent = model.getCurrentDragEvent();
         XCreator hotspot = this.getComponentAt(dragEvent.getX(), dragEvent.getY());
-        return XCreatorUtils.getHotspotContainer(hotspot);
+        XLayoutContainer container = XCreatorUtils.getHotspotContainer(hotspot);
+        XLayoutContainer topLayout = container.getTopLayout();
+        // REPORT-66939 Tab比较特殊，它是又多个LayoutContainer组成，直接返回container会导致误判，需要先找到最上层topLayout，取其父layout才是正确结果
+        if (topLayout != null && container != topLayout) {
+            return (XLayoutContainer) topLayout.getParent();
+        } else {
+            return container;
+        }
     }
 
     /**