From 9b84c7761eb42218bb27c439239cef06efe9cb19 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Tue, 26 Dec 2017 10:33:13 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6245=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8A=9B=E9=94=99=20=E4=BC=98=E5=8C=96=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=A8=A1=E6=9D=BF=E9=80=9F=E5=BA=A6=E6=97=B6=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E4=BA=86=20REPORT-5084=E7=9A=84pr=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/actions/edit/EditFloatElementNameAction.java    | 2 +-
 .../src/com/fr/design/mainframe/ElementCasePaneDelegate.java  | 4 +---
 designer/src/com/fr/design/widget/WidgetEventPane.java        | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java b/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
index 6f235307e1..15a0b07d18 100644
--- a/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
+++ b/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
@@ -39,7 +39,7 @@ public class EditFloatElementNameAction extends FloatSelectionAction {
 				if (report.getFloatElement(name) == null) {
 					selectedFloatElement.setName(name);
 				}
-				reportPane.setSelection(new FloatSelection(name));
+				((FloatSelection) reportPane.getSelection()).setFloatName(name);
 			}                
         });
         nameDialog.setVisible(true);
diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index 8d25463ab8..cc57b7a852 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -75,9 +75,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
             EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             return;
         }
-        if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
-            CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
-        }
+        CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
diff --git a/designer/src/com/fr/design/widget/WidgetEventPane.java b/designer/src/com/fr/design/widget/WidgetEventPane.java
index f1342f9dea..f1139210cb 100644
--- a/designer/src/com/fr/design/widget/WidgetEventPane.java
+++ b/designer/src/com/fr/design/widget/WidgetEventPane.java
@@ -91,7 +91,7 @@ public class WidgetEventPane extends ObjectUIControlPane {
 
 				@Override
 				protected DBManipulationPane createDBManipulationPane() {
-					if(epane == null) {
+					if(epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
 						return autoCreateDBManipulationInWidgetEventPane();
 					}