From 04e4b2459767a82f877139f253cb90a44a7d28a0 Mon Sep 17 00:00:00 2001
From: "Joe.Jiang" <Joe.Jiang@fanruan.com>
Date: Thu, 24 Oct 2019 09:23:36 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-19102=20=E3=80=90=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E3=80=91=E7=94=B5=E8=AF=9D-=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99=E8=AE=BE=E7=BD=AE=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=84=E5=88=99=E6=9C=AA=E4=BF=9D=E5=AD=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E4=B8=94=E4=B8=8B=E6=8B=89=E6=A1=86=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=A9=BA=E7=99=BD=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/CellWidgetPropertyPane.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
index 59a58231a..246bb72aa 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
@@ -109,8 +109,11 @@ public class CellWidgetPropertyPane extends BasicPane {
         if (finalCS.isSelectedOneCell(ePane)) {
             if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去
                 tplEC.addCellElement(cellElement);
-            } else if (tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow()) != null) {
-                cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
+            } else {
+                TemplateCellElement newCellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
+                if (newCellElement != null) {
+                    cellElement = newCellElement;
+                }
             }
             setCellWidget(cellWidget, cellElement);
         } else {