Browse Source

MOBILE-6262 FR9.0设计器提供手机端设计画布参考尺寸=>当宽度为375时,点击确定后,没有设置高度为默认值

plough 7 years ago
parent
commit
c62644c529
  1. 15
      designer_form/src/com/fr/design/mainframe/FormArea.java
  2. 2
      designer_form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java

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

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

2
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();

Loading…
Cancel
Save