From 4d9e1fb8bc669f01c6b6e1dc448f5820f7f7cc50 Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Tue, 16 Oct 2018 11:57:48 +0800
Subject: [PATCH] =?UTF-8?q?CHART-3211=20=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=8F=92=E4=BB=B6=E6=9C=89=E4=BA=9B=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89type=20pane?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/ChartTypeInterfaceManager.java     | 6 ++++++
 .../chart/fun/impl/AbstractIndependentChartsUI.java       | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
index 5d54adff7..a01fc0ce5 100644
--- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
@@ -61,6 +61,7 @@ import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
 import com.fr.plugin.solution.closeable.CloseableContainedMap;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.AssistUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
 import com.fr.van.chart.area.AreaIndependentVanChartInterface;
@@ -107,6 +108,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
 
+    public static final String TYPE_PANE_DEFAULT_TITLE = "DEFAULT_NAME";
+
     public synchronized static ChartTypeInterfaceManager getInstance() {
         
         return classManager;
@@ -260,6 +263,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
                 String plotID = entry.getKey();
 
                 AbstractChartTypePane pane = entry.getValue().getPlotTypePane();
+                if (AssistUtils.equals(pane.title4PopupWindow(), TYPE_PANE_DEFAULT_TITLE)) {
+                    continue;
+                }
                 pane.setPlotID(plotID);
                 paneList.add(pane);
 
diff --git a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java
index 6e9ef2f03..19244a3fd 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java
@@ -1,6 +1,7 @@
 package com.fr.design.chart.fun.impl;
 
 import com.fr.chart.chartattr.Plot;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.fun.IndependentChartUIProvider;
 import com.fr.design.condition.ConditionAttributesPane;
@@ -40,7 +41,12 @@ public abstract class AbstractIndependentChartsUI extends AbstractProvider imple
 
     @Override
     public AbstractChartTypePane getPlotTypePane() {
-        return new PiePlotPane();
+        return new PiePlotPane() {
+            @Override
+            public String title4PopupWindow() {
+                return ChartTypeInterfaceManager.TYPE_PANE_DEFAULT_TITLE;
+            }
+        };
     }
 
     @Override