REPORT-8126 水印 前端样式属性, 浮层, 点击穿透=>后台数据传递

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

@@ -101,7 +101,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
     public void populateSubPane(WAbsoluteLayout ob) {
         layoutCombox.setSelectedIndex(1);
         borderStyleEditor.setValue(ob.getBorderStyle());
-        watermarkEditor.setValue(ReportUtils.getWatermarkFromIOFile(getCurrentIOFile()));
+        watermarkEditor.setValue(ReportUtils.getWatermarkFromAttrMarkFile(getCurrentIOFile()));
 
     }
 

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

@@ -143,7 +143,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         adaptComboBox.setSelectedIndex(ob.getCompState());
         componentIntervel.setValue(ob.getCompInterval());
         stylePane.setValue(ob.getBorderStyle());
-        watermarkEditor.setValue(ReportUtils.getWatermarkFromIOFile(getCurrentIOFile()));
+        watermarkEditor.setValue(ReportUtils.getWatermarkFromAttrMarkFile(getCurrentIOFile()));
     }
 
     private XLayoutContainer selectedBodyLayout(FormDesigner formDesigner) {

designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java

@@ -33,7 +33,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
             return;
         }
         final WorkBook wbTpl = jwb.getTarget();
-        WatermarkAttr watermark = ReportUtils.getWatermarkFromIOFile(wbTpl);
+        WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(wbTpl);
 
         final WatermarkPane watermarkPane = new WatermarkPane();
         watermarkPane.populate(watermark);