Browse Source

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

* commit '2c10bd563b6d5e4fbeac765a8e8bae1a27fdfa08':
  REPORT-65474 设计器-水印,平台改变水印开关,模板水印变成了模板单独设置 1.新建水印默认不是模板水印,当新建模板水印的时候,进行配置即可。
bugfix/11.0
superman 3 years ago
parent
commit
78e430bcbc
  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 @Override
protected void populateServerSettings() { protected void populateServerSettings() {
WatermarkAttr watermarkAttr = ReportUtils.getWatermarkAttrFromServerConfig(); WatermarkAttr watermarkAttr = ReportUtils.getWatermarkAttrFromServerConfig();
watermarkAttr.setValid(true);
watermarkPane.populate(watermarkAttr); watermarkPane.populate(watermarkAttr);
} }
@ -55,8 +56,9 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
public WatermarkAttr update() { public WatermarkAttr update() {
WatermarkAttr watermark = watermarkPane.update(); WatermarkAttr watermark = watermarkPane.update();
if (isUsingServerSettings()) { if (!isUsingServerSettings()) {
watermark.setValid(false); watermark.setValid(true);
watermark.setWaterMarkProvider(WaterMarkProvideConstant.TEMPLATE);
} }
return watermark; return watermark;
} }

Loading…
Cancel
Save