Merge pull request #1629 in BA/design from ~PLOUGH/design:feature/9.0 to feature/9.0

* commit 'c62644c529d7c42d040c4ba9d9de6a9fa265996c':
  MOBILE-6262 FR9.0设计器提供手机端设计画布参考尺寸=>当宽度为375时，点击确定后，没有设置高度为默认值
  REPORT-6687 【设计器】表单》一键设置手机端模板画布大小功能》开启自适应属性自动匹配的子功能默认没有勾选上
  REPORT-6681 【设计器】报表》一键设置手机端模板画布大小功能》页面设置》“纸张大小-自定义”中宽度值为最大值时，向下箭头点击无效

designer/src/com/fr/design/report/PageSetupPane.java

@@ -443,6 +443,7 @@ public class PageSetupPane extends BasicPane {
                 } else {  // 英寸
                     maxWidth = PaperSize.PAPERSIZE_MOBILE.getWidth().toINCHValue4Scale3();
                 }
+                maxWidth = Math.round(maxWidth * 100) / 100.0;  // 保留两位小数
                 ((SpinnerNumberModel)paperWidthSpinner.getModel()).setMaximum(maxWidth);
             }
         }

designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java

@@ -49,7 +49,11 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
         mobileOnlyCheck.registerChangeListener(new UIObserverListener() {
             @Override
             public void doChange() {
-                mobileSettingsPane.setVisible(mobileOnlyCheck.isSelected());
+                boolean mobileOnlyCheckSelected = mobileOnlyCheck.isSelected();
+                mobileSettingsPane.setVisible(mobileOnlyCheckSelected);
+                if (mobileOnlyCheckSelected) {
+                    adaptivePropertyAutoMatchCheck.setSelected(true);
+                }
             }
         });
 

designer_form/src/com/fr/design/mainframe/FormArea.java

@@ -102,27 +102,18 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         }
         this.setFocusTraversalKeysEnabled(false);
         this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener);
-        initMobileAttrModifiedListener();
+        widthPane.setEnabled(!jForm.getTarget().getFormMobileAttr().isMobileOnly());
     }
 
-    private void initMobileAttrModifiedListener() {
+    public void onMobileAttrModified() {
-        if (jForm == null) {
+        FormMobileAttr formMobileAttr = jForm.getTarget().getFormMobileAttr();
-            return;
+        if (formMobileAttr.isMobileOnly()) {
+            widthPane.setValue(MOBILE_ONLY_WIDTH);
+            changeWidthPaneValue(MOBILE_ONLY_WIDTH);
+            heightPane.setValue(MOBILE_ONLY_HEIGHT);
+            changeHeightPaneValue(MOBILE_ONLY_HEIGHT);
         }
-        jForm.addTargetModifiedListener(new TargetModifiedListener() {
+        widthPane.setEnabled(!formMobileAttr.isMobileOnly());
-            @Override
-            public void targetModified(TargetModifiedEvent e) {
-                FormMobileAttr formMobileAttr = jForm.getTarget().getFormMobileAttr();
-                if (formMobileAttr.isMobileOnly() && Math.abs(widthPane.getValue() - MOBILE_ONLY_WIDTH) > 0.0000001) {
-                    widthPane.setValue(MOBILE_ONLY_WIDTH);
-                    changeWidthPaneValue(MOBILE_ONLY_WIDTH);
-                    heightPane.setValue(MOBILE_ONLY_HEIGHT);
-                    changeHeightPaneValue(MOBILE_ONLY_HEIGHT);
-                }
-                widthPane.setEnabled(!formMobileAttr.isMobileOnly());
-            }
-        });
-        widthPane.setEnabled(!jForm.getTarget().getFormMobileAttr().isMobileOnly());
     }
 
     MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() {

designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java

@@ -6,6 +6,7 @@ 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.JForm;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.form.main.Form;
@@ -52,6 +53,7 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
             public void doOk() {
                 FormMobileAttr formMobileAttr = mobileAttrPane.updateBean();
                 formTpl.setFormMobileAttr(formMobileAttr);
+                ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
                 jf.fireTargetModified();
                 if (formMobileAttr.isMobileOnly()) {
                     FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();