Browse Source

Pull request #2193: REPORT-36619 报表设计界面拖选无法选中拖选区域

Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0

* commit '4516b03301cd334c01c0612bbee245e2be43d044':
  REPORT-36619 fix
  REPORT-36619 报表设计界面拖选无法选中拖选区域
bugfix/10.0
Hades 4 years ago
parent
commit
10c60254fc
  1. 7
      designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java

7
designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java

@ -300,6 +300,13 @@ public class StateModel {
int y = getMouseXY(e).y; int y = getMouseXY(e).y;
Rectangle bounds = createCurrentBounds(x, y); Rectangle bounds = createCurrentBounds(x, y);
// 有参数面板时 要考虑下参数面板的高度影响
int yOffset = 0;
XLayoutContainer paramComponent = designer.getParaComponent();
if (paramComponent != null) {
yOffset = paramComponent.getHeight();
}
bounds.y = Math.max(bounds.y - yOffset, 0);
if ((x != currentX) || (y != currentY)) { if ((x != currentX) || (y != currentY)) {
ArrayList<XCreator> creators = getHotspotCreators(bounds, designer.getRootComponent()); ArrayList<XCreator> creators = getHotspotCreators(bounds, designer.getRootComponent());

Loading…
Cancel
Save