Pull request #2392: REPORT-40025 修改在已选择组件中按坐标获取组件的逻辑

Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0

* commit '28cde5e899b3a9151f191d315a82006ca53eed89':
  REPORT-40025 修改在已选择组件中按坐标获取组件的逻辑
  REPORT-40025 修改在已选择组件中按坐标获取组件的逻辑

designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

@@ -345,17 +345,16 @@ public class XCreatorUtils {
     }
 
     /**
-     * 获取组件的最顶层XMainBorderLayout,没有则返回null
+     * 获取组件的上一层的XMainBorderLayout,没有则返回null
      * */
     @Nullable
     public static XWCardMainBorderLayout getTopXMainBorderLayout(Container creator) {
-        XWCardMainBorderLayout result = null;
         while (creator != null) {
             if (creator instanceof XWCardMainBorderLayout) {
-                result = (XWCardMainBorderLayout) creator;
+                return (XWCardMainBorderLayout) creator;
             }
             creator = creator.getParent();
         }
-        return result;
+        return null;
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -842,26 +842,61 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             if (shouldContinue) {
                 continue;
             }
-            //如果组件为XWCardMainBorderLayout的子组件，直接从XWCardMainBorderLayout中去找
-            XWCardMainBorderLayout borderLayout = XCreatorUtils.getTopXMainBorderLayout(creator);
-            if (borderLayout != null) {
-                return xCreatorAt(x, y, borderLayout, null);
+            //获取当前组件父组件相对于rootComponent或者paraComponent的距离
+            int relativeParentX = getRelativeParentX(creator.getParent());
+            int relativeParentY = getRelativeParentY(creator.getParent());
+
+            //如果不是布局容器，直接进行对比
+            if (!(creator instanceof XLayoutContainer)) {
+                int newX = x - relativeParentX - creator.getX();
+                int newY = y - relativeParentY - creator.getY();
+                Rectangle rect = ComponentUtils.computeVisibleRect(creator);
+                // 判断是否处于交叉区域
+                if (isIntersectArea(newX, newY, rect)) {
+                    return creator;
+                }
             }
+
+            //如果是布局容器，从布局容器向下找
             if (creator instanceof XLayoutContainer) {
-                return xCreatorAt(x, y, creator, null);
+                XCreator result = xCreatorAt(x - relativeParentX, y - relativeParentY, creator, null);
+                if (result != null) {
+                    return result;
+                }
             }
-            x -= creator.getX();
-            y -= creator.getY();
-            Rectangle rect = ComponentUtils.computeVisibleRect(creator);
-            // 判断是否处于交叉区域
-            if (!isIntersectArea(x, y, rect)) {
-                continue;
+
+            //最后，如果组件为Tab容器中的子组件，再从Tab容器中去找
+            XWCardMainBorderLayout borderLayout = XCreatorUtils.getTopXMainBorderLayout(creator);
+            if (borderLayout != null) {
+                relativeParentX = getRelativeParentX(borderLayout.getParent());
+                relativeParentY = getRelativeParentY(borderLayout.getParent());
+                return xCreatorAt(x - relativeParentX, y - relativeParentY, borderLayout, null);
             }
-            return creator;
         }
         return null;
     }
 
+    /**
+     * 获取当前组件相对于rootComponent或者paraComponent的横向距离
+     */
+    private int getRelativeParentX(Container container) {
+        return returnZero(container) ? 0 : container.getX() + getRelativeParentX(container.getParent());
+    }
+
+    /**
+     * 获取当前组件相对于rootComponent或者paraComponent的纵向距离
+     */
+    private int getRelativeParentY(Container container) {
+        return returnZero(container) ? 0 : container.getY() + getRelativeParentY(container.getParent());
+    }
+
+    private boolean returnZero(Container container) {
+        return !(container instanceof XLayoutContainer)
+                || container == rootComponent
+                || (paraComponent != null && container == paraComponent);
+    }
+
+
     /**
      * 刷新顶层组件
      * */