Browse Source

Pull request #7441: REPORT-65474 设计器-水印,平台改变水印开关,模板水印变成了模板单独设置

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

* commit '914aa241de62f41ef830b013e1b7726ef089f7cf':
  REPORT-65474 设计器-水印,平台改变水印开关,模板水印变成了模板单独设置 1.新建水印默认不是模板水印,当新建模板水印的时候,进行配置即可。
zheng-1641779399395
Hoky.He 3 years ago
parent
commit
2c10bd563b
  1. 6
      designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java

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

@ -34,6 +34,7 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
@Override
protected void populateServerSettings() {
WatermarkAttr watermarkAttr = ReportUtils.getWatermarkAttrFromServerConfig();
watermarkAttr.setValid(true);
watermarkPane.populate(watermarkAttr);
}
@ -55,8 +56,9 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
public WatermarkAttr update() {
WatermarkAttr watermark = watermarkPane.update();
if (isUsingServerSettings()) {
watermark.setValid(false);
if (!isUsingServerSettings()) {
watermark.setValid(true);
watermark.setWaterMarkProvider(WaterMarkProvideConstant.TEMPLATE);
}
return watermark;
}

Loading…
Cancel
Save