From 2100f297af6500886c5a63f862dde4c025c0cc21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Wed, 9 Sep 2020 11:22:13 +0800
Subject: [PATCH] =?UTF-8?q?CHART-15681=20=20=E7=BB=84=E5=90=88=E5=9B=BE?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=E5=85=B6=E4=BB=96=E5=9B=BE=E5=BD=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/chart/gui/data/ReportDataPane.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java
index 3403bf3413..3393e3aaf5 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.chart.gui.data;
 
+import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
@@ -8,6 +9,7 @@ import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.plugin.chart.custom.CustomDefinition;
 
 
 import java.awt.*;
@@ -45,7 +47,8 @@ public class ReportDataPane extends FurtherBasicBeanPane<ChartCollection>{
      * @return 界面是否接受对象
      */
 	public boolean accept(Object ob) {
-		return ob instanceof ChartCollection && ((ChartCollection)ob).getSelectedChart().getFilterDefinition() instanceof ReportDataDefinition;
+		TopDefinitionProvider filterDefinition = ((ChartCollection) ob).getSelectedChartProvider(Chart.class).getFilterDefinition();
+		return ob instanceof ChartCollection && filterDefinition instanceof ReportDataDefinition && !(filterDefinition instanceof CustomDefinition);
 	}
 
     /**