Merge pull request #1454 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '18058f3964b0cb067f64db71f4f1af918b955acf':
  MOBILE-25615 同步到release

designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java

@@ -56,6 +56,9 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
 
         final FormMobileAttrPane mobileAttrPane = new FormMobileAttrPane();
         mobileAttrPane.populateBean(mobileAttr);
+
+        final boolean oldMobileOnly = mobileAttr.isMobileOnly();
+        final boolean oldAdaptive = mobileAttr.isAdaptivePropertyAutoMatch();
         BasicDialog dialog = mobileAttrPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
             @Override
             public void doOk() {
@@ -75,13 +78,16 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
                 recordFunction();
                 // 设置移动端属性并刷新界面
                 formTpl.setFormMobileAttr(formMobileAttr);  // 会调整 body 的自适应布局，放到最后
-                ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
+                boolean changeSize = (!oldMobileOnly && formMobileAttr.isMobileOnly()) || (oldMobileOnly && !formMobileAttr.isMobileOnly());
+                if (changeSize) {
+                    ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
+                }
                 jf.getFormDesign().getSelectionModel().setSelectedCreator(jf.getFormDesign().getRootComponent());
-                //当自适应属性自动匹配处于勾选状态 进行切换
+                //改变布局为自适应布局,只在移动端属性设置保存后改变一次
-                if (formMobileAttr.isMobileOnly() && formMobileAttr.isAdaptivePropertyAutoMatch()) {
+                boolean changeLayout = !oldAdaptive && formMobileAttr.isAdaptivePropertyAutoMatch();
+                if (changeLayout) {
                     doChangeBodyLayout();
                 }
-
                 WidgetPropertyPane.getInstance().refreshDockingView();
                 jf.fireTargetModified();
             }

designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java

@@ -47,9 +47,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
             public void doChange() {
                 boolean mobileOnlyCheckSelected = mobileOnlyCheck.isSelected();
                 mobileSettingsPane.setVisible(mobileOnlyCheckSelected);
-                if (mobileOnlyCheckSelected) {
+                adaptivePropertyAutoMatchCheck.setSelected(mobileOnlyCheckSelected);
-                    adaptivePropertyAutoMatchCheck.setSelected(true);
-                }
             }
         });