Browse Source

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

* commit '09d02ba5723eb610d1cf98c7cb2dbf8798e122f7':
  无JIRA任务 处理合并后冲突
feature/x
superman 3 years ago
parent
commit
deee9c29fb
  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,22 +23,6 @@ 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