From 8594603c2a7b2cf9a308c5c1f982e996b6c06a77 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Thu, 24 Aug 2017 19:12:13 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3899=20[9.0=E4=B8=80=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92]=E8=81=9A=E5=90=88=E6=8A=A5=E8=A1=A8=E8=81=9A?=
 =?UTF-8?q?=E5=90=88=E5=9D=97=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/poly/PolyDesigner.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java
index 0c700a7bf5..fcafd4c8ca 100644
--- a/designer/src/com/fr/poly/PolyDesigner.java
+++ b/designer/src/com/fr/poly/PolyDesigner.java
@@ -738,7 +738,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
      * @return 工具
      */
     public ToolBarDef[] toolbars4Target() {
-        return selection == null || isChooseBlock() ? null : this.selection.toolbars4Target();
+        return selection == null || isChooseBlock() || isChooseChartInner() ? null : this.selection.toolbars4Target();
     }
 
     /**
@@ -753,7 +753,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         }
 
 
-        if (selection == null || isChooseBlock()) {
+        if (selection == null || isChooseBlock() || isChooseChartInner()) {
             setToolBarElemEnabled(selection != null);
             return toolBarComponent;
         } else {
@@ -909,6 +909,15 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
         return selectedtype == SelectionType.BLOCK;
     }
 
+    /**
+     * 是否选中图表聚合块内部
+     *
+     * @return 是则返回true
+     */
+    public boolean isChooseChartInner() {
+        return selectedtype == SelectionType.CHART_INNER;
+    }
+
     /**
      * Fire gridSelection Changed
      */