From f9ad77b8ed72c6ff780bbc05d3ec008c5d155dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Fri, 25 Mar 2022 09:47:02 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-68175=20release=E5=90=88=E5=B9=B6final?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beans/adapters/layout/FRAbsoluteLayoutAdapter.java      | 6 +++++-
 .../main/java/com/fr/design/mainframe/FormDesignerUI.java   | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
index 5bdfe3c298..5fb1025f30 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
@@ -4,6 +4,7 @@ import com.fr.design.beans.GroupModel;
 import com.fr.design.designer.beans.ConstraintsGroupModel;
 import com.fr.design.designer.beans.HoverPainter;
 import com.fr.design.designer.beans.models.DraggingModel;
+import com.fr.design.designer.beans.models.StateModel;
 import com.fr.design.designer.beans.painters.FRAbsoluteLayoutPainter;
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.properties.BoundsGroupModel;
@@ -353,7 +354,10 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 	public void dragging(DraggingModel model) {
 		FormDesigner designer = model.getDesigner();
 		MouseEvent dragEvent = model.getCurrentDragEvent();
-		designer.getStateModel().dragging(dragEvent);
+		StateModel stateModel = designer.getStateModel();
+		if (stateModel.dragable()) {
+			stateModel.dragging(dragEvent);
+		}
 	}
 
 	@Override
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java
index 8307e945f6..1f3a7caf53 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java
@@ -224,6 +224,9 @@ public class FormDesignerUI extends ComponentUI {
         }
 
         XCreator creator = draggingModel.getCreator();
+        if (!creator.isSupportDrag()) {
+            return false;
+        }
         int leftTopX = draggingModel.getCreatorLeftTopX();
         int leftTopY = draggingModel.getCreatorLeftTopY();