Browse Source

Merge pull request #1390 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit '8330185a1691fe3fbe3b677e5a45ea0bcc461661':
  REPORT-25447 10.0.4设计器表单设计奇怪的bug
feature/big-screen
kerry 5 years ago
parent
commit
38eb7ba955
  1. 10
      designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

10
designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java

@ -241,16 +241,12 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
LayoutUtils.layoutRootContainer(container); LayoutUtils.layoutRootContainer(container);
}else{ }else{
//添加到其父组件布局中的时候,要用其父组件布局添加 //添加到其父组件布局中的时候,要用其父组件布局添加
container.getLayoutAdapter().addBean(creator, x, y);
if (creator.shouldScaleCreator() || creator.hasTitleStyle()) { if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
addParentCreator(creator); XLayoutContainer parentPanel = creator.initCreatorWrapper(creator.getHeight());
container.getLayoutAdapter().addBean(parentPanel, x, y);
} else { } else {
container.add(creator, creator.toData().getWidgetName(),0); container.getLayoutAdapter().addBean(creator, x, y);
} }
XWFitLayout layout = (XWFitLayout) container;
// 更新对应的BoundsWidget
layout.updateBoundsWidget();
updateCreatorBackBound();
} }
} }

Loading…
Cancel
Save