Merge pull request #1405 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit '6ef9b8cdaf4d4614ba7ece787d02c660afafefa3':
  MOBILE-24962 && MOBILE-24940 合到final

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());
-                //改变布局为自适应布局,只在移动端属性设置保存后改变一次
+                //当自适应属性自动匹配处于勾选状态 进行切换
+                if (formMobileAttr.isMobileOnly() && formMobileAttr.isAdaptivePropertyAutoMatch()) {
                     doChangeBodyLayout();
+                }
 
                 WidgetPropertyPane.getInstance().refreshDockingView();
                 jf.fireTargetModified();

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java

@@ -115,8 +115,9 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
         boolean flag = !shouldHidePadding(designer);
         advancePane.setVisible(flag);
         layoutPane.setVisible(flag);
-        frozenPane.setVisible(appRelayoutCheck.isSelected());
-        bookMarkSettingPane.setVisible(appRelayoutCheck.isSelected());
+        boolean appRelayout = FormDesignerUtils.isAppRelayout(designer);
+        frozenPane.setVisible(appRelayout);
+        bookMarkSettingPane.setVisible(appRelayout);
         return holder;
     }
 
@@ -172,6 +173,7 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
         advancePane.setVisible(appPaddingVisible);
         layoutPane.setVisible(appPaddingVisible);
         frozenPane.setVisible(appRelayout);
+        bookMarkSettingPane.setVisible(appRelayout);
         mobileWidgetListPane.updateToDesigner();
         designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);