From 1e33946812c30a8c7cc73404cc073a195f6c7c95 Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Wed, 18 Oct 2017 16:21:39 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5084=20[9.0=E4=BA=8C=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=B8=AD=E6=9C=89?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BA=86=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E6=89=93=E5=BC=80=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/ElementCasePaneDelegate.java  | 4 +++-
 .../src/com/fr/design/gui/controlpane/UIListControlPane.java  | 2 +-
 designer_base/src/com/fr/design/mainframe/DesignerFrame.java  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index bbc87fa78c..0f1c38bd2c 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -75,7 +75,9 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
             EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             return;
         }
-        CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+        if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
+            CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+        }
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
index fd519b0aa0..a148fd3b83 100644
--- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
+++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
@@ -98,7 +98,7 @@ public abstract class UIListControlPane extends UIControlPane {
                 // richie:避免多次update和populate大大降低效率
                 if (!evt.getValueIsAdjusting()) {
                     // shoc 切换的时候加检验
-                    if (hasInvalid(false) || DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) {
+                    if (hasInvalid(false)) {
                         return;
                     }
                     ((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).update();
diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
index 279873f0b4..1881bd02c0 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
@@ -925,7 +925,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         } else {
             this.addAndActivateJTemplate(jt);
         }
-
+        //REPORT-5084：激活后刷新一下右側面板
+        jt.refreshEastPropertiesPane();
     }
 
     /**