Browse Source

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

* commit 'a3d6a810edf3fbc99140acd1639781e6fbda1c25':
  KERNEL-9928 重构水印 1.水印接口规范
  REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
  REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读
feature/x
superman 3 years ago
parent
commit
2ec08f4739
  1. 4
      designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

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

@ -1,8 +1,6 @@
package com.fr.design.actions.report; package com.fr.design.actions.report;
import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.base.iofile.attr.WatermarkAttr;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.JWorkBookAction; import com.fr.design.actions.JWorkBookAction;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
@ -39,7 +37,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
return; return;
} }
final WorkBook wbTpl = jwb.getTarget(); final WorkBook wbTpl = jwb.getTarget();
WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplate(wbTpl); WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplateAndGlobal(wbTpl);
final WatermarkSettingPane watermarkPane = new WatermarkSettingPane(); final WatermarkSettingPane watermarkPane = new WatermarkSettingPane();
watermarkPane.populate(watermark); watermarkPane.populate(watermark);
watermarkPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { watermarkPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {

Loading…
Cancel
Save