From 9e8e2ea32b53d36ec63b874f6bdc8e7c7e21f103 Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Tue, 9 Nov 2021 21:01:17 +0800
Subject: [PATCH] =?UTF-8?q?CHART-21570=20fix:fvs.cpt.chart=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=87=AA=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../type/AbstractVanChartTypePane.java         |  6 +++---
 .../chart/map/designer/type/GisLayerPane.java  | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
index 3456dd0be..72c3c8e03 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
@@ -153,9 +153,9 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
             //切换类型埋点
             ChartInfoCollector.getInstance().updateChartTypeTime(chart, oldPlot.getPlotID());
         }
-        if (!ChartEditContext.supportTheme()) {
-            chart.setAutoThemeCustom();
-        }
+//        if (!ChartEditContext.supportTheme()) {
+//            chart.setAutoThemeCustom();
+//        }
         if (!acceptDefinition(chart.getChartDataDefinition(), newPlot)) {
             chart.setChartDataDefinition(null);
         }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java
index 1ea5a1ddb..43a770bea 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/GisLayerPane.java
@@ -238,18 +238,18 @@ public class GisLayerPane extends JPanel implements UIObserver {
 
     public void resetGisLayer(VanChartMapPlot mapPlot) {
 
-        if (ChartEditContext.supportTheme()) {
+//        if (ChartEditContext.supportTheme()) {
             GisLayer defaultGisLayer = mapPlot.getDefaultGisLayer();
             mapPlot.setGisLayer(defaultGisLayer);
             populate(defaultGisLayer);
-        } else {
-            GaoDeGisType gaoDeGisType = mapPlot.getDefaultGisLayerType();
-
-            mapPlot.getGisLayer().setGisLayerType(GISLayerType.GAO_DE_API);
-            mapPlot.getGisLayer().setLayerName(gaoDeGisType.getTypeName());
-            mapPlot.getGisLayer().setGaoDeGisType(gaoDeGisType);
-            populate(mapPlot.getGisLayer());
-        }
+//        } else {
+//            GaoDeGisType gaoDeGisType = mapPlot.getDefaultGisLayerType();
+//
+//            mapPlot.getGisLayer().setGisLayerType(GISLayerType.GAO_DE_API);
+//            mapPlot.getGisLayer().setLayerName(gaoDeGisType.getTypeName());
+//            mapPlot.getGisLayer().setGaoDeGisType(gaoDeGisType);
+//            populate(mapPlot.getGisLayer());
+//        }
     }
 
     public void populate(GisLayer layer) {