REPORT-65724 安全性-水印-水印公式不解析

1.从全局读取水印

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java

@@ -131,6 +131,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
         layoutCombox.setSelectedIndex(1);
         stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle());
         boundPane.populate();
+        //从全局读取水印
         watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplateAndGlobal(getCurrentIOFile()));
     }
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -162,6 +162,7 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
         adaptComboBox.setSelectedIndex(ob.getCompState());
         componentIntervel.setValue(ob.getCompInterval());
         stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle());
+        //从全局读取水印
         watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplateAndGlobal(getCurrentIOFile()));
     }