From cf0ae930be36c5034b896b4eaefcdd2ebdb51453 Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Mon, 8 Nov 2021 19:56:48 +0800
Subject: [PATCH] =?UTF-8?q?CHART-21570=20=E5=A4=A7=E5=B1=8F=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E7=9A=84=E5=9B=BE=E8=A1=A8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/chart/ChartTypePane.java    | 10 ++++++++--
 .../type/AbstractVanChartTypePane.java        |  4 ++++
 .../chart/map/designer/type/GisLayerPane.java | 19 +++++++++++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
index d31cd3208..0337fff44 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
@@ -11,8 +11,10 @@ import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.vanchart.VanChart;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListCellRenderer;
@@ -23,10 +25,10 @@ import javax.swing.JSplitPane;
 import javax.swing.ListCellRenderer;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.awt.Color;
 import java.awt.Component;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class ChartTypePane extends ChartCommonWizardPane implements CallbackEvent {
     private static final long serialVersionUID = -1175602484968520546L;
@@ -153,6 +155,10 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven
             }
         }
 
+        if (!ChartEditContext.supportTheme() && chart4Update instanceof VanChart) {
+            ((VanChart) chart4Update).setThemeAutoCustom();
+        }
+
         update(chart4Update);
     }
 
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 9cf916554..04f48c732 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
@@ -24,6 +24,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.general.Background;
 import com.fr.js.NameJavaScriptGroup;
 import com.fr.log.FineLoggerFactory;
@@ -152,6 +153,9 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
             //切换类型埋点
             ChartInfoCollector.getInstance().updateChartTypeTime(chart, oldPlot.getPlotID());
         }
+        if (!ChartEditContext.supportTheme()) {
+            chart.setThemeAutoCustom();
+        }
         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 580144ce5..1ea5a1ddb 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
@@ -9,6 +9,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.base.GisLayer;
 import com.fr.plugin.chart.map.VanChartMapPlot;
@@ -84,7 +85,7 @@ public class GisLayerPane extends JPanel implements UIObserver {
     private JPanel createGISLayerPane() {
         gisButton = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"),
                 Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"), Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        gisButton.setSelectedIndex(0);
+        gisButton.setSelectedIndex(ChartEditContext.supportTheme() ? 0 : 1);
         gisGaoDeLayer = new UIComboBox(MapLayerConfigManager.getGaoDeLayerItems());
         gisButton.addActionListener(event -> {
             refreshZoomLevel();
@@ -236,9 +237,19 @@ public class GisLayerPane extends JPanel implements UIObserver {
     }
 
     public void resetGisLayer(VanChartMapPlot mapPlot) {
-        GisLayer defaultGisLayer = mapPlot.getDefaultGisLayer();
-        mapPlot.setGisLayer(defaultGisLayer);
-        populate(defaultGisLayer);
+
+        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());
+        }
     }
 
     public void populate(GisLayer layer) {