Browse Source

Merge pull request #321 in DESIGN/design from ~XIAOXIA/design-10:release/10.0 to release/10.0

* commit 'c592ad0f6c26603472be1c8244137417fb01431e':
  REPORT-10328 【10.0冒烟】表单从横向自适应切到绝对布局,缩放会有问题
final/10.0
xiaoxia 6 years ago
parent
commit
f94f843d77
  1. 6
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

6
designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@ -173,6 +173,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
if (value instanceof Integer) {
state = (Integer) value;
}
//todo 验证下
layout.setLayoutType(WBodyLayoutType.parse(state));
layout.setCompState(adaptComboBox.getSelectedIndex());
try {
if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) {
WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body");
@ -201,9 +204,6 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
FineLoggerFactory.getLogger().error(e.getMessage());
}
//todo 验证下
layout.setLayoutType(WBodyLayoutType.parse(state));
layout.setCompState(adaptComboBox.getSelectedIndex());
int intervelValue = (int)componentIntervel.getValue();
if (xWFitLayout.canAddInterval(intervelValue)) {

Loading…
Cancel
Save