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

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

* commit '60128136a8f5217d4708ef311d9bb89054cb8f49':
  REPORT-65290 设计器-水印，平台改变水印开关，模板水印变成了模板单独设置 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()) {
-            watermark.setValid(false);
+        if (!isUsingServerSettings()) {
+            watermark.setValid(true);
+            watermark.setWaterMarkProvider(WaterMarkProvideConstant.TEMPLATE);
         }
         return watermark;
     }