From 35905bc6a495345d5854055c5c535b8ac645fc0f Mon Sep 17 00:00:00 2001
From: kuangshuai <kuangshuai_ios@icloud.com>
Date: Fri, 8 Oct 2021 18:24:08 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-60486=20=E5=B8=83=E5=B1=80=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=BC=95=E5=AF=BC=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?&=E5=8E=BB=E9=99=A4=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/guide/scene/DragScene.java   | 9 +++++----
 .../guide/creator/layout/ChangeLayoutComponentGuide.java | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/DragScene.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/DragScene.java
index c6a36d2ef..fdf8b2d4d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/DragScene.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/DragScene.java
@@ -45,19 +45,20 @@ public class DragScene extends AbstractGuideScene{
             new DragAndDropDragGestureListener(target, DnDConstants.ACTION_COPY_OR_MOVE){
                 @Override
                 public void dragDropEnd(DragSourceDropEvent dsde) {
-                    complete();
+                    if (dsde.getDropSuccess()) {
+                        complete();
+                    }
                 }
             };
         } else if (dragType == DragType.TO) {
-            target.setDropTarget(new DropTarget());
+            target.setDropTarget(new DropSceneTarget());
         }
     }
 
     private class DropSceneTarget extends DropTarget {
         @Override
         public synchronized void drop(DropTargetDropEvent dtde) {
-            super.drop(dtde);
-            complete();
+            dtde.dropComplete(true);
         }
     }
 }
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java
index eecf0a03c..c3c736ae1 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java
@@ -38,8 +38,7 @@ public class ChangeLayoutComponentGuide {
                 .nextScene(createScene3())
                 .nextScene(GuideSceneHelper.createFormDesignerBodyDisplayScene())
                 .nextScene(createScene4())
-                .nextScene(createScene5())
-                .nextScene(GuideSceneHelper.createPreviewClickScene());
+                .nextScene(createScene5());
 
         Guide guide = GuideBuilder.newInstance()
                 .setID(GuideIds.Guide.F001002)