Browse Source

Merge pull request #8108 in DESIGN/design from release/11.0 to feature/x

* commit '10d4e9eb0a0cebf1d861b31ecbd837ec249bb170':
  REPORT-65140 报表块图表块在设计器上改变大小的时候,保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸
feature/x
superman 3 years ago
parent
commit
bffdf8af98
  1. 7
      designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java

7
designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java

@ -764,6 +764,7 @@ public class XWFitLayout extends XLayoutContainer {
creator.setBackupBound(creator.getBounds()); creator.setBackupBound(creator.getBounds());
} }
} }
LayoutUtils.layoutContainer(this);
} }
private Rectangle recalculateWidgetBounds(Rectangle rec, int[] hors, int[] veris) { private Rectangle recalculateWidgetBounds(Rectangle rec, int[] hors, int[] veris) {
@ -831,11 +832,7 @@ public class XWFitLayout extends XLayoutContainer {
this.remove(oldCreator); this.remove(oldCreator);
this.add(newCreator); this.add(newCreator);
dealDirections(newCreator, false); dealDirections(newCreator, false);
//对于新增的绝对布局的组件,需要更新下内部组件的大小 this.updateBoundsWidget();
if (newCreator.acceptType(XWAbsoluteLayout.class)){
((XWAbsoluteLayout) newCreator).updateBoundsWidget();
newCreator.setBackupBound(newCreator.getBounds());
}
isRefreshing = false; isRefreshing = false;
LayoutUtils.layoutContainer(this); LayoutUtils.layoutContainer(this);
} }

Loading…
Cancel
Save