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

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

* commit 'b74f5d3bd323a8a78d7ada1bd022e41ba53d7e44':
  REPORT-65290 设计器-水印，平台改变水印开关，模板水印变成了模板单独设置 1.修改水印的isvalid

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

@@ -1,5 +1,6 @@
 package com.fr.design.report;
 
+import com.fr.base.iofile.attr.WaterMarkProvideConstant;
 import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.dialog.AbstractTemplateServerSettingPane;
 import com.fr.report.core.ReportUtils;
@@ -42,13 +43,13 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     }
 
     public void populate(WatermarkAttr watermark) {
-        if (!watermark.isValid()) {
+        if (watermark.getWaterMarkProvider().equals(WaterMarkProvideConstant.TEMPLATE)) {
+            chooseComboBox.setSelectedIndex(SINGLE_SET);
+            watermarkPane.populate(watermark);
+        } else {
             chooseComboBox.setSelectedIndex(SERVER_SET);
             populateServerSettings();
-            return;
         }
-        chooseComboBox.setSelectedIndex(SINGLE_SET);
-        watermarkPane.populate(watermark);
     }