Browse Source

Merge pull request #2855 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '2fd6f3f949e59064e5b90938d6a1518877202e98':
  REPORT-43280 参数面板控件选不到
  REPORT-42470 调整下位置 保证原顺序不变
  REPORT-42470 假保存
  REPORT-43280 参数面板控件选不到
research/11.0
superman 4 years ago
parent
commit
36955ac0d3
  1. 2
      designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java

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

@ -301,12 +301,14 @@ public class StateModel {
Rectangle bounds = createCurrentBounds(x, y); Rectangle bounds = createCurrentBounds(x, y);
// 有参数面板时 要考虑下参数面板的高度影响 // 有参数面板时 要考虑下参数面板的高度影响
if (!designer.isFormParaDesigner()) {
int yOffset = 0; int yOffset = 0;
XLayoutContainer paramComponent = designer.getParaComponent(); XLayoutContainer paramComponent = designer.getParaComponent();
if (paramComponent != null) { if (paramComponent != null) {
yOffset = paramComponent.getHeight(); yOffset = paramComponent.getHeight();
} }
bounds.y = Math.max(bounds.y - yOffset, 0); 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