From 4f24288c06c345e9e9eaa70d458b7de2544839bf Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Thu, 12 Dec 2019 15:31:50 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-24117=20=E8=BF=99=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E9=80=80=EF=BC=8C=E5=BD=93=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84bug=20REPORT-21202=E4=BF=AE=E6=94=B9FormSelection?=
 =?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=E9=81=BF=E5=85=8Dtab=E7=9A=84?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/beans/models/SelectionModel.java | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
index 76eb60230..052ae0539 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
@@ -18,9 +18,7 @@ import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.stable.ArrayUtils;
 
-import java.awt.LayoutManager;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
+import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 
@@ -177,19 +175,36 @@ public class SelectionModel {
     }
 
     private void pasteXWFitLayout() {
-        //自适应布局编辑器内部左上角第一个坐标点
-        int leftUpX = designer.getRootComponent().toData().getMargin().getLeft() + 1;
-        int leftUpY = designer.getRootComponent().toData().getMargin().getTop() + 1;
-        //选中第一个坐标点坐在的组件
-        selection.setSelectedCreator((XCreator) designer.getRootComponent().getComponentAt(leftUpX, leftUpY));
-        Rectangle rectangle = selection.getRelativeBounds();
-        if (hasSelectedPasteSource()) {
-            selectedPaste();
+        if (selection.getSelectedCreator().getClass().equals(XWTabFitLayout.class)) {
+            XLayoutContainer container = (XLayoutContainer) selection.getSelectedCreator();
+            //tab布局编辑器内部左上角第一个坐标点
+            int leftUpX = container.toData().getMargin().getLeft() + 1;
+            int leftUpY = container.toData().getMargin().getTop() + 1;
+            //选中第一个坐标点坐在的组件
+            selection.setSelectedCreator((XCreator) container.getComponentAt(leftUpX, leftUpY));
+            Rectangle rectangle = selection.getRelativeBounds();
+            if (hasSelectedPasteSource()) {
+                selectedPaste();
+            } else {
+                FormSelectionUtils.paste2Container(designer, container, clipboard,
+                        rectangle.x + rectangle.width / 2,
+                        rectangle.y + DELTA_X_Y);
+            }
         } else {
-            FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
-                    clipboard,
-                    rectangle.x + rectangle.width / 2,
-                    rectangle.y + DELTA_X_Y);
+            //自适应布局编辑器内部左上角第一个坐标点
+            int leftUpX = designer.getRootComponent().toData().getMargin().getLeft() + 1;
+            int leftUpY = designer.getRootComponent().toData().getMargin().getTop() + 1;
+            //选中第一个坐标点坐在的组件
+            selection.setSelectedCreator((XCreator) designer.getRootComponent().getComponentAt(leftUpX, leftUpY));
+            Rectangle rectangle = selection.getRelativeBounds();
+            if (hasSelectedPasteSource()) {
+                selectedPaste();
+            } else {
+                FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
+                        clipboard,
+                        rectangle.x + rectangle.width / 2,
+                        rectangle.y + DELTA_X_Y);
+            }
         }
     }