From 5ed6fa5919e4809c8fac5079f0117fa37352e795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Fri, 27 Sep 2019 16:03:50 +0800
Subject: [PATCH] =?UTF-8?q?CHART-10247=20=E7=83=AD=E5=8A=9B=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE-=E7=95=8C=E9=9D=A2=E5=9B=BE=E7=89=87=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9&=E6=89=A9=E5=B1=95=E5=9B=BE=E8=A1=A8=E5=8F=98?=
 =?UTF-8?q?=E6=88=90=E6=9D=A1=E5=BD=A2=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/chart/gui/ChartTypePane.java | 12 ++++++------
 .../HeatMapIndependentVanChartInterface.java         |  7 +++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
index e9dcbedce..087efff89 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
@@ -20,15 +20,15 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 
 /**
  * 图表 属性表, 类型选择 界面.
@@ -125,7 +125,8 @@ public class ChartTypePane extends AbstractChartAttrPane{
 			String lastPlotID = chart.getID();
 
             try{
-				ChartProvider newDefaultChart = (ChartProvider) ((AbstractChartTypePane) getSelectedPane()).getDefaultChart().clone();
+				AbstractChartTypePane selectedPane = (AbstractChartTypePane) getSelectedPane();
+				ChartProvider newDefaultChart =(ChartProvider) ChartTypeManager.getInstanceWithCheck().getChartTypes(selectedPane.getPlotID())[0].clone();
 				if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
 					//vanChart 和 chart 之间切换
 					//不同chart之间切换
@@ -136,7 +137,6 @@ public class ChartTypePane extends AbstractChartAttrPane{
             }catch (CloneNotSupportedException e){
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
-
 			//这一步会替换plot
             ((AbstractChartTypePane)getSelectedPane()).updateBean(chart);
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java
index 2d07fda4d..b4e49606e 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java
@@ -38,6 +38,13 @@ public class HeatMapIndependentVanChartInterface extends MapIndependentVanChartI
         return Toolkit.i18nText("Fine-Design_Chart_New_HeatMap");
     }
 
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_New_HeatMap"),
+        };
+    }
+
     @Override
     public String[] getDemoImagePath() {
         return new String[]{