diff --git a/designer/src/com/fr/design/report/PageSetupPane.java b/designer/src/com/fr/design/report/PageSetupPane.java index 93460b7cc9..883690a088 100644 --- a/designer/src/com/fr/design/report/PageSetupPane.java +++ b/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); } } diff --git a/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java b/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java index 719f958fa7..2bf56ed76b 100644 --- a/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java +++ b/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java @@ -49,7 +49,11 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane 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()); + widthPane.setEnabled(!formMobileAttr.isMobileOnly()); } MouseWheelListener showValSpinnerMouseWheelListener = new MouseWheelListener() { diff --git a/designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java b/designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java index bb5bf0ce78..17a4458bd8 100644 --- a/designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java +++ b/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 { 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();