Browse Source

Merge pull request #1306 in BA/design from ~ZHOUPING/design:release/9.0 to release/9.0

* commit '5c2e6b26dcd5f7723d92635e09242800d61267a0':
  REPORT-4718 [9.0内测]打开绝对布局决策报表,body组件中显示自适应布局的属性变化
master
superman 7 years ago
parent
commit
f3041ea33b
  1. 10
      designer_form/src/com/fr/design/designer/beans/models/StateModel.java

10
designer_form/src/com/fr/design/designer/beans/models/StateModel.java

@ -265,7 +265,15 @@ public class StateModel {
Rectangle bounds = createCurrentBounds(x, y);
if ((x != currentX) || (y != currentY)) {
selectionModel.setSelectedCreators(getHotspotCreators(bounds, designer.getRootComponent()));
ArrayList<XCreator> creators = getHotspotCreators(bounds, designer.getRootComponent());
if (creators.isEmpty() && designer.getRootComponent().getXCreatorCount() > 0) {
//当初始化布局是绝对布局的时候特殊处理,画框的时候若没有控件,默认焦点设置在绝对布局上
XCreator layout = designer.getRootComponent().getXCreator(0);
if (layout.acceptType(XWAbsoluteBodyLayout.class)) {
creators.add(layout);
}
}
selectionModel.setSelectedCreators(creators);
}
selectionModel.setHotspotBounds(null);
}

Loading…
Cancel
Save