From 2b73c4dc269ab0efa9edb37cb3eecb55738fb06e Mon Sep 17 00:00:00 2001
From: "Yuan.Wang" <1536296691@qq.com>
Date: Mon, 7 Sep 2020 17:45:46 +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

---
 .../com/fr/design/mainframe/FormDesigner.java  | 18 +++++++++++++++++-
 1 file changed, 17 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 5cb0157f9e..d66f1f2a6a 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
@@ -38,6 +38,7 @@ import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.creator.XWTitleLayout;
+import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.event.DesignerOpenedListener;
@@ -64,6 +65,7 @@ import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetValue;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.WFitLayout;
+import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.log.FineLoggerFactory;
@@ -845,6 +847,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             x -= creator.getX();
             y -= creator.getY();
             Rectangle rect = ComponentUtils.computeVisibleRect(creator);
+            rect.y += nestTabCount(creator) * WCardMainBorderLayout.TAB_HEIGHT;
             // 判断是否处于交叉区域
             if (!isIntersectArea(x, y, rect)) {
                 continue;
@@ -852,11 +855,24 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             if (creator instanceof XWTitleLayout) {
                 return creator.getEditingChildCreator();
             }
-            return creator;
+            return xCreatorAt(x, y, creator, null);
         }
         return null;
     }
 
+    /**
+     * 计算嵌套的tab层数
+     */
+    private int nestTabCount(Container xCreator) {
+        if (xCreator == null) {
+            return 0;
+        }
+        if (xCreator instanceof XWTabFitLayout) {
+            return 1 + nestTabCount(xCreator.getParent());
+        }
+        return nestTabCount(xCreator.getParent());
+    }
+
     /**
      * 刷新顶层组件
      * */