From fb3d56a3125a1fdb35ac1cbabce3220a491e165e Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 22 Sep 2017 16:28:20 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4688=20[9.0=E4=BA=8C=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92]=E6=96=B0=E5=BB=BAsheet2=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=E5=85=83=E7=B4=A0=EF=BC=8C=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=93=8D=E4=BD=9C=E5=90=8Esheet2=E8=A2=AB?=
 =?UTF-8?q?=E6=95=B4=E4=B8=AA=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/ElementCasePaneDelegate.java  |  3 +++
 .../src/com/fr/design/mainframe/ReportFloatPane.java  | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index b358b5302..bbc87fa78 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -176,6 +176,9 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         for (int i = 0; i < actions.length; i++) {
             subMenuDef.addShortCut(actions[i]);
         }
+
+        // 顺便更新右侧属性面板悬浮元素tab中的菜单项
+        ReportFloatPane.getInstance().refreshInsertFloatMenu(this);
     }
 
     // 格式菜单
diff --git a/designer/src/com/fr/design/mainframe/ReportFloatPane.java b/designer/src/com/fr/design/mainframe/ReportFloatPane.java
index 9f579f4f9..8207c9db0 100644
--- a/designer/src/com/fr/design/mainframe/ReportFloatPane.java
+++ b/designer/src/com/fr/design/mainframe/ReportFloatPane.java
@@ -23,7 +23,6 @@ import java.awt.*;
 public class ReportFloatPane extends JPanel {
 
     private static ReportFloatPane THIS;
-    private ElementCasePaneDelegate elementCasePaneDelegate;
     private MenuDef insertFloatMenu;
 
     private ReportFloatPane() {
@@ -37,6 +36,14 @@ public class ReportFloatPane extends JPanel {
         return THIS;
     }
 
+    public void refreshInsertFloatMenu(ElementCasePaneDelegate elementCasePaneDelegate) {
+        UpdateAction[] actions = ActionFactory.createFloatInsertAction(ElementCasePane.class, elementCasePaneDelegate);
+        insertFloatMenu.clearShortCuts();
+        for (int i = 0; i < actions.length; i++) {
+            insertFloatMenu.addShortCut(actions[i]);
+        }
+    }
+
     private void initComponent() {
         this.setLayout(new BorderLayout());
 
@@ -72,7 +79,7 @@ public class ReportFloatPane extends JPanel {
         insertFloatMenu.setTooltip(Inter.getLocText("FR-Designer_T_Insert_Float"));
         insertFloatMenu.setIconPath("com/fr/design/images/control/addPopup.png");
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-        elementCasePaneDelegate = (ElementCasePaneDelegate) editingTemplate.getCurrentElementCasePane();
+        ElementCasePaneDelegate elementCasePaneDelegate = (ElementCasePaneDelegate) editingTemplate.getCurrentElementCasePane();
         UpdateAction[] actions = ActionFactory.createFloatInsertAction(ElementCasePane.class, elementCasePaneDelegate);
         for (int i = 0; i < actions.length; i++) {
             insertFloatMenu.addShortCut(actions[i]);