From f2d684e167b360eeb42abded516b511611d5eef5 Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Fri, 21 Dec 2018 10:37:25 +0800
Subject: [PATCH] MOBILE-18801

---
 .../fr/design/actions/FormMobileAttrAction.java  | 16 ++++++++++++++++
 .../designer/layout/FRFitLayoutDefinePane.java   | 11 +++--------
 2 files changed, 19 insertions(+), 8 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 033ba5ea57..d77078fad6 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
@@ -3,11 +3,15 @@ package com.fr.design.actions;
 import com.fr.base.BaseUtils;
 import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark;
 import com.fr.design.actions.JTemplateAction;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.form.mobile.FormMobileAttrPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormArea;
+import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.menu.MenuKeySet;
@@ -73,6 +77,9 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
                 formTpl.setFormMobileAttr(formMobileAttr);  // 会调整 body 的自适应布局，放到最后
                 ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
                 jf.getFormDesign().getSelectionModel().setSelectedCreator(jf.getFormDesign().getRootComponent());
+                //改变布局为自适应布局,只在移动端属性设置保存后改变一次
+                doChangeBodyLayout();
+
                 WidgetPropertyPane.getInstance().refreshDockingView();
                 jf.fireTargetModified();
             }
@@ -80,6 +87,15 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
         dialog.setVisible(true);
     }
 
+    private void doChangeBodyLayout(){
+        FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+        XLayoutContainer rootLayout = formDesigner.getRootComponent();
+        if (rootLayout.getComponentCount() == 1 && rootLayout.getXCreator(0).acceptType(XWAbsoluteBodyLayout.class)) {
+            rootLayout = (XWAbsoluteBodyLayout) rootLayout.getXCreator(0);
+        }
+        ((XWFitLayout)formDesigner.getRootComponent()).switch2FitBodyLayout(rootLayout);
+    }
+
     @Focus(id = "com.fr.mobile.mobile_template_frm", text = "Fine-Design_Function_Mobile_Template_Frm", source = Original.EMBED)
     private void recordFunction() {
         // do nothing
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
index 0f3e0aba0a..dd19d7c812 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@@ -137,14 +137,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         XLayoutContainer rootLayout = selectedBodyLayout(formDesigner);
         if (rootLayout != formDesigner.getRootComponent()
                 && formDesigner.getSelectionModel().getSelection().getSelectedCreator() == formDesigner.getRootComponent()) {
-            //原单例面板populate根据当前样式populate属性面板，现加入移动端逻辑：可能需要根据面板属性改变样式
-            Form form = formDesigner.getTarget();
-            if (form.getFormMobileAttr().isMobileOnly() && form.getFormMobileAttr().isAdaptivePropertyAutoMatch()) {
-                ((XWFitLayout)formDesigner.getRootComponent()).switch2FitBodyLayout(rootLayout);
-            } else {
-                formDesigner.getSelectionModel().setSelectedCreators(
-                        FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{selectedBodyLayout(formDesigner).toData()}));
-            }
+            formDesigner.getSelectionModel().setSelectedCreators(
+                    FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{selectedBodyLayout(formDesigner).toData()}));
+
         }
         paddingBound.populate(ob);
         layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue());