From 44bc4e93b7ae0577b5bfb7f0ce2d05f1a80b1426 Mon Sep 17 00:00:00 2001
From: Hoky <303455184@qq.com>
Date: Mon, 24 Jan 2022 11:03:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=20=E6=96=B0=E5=BB=BA=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0npe=201.=E6=96=B0=E5=BB=BA=E5=86=B3=E7=AD=96=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=97=B6=E6=94=B9=E6=88=90=E4=BB=8E=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/designer/layout/FRFitLayoutDefinePane.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
index 6afdad367e..341066e888 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@@ -18,7 +18,6 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.xpane.LayoutStylePane;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelectionUtils;
@@ -38,9 +37,12 @@ import com.fr.general.act.BorderPacker;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.core.ReportUtils;
 
-import javax.swing.*;
-import javax.swing.border.Border;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 
 /**
  * Created by ibm on 2017/8/2.
@@ -160,7 +162,7 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
         adaptComboBox.setSelectedIndex(ob.getCompState());
         componentIntervel.setValue(ob.getCompInterval());
         stylePane.populateBean((LayoutBorderStyle) ob.getBorderStyle());
-        watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplate(getCurrentIOFile()));
+        watermarkEditor.setValue(ReportUtils.getWatermarkAttrFromTemplateAndGlobal(getCurrentIOFile()));
     }
 
     private XLayoutContainer selectedBodyLayout(FormDesigner formDesigner) {

From b7e5268ee19a3bb8d67812d4cc8d5e935096b9ed Mon Sep 17 00:00:00 2001
From: Hoky <303455184@qq.com>
Date: Tue, 22 Feb 2022 11:18:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-9928=20=E9=87=8D=E6=9E=84=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=201.=E6=B0=B4=E5=8D=B0=E6=8E=A5=E5=8F=A3=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/report/ReportWatermarkAction.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java
index a07f42456f..92d14334d6 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java
+++ b/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() {