From e53f35dccb68cc0b465f5fd5aa4b52768520308f Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 7 Nov 2017 16:19:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=81=9A=E5=90=88=E6=8A=A5=E8=A1=A8=E5=9D=97?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=E4=B8=8D?=
 =?UTF-8?q?=E5=BA=94=E6=9B=B4=E6=96=B0=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/poly/creator/ECBlockEditor.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/designer/src/com/fr/poly/creator/ECBlockEditor.java b/designer/src/com/fr/poly/creator/ECBlockEditor.java
index 9048987fbf..6cf370bb65 100644
--- a/designer/src/com/fr/poly/creator/ECBlockEditor.java
+++ b/designer/src/com/fr/poly/creator/ECBlockEditor.java
@@ -161,19 +161,18 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
             EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
             EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
+            // 条件属性
+            ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
+            conditionAttributesGroupPane.populate(editComponent);
 
             EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
-        }
 
-        EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());
+        }
 
         // 超级链接
         HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate()
                 .getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
         hyperlinkGroupPane.populate(editComponent);
-        // 条件属性
-        ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
-        conditionAttributesGroupPane.populate(editComponent);
     }
 
     private boolean isSelectedOneCell() {

From eb800a517fa6ce8dc224c73ecbf9e6747a9f4f10 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Wed, 8 Nov 2017 23:34:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-5284=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 258a9e22bb..f43419d47f 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -441,14 +441,8 @@ public abstract class ToolBarMenuDock {
             shortCuts.add(new VideoAction());
             shortCuts.add(new TutorialAction());
         }
-        shortCuts.add(SeparatorDef.DEFAULT);
-        shortCuts.add(SeparatorDef.DEFAULT);
-        if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
-            shortCuts.add(SeparatorDef.DEFAULT);
-        }
         if (AlphaFineConfigManager.isALPHALicAvailable()) {
             shortCuts.add(new AlphaFineAction());
-            shortCuts.add(SeparatorDef.DEFAULT);
         }
         shortCuts.add(SeparatorDef.DEFAULT);
         shortCuts.add(new AboutAction());