From 9d3100c36c059aaaaee8085f26b4b037d3d65bc8 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 9 Jan 2020 11:48:59 +0800
Subject: [PATCH] =?UTF-8?q?MOBILE-24940=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8B=BE=E9=80=89=E5=8F=8C=E6=8C=87=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=90=8E=20=20=E5=B8=83=E5=B1=80=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/actions/FormMobileAttrAction.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java b/designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java
index d77078fad6..b59879c97e 100644
--- a/designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java
+++ b/designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java
@@ -77,8 +77,10 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
                 formTpl.setFormMobileAttr(formMobileAttr);  // 会调整 body 的自适应布局，放到最后
                 ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
                 jf.getFormDesign().getSelectionModel().setSelectedCreator(jf.getFormDesign().getRootComponent());
-                //改变布局为自适应布局,只在移动端属性设置保存后改变一次
-                doChangeBodyLayout();
+                //当自适应属性自动匹配处于勾选状态 进行切换
+                if (formMobileAttr.isAdaptivePropertyAutoMatch()) {
+                    doChangeBodyLayout();
+                }
 
                 WidgetPropertyPane.getInstance().refreshDockingView();
                 jf.fireTargetModified();