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

* commit '78e430bcbc52281b7655ca60e56317365f952fba':
  REPORT-65474 设计器-水印，平台改变水印开关，模板水印变成了模板单独设置 1.新建水印默认不是模板水印，当新建模板水印的时候，进行配置即可。

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()) {
+        if (!isUsingServerSettings()) {
-            watermark.setValid(false);
+            watermark.setValid(true);
+            watermark.setWaterMarkProvider(WaterMarkProvideConstant.TEMPLATE);
         }
         return watermark;
     }