Browse Source

日历、下拉框等全被Scale包住了,设置成真实的组件

research/10.0
WeiYanglu 5 years ago
parent
commit
2d8fef4603
  1. 8
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java
  2. 7
      designer-form/src/main/java/com/fr/design/designer/properties/mobile/MobileStylePropertyUI.java

8
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStylePane.java

@ -6,7 +6,9 @@ import com.fr.design.dialog.BasicPane;
import com.fr.design.fun.MobileWidgetStyleProvider; import com.fr.design.fun.MobileWidgetStyleProvider;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WScaleLayout;
import com.fr.form.ui.mobile.MobileStyle; import com.fr.form.ui.mobile.MobileStyle;
import com.fr.form.ui.widget.CRBoundsWidget;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
@ -27,7 +29,11 @@ public class MobileStylePane extends BasicPane {
private Map<String, BasicBeanPane<MobileStyle>> map = new HashMap<>(); private Map<String, BasicBeanPane<MobileStyle>> map = new HashMap<>();
public MobileStylePane(Widget widget) { public MobileStylePane(Widget widget) {
this.widget = widget; if(widget instanceof WScaleLayout) {
this.widget = ((CRBoundsWidget)((WScaleLayout) widget).getBoundsWidget()).getWidget();
} else {
this.widget = widget;
}
init(); init();
} }

7
designer-form/src/main/java/com/fr/design/designer/properties/mobile/MobileStylePropertyUI.java

@ -1,6 +1,7 @@
package com.fr.design.designer.properties.mobile; package com.fr.design.designer.properties.mobile;
import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XWScaleLayout;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.gui.itable.AbstractPropertyTable;
@ -11,7 +12,11 @@ public class MobileStylePropertyUI extends AbstractWidgetPropertyUIProvider {
private XCreator xCreator; private XCreator xCreator;
public MobileStylePropertyUI(XCreator xCreator) { public MobileStylePropertyUI(XCreator xCreator) {
this.xCreator = xCreator; if(xCreator instanceof XWScaleLayout) {
this.xCreator = xCreator.getEditingChildCreator();
} else {
this.xCreator = xCreator;
}
} }
@Override @Override

Loading…
Cancel
Save