Browse Source

Merge pull request #6970 in DESIGN/design from release/10.0 to release/11.0

* commit '22d1824127fe2296171820d6feb24bf133f1833d':
  REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
bugfix/11.0
superman 3 years ago
parent
commit
ac7a0078d5
  1. 16
      designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutStylePane.java

16
designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutStylePane.java

@ -23,6 +23,22 @@ public class CardTagLayoutStylePane extends LayoutStylePane {
return super.createNamedIntegralStylePane(isRootLayout, false); return super.createNamedIntegralStylePane(isRootLayout, false);
} }
private LayoutBorderStyle backupStyleFromPopulating = new LayoutBorderStyle();
@Override
public void populateBean(LayoutBorderStyle style) {
this.backupStyleFromPopulating = style;
super.populateBean(style);
}
@Override
public LayoutBorderStyle updateBean() {
LayoutBorderStyle style = super.updateBean();
style.setTitle(backupStyleFromPopulating.getTitle());
style.setType(backupStyleFromPopulating.getType());
return style;
}
@Override @Override
public void populateBean(LayoutBorderStyle style) { public void populateBean(LayoutBorderStyle style) {
this.backupStyleFromPopulating = style; this.backupStyleFromPopulating = style;

Loading…
Cancel
Save