From 768b74b87b32dfeff62658b2f5307c76a7f537b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Wed, 18 Aug 2021 16:32:58 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-56926&REPORT-57238=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E4=BF=AE=E5=A4=8D=E8=BF=99=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=BC=95=E8=B5=B7=E7=9A=84=E6=96=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/MultiSelectionArrangement.java    | 2 ++
 .../mainframe/widget/ui/FormMultiWidgetCardPane.java      | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/MultiSelectionArrangement.java b/designer-form/src/main/java/com/fr/design/mainframe/MultiSelectionArrangement.java
index 54298e186..27756de83 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/MultiSelectionArrangement.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/MultiSelectionArrangement.java
@@ -76,6 +76,7 @@ public class MultiSelectionArrangement {
 
     // 水平分布，手动，传入一个间距，排列selectedCreators
     public void horizontalManualDistribution(int gap) {
+        sortHorizontal();
         reSizeRecByHorizontal(gap);
         horizontalDistribution(gap);
     }
@@ -150,6 +151,7 @@ public class MultiSelectionArrangement {
     }
 
     public void verticalManualDistribution(int gap) {
+        sortVertical();
         reSizeRecByVertical(gap);
         verticalDistribution(gap);
     }
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java
index 30dc8124a..0263df5bf 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java
@@ -158,7 +158,13 @@ public class FormMultiWidgetCardPane extends FormWidgetCardPane {
     }
 
     private UINumberField createIntNumberField(boolean isVertical, String tipText) {
-        final UINumberField numberField = new UINumberField();
+        final UINumberField numberField = new UINumberField() {
+            private static final long serialVersionUID = -448512934137620557L;
+
+            public boolean shouldResponseChangeListener() {
+                return false;
+            }
+        };
         numberField.setPlaceholder(tipText);
         numberField.addFocusListener(new FocusAdapter() {
             @Override