Browse Source

Pull request #7401: KERNEL-9928 重构水印加载 && REPORT-65085 【设计器】新建表单,body那边的水印设置直接是为该模板单独设置

Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0

* commit 'a3e4b69c35e7abb5aae8b96e3d99573556912dd8':
  KERNEL-9928 重构水印加载 1.适配一下面板
bugfix/11.0
Hoky.He 3 years ago
parent
commit
3ca808d7bc
  1. 8
      designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java

8
designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java

@ -42,13 +42,13 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
}
public void populate(WatermarkAttr watermark) {
if (!watermark.isValid()) {
if (watermark.getWaterMarkProvider().equals("TEMPLATE")) {
chooseComboBox.setSelectedIndex(SINGLE_SET);
watermarkPane.populate(watermark);
} else {
chooseComboBox.setSelectedIndex(SERVER_SET);
populateServerSettings();
return;
}
chooseComboBox.setSelectedIndex(SINGLE_SET);
watermarkPane.populate(watermark);
}

Loading…
Cancel
Save