Browse Source

Pull request #7958: REPORT-66966 FR11决策报表-放在推荐布局占位块里的报表块组件,拖拽调整尺寸,保存模板再打开模板,再拖拽调整报表块组件尺寸,会出现和空白块重叠错乱的现象

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit '40192acd81c796cdf979584b6d96ad1cc5bb781a':
  REPORT-66966 FR11决策报表-放在推荐布局占位块里的报表块组件,拖拽调整尺寸,保存模板再打开模板,再拖拽调整报表块组件尺寸,会出现和空白块重叠错乱的现象
bugfix/11.0
kerry 3 years ago
parent
commit
149ede843d
  1. 4
      designer-form/src/main/java/com/fr/design/fit/NewJForm.java

4
designer-form/src/main/java/com/fr/design/fit/NewJForm.java

@ -179,11 +179,13 @@ public class NewJForm extends JForm {
FRFitLayoutAdapter layoutAdapter = (FRFitLayoutAdapter) adapter; FRFitLayoutAdapter layoutAdapter = (FRFitLayoutAdapter) adapter;
layoutAdapter.setEdit(true); layoutAdapter.setEdit(true);
layoutAdapter.calculateBounds(backupBounds, xwTitleLayout.getBounds(), xwTitleLayout, row, difference); layoutAdapter.calculateBounds(backupBounds, xwTitleLayout.getBounds(), xwTitleLayout, row, difference);
} } else {
XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(xwTitleLayout); XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(xwTitleLayout);
if (parent != null && parent.toData() != null) { if (parent != null && parent.toData() != null) {
parent.toData().setBounds(xwTitleLayout.toData(), xwTitleLayout.getBounds()); parent.toData().setBounds(xwTitleLayout.toData(), xwTitleLayout.getBounds());
} }
}
} }

Loading…
Cancel
Save