From e0eb45ed53af6f2e502898502d61a16f4232ab41 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 7 Nov 2019 17:07:37 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-23246=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=BA=B8=E5=BC=A0=E9=A2=9C=E8=89=B2=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=E7=9A=84?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BC=9A=E5=8F=98=E7=99=BD=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer-realize/src/main/java/com/fr/grid/GridUI.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/grid/GridUI.java b/designer-realize/src/main/java/com/fr/grid/GridUI.java
index 1bb88c7b09..41ea565133 100644
--- a/designer-realize/src/main/java/com/fr/grid/GridUI.java
+++ b/designer-realize/src/main/java/com/fr/grid/GridUI.java
@@ -477,7 +477,14 @@ public class GridUI extends ComponentUI {
                     this.tmpRectangle.getHeight() - 1);
             // peter:对于合并的单元格,需要先白色的背景来清除背景.
             if (tmpCellElement.getColumnSpan() > 1 || tmpCellElement.getRowSpan() > 1) {
-                WHITE_Backgorund.paint(g2d, this.cell_back_rect);
+                // REPORT-23492 要看下是否设置了纸张背景 如果设置了按照背景来画
+                ReportSettingsProvider reportSettings = getReportSettings(reportPane.getEditingElementCase());
+                Background currentBackground = reportSettings.getBackground();
+                if (currentBackground != null) {
+                    currentBackground.paint(g2d, this.cell_back_rect);
+                } else {
+                    WHITE_Backgorund.paint(g2d, this.cell_back_rect);
+                }
                 //daniel:上面这里就有问题了啊....报表的背景在这个之前画的 会覆盖报表背景....不过只是设计器中看到预览浏览没问题
             }
             // peter:将这个元素添加到需要paint的元素列表当中去,留着画边框线..