From 03ae87935a5ce59af7fc70aee38b21d88821ed91 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Wed, 12 Apr 2017 09:06:25 +0800
Subject: [PATCH] =?UTF-8?q?report-1945=20=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E6=97=A0=E7=BB=84=E4=BB=B6=E6=98=AF=E7=B2=98=E8=B4=B4=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/beans/models/SelectionModel.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java b/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
index dc4ea6a49..4b7b97e7d 100644
--- a/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
+++ b/designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
@@ -149,7 +149,15 @@ public class SelectionModel {
                     int leftUpY = designer.getRootComponent().toData().getMargin().getTop() + 1;
                     //选中第一个坐标点坐在的组件
                     selection.setSelectedCreator((XCreator) designer.getRootComponent().getComponentAt(leftUpX, leftUpY));
-                    pasteFromClipBoard();
+                    if (hasSelectedPasteSource()) {
+                        selectedPaste();
+                    } else {
+                        FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
+                                clipboard,
+                                DELTA_X_Y,
+                                DELTA_X_Y);
+                    }
+
                 }
             } else {
                 //绝对布局