From d4d15fed95234892e39a33d6815fa105b70e3150 Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Thu, 11 Nov 2021 17:30:48 +0800
Subject: [PATCH] =?UTF-8?q?CHART-21844=20fix:=E6=82=AC=E6=B5=AE=E7=AA=97?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=20=E5=B1=9E=E6=80=A7=E4=B9=9F=E8=A6=81?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AE=BE=E7=BD=AE=E6=88=90=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SeriesCondition/impl/ChartHyperPoplinkPane.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
index 3372880dd..855f4cbbc 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java
@@ -12,8 +12,10 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.hyperlink.AbstractHyperLinkPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.ChartHyperEditPane;
+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 java.util.HashMap;
 import java.awt.BorderLayout;
@@ -70,7 +72,14 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
         ChartProvider chart = ChartTypeManager.getInstanceWithCheck().getFirstChart();
         if (chart != null) {
             try {
-                cc.addChart((ChartProvider) chart.clone());
+                ChartProvider clone = (ChartProvider) chart.clone();
+                if (!ChartEditContext.supportTheme() && clone instanceof VanChart) {
+                    //主题中有的属性 界面上屏蔽不跟随主题 属性全部设置成自定义
+                    ((VanChart) clone).setThemeCustom();
+//            //主题中没有的 根据主题深浅色自动 的属性 默认自动
+//            ((VanChart) chart4Update).setAutoThemeCustom();
+                }
+                cc.addChart(clone);
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }