Browse Source

Merge pull request #8004 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'd512d7b014b1051ec359df14997d2f02db7ce190':
  KERNEL-9928 重构水印 1.水印接口规范
  无jira 新建水印npe 1.新建决策模板时改成从全局读取水印
bugfix/10.0
superman 3 years ago
parent
commit
c04f36c71c
  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;
import com.fr.base.iofile.attr.WatermarkAttr;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.JWorkBookAction;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.mainframe.DesignerContext;
@ -39,7 +37,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
return;
}
final WorkBook wbTpl = jwb.getTarget();
WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplate(wbTpl);
WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplateAndGlobal(wbTpl);
final WatermarkSettingPane watermarkPane = new WatermarkSettingPane();
watermarkPane.populate(watermark);
watermarkPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {

Loading…
Cancel
Save