From b02eac522fda8e3f28471c569070ac7464822bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Thu, 6 Jan 2022 10:27:36 +0800
Subject: [PATCH] REPORT-64149

---
 .../com/fr/design/mainframe/FormDesigner.java | 26 +++++--------------
 .../guide/creator/GuideCreateUtils.java       |  2 +-
 2 files changed, 8 insertions(+), 20 deletions(-)

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 ccba18cb52..3f7d6e983a 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
@@ -1214,20 +1214,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         this.repaint();
     }
 
-    /**
-     * 拖拽准备
-     *
-     * @param xCreator 组件
-     */
-    public void startDraggingBean(XCreator xCreator) {
-        // 根据所选择的组件的BeanInfo生成相应的AddingModel
-        // AddingModel和StateModel不一样，适合当前选择的组件相关的
-        addingModel = new AddingModel(this, xCreator);
-        this.setDropTarget(new FormCreatorDropTarget(this));
-        // 触发状态添加模式事件
-        repaint();
-    }
-
     /**
      * 拖入新的组件
      *
@@ -1236,11 +1222,13 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      * @param currentDragEvent
      */
     public void startDraggingNewWidget(XCreator xCreator, MouseEvent startDragEvent, MouseEvent currentDragEvent) {
-        draggingModel = new DraggingModel()
-                .designer(this)
-                .creator(xCreator)
-                .startDragEvent(startDragEvent)
-                .currentDragEvent(currentDragEvent);
+        if (startDragEvent != null && currentDragEvent != null) {
+            draggingModel = new DraggingModel()
+                    .designer(this)
+                    .creator(xCreator)
+                    .startDragEvent(startDragEvent)
+                    .currentDragEvent(currentDragEvent);
+        }
         addingModel = new AddingModel(this, xCreator);
         this.setDropTarget(new FormCreatorDropTarget(this));
         repaint();
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java
index 39c6b55742..bb2191b782 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java
@@ -139,7 +139,7 @@ public class GuideCreateUtils {
             designer.setDropTarget(new FormCreatorDropTarget(designer));
             designer.repaint();
         } else {
-            designer.startDraggingBean(xCreator);
+            designer.startDraggingNewWidget(xCreator, null, null);
         }
 
         FormCreatorDropTarget dropTarget = (FormCreatorDropTarget) designer.getDropTarget();