From 103beaec4cf49352c9af70ad3ab77a930ec3c9dd Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Thu, 4 Nov 2021 17:23:38 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-61610=20fix:=E6=8F=92=E4=BB=B6=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD=20=E5=9B=BE=E8=A1=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=8A=A5=E9=94=99=20A.class=20can?=
 =?UTF-8?q?=20not=20cast=20to=20A.class?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/ChartPropertyPane.java   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java
index 2d4d5fef6..c3918aba2 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java
@@ -10,12 +10,22 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
+import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.gui.chart.BaseChartPropertyPane;
 import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
 import com.fr.design.mainframe.chart.ChartEditPane;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.GeneralContext;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.injectable.PluginModule;
+import com.fr.plugin.injectable.SpecialLevel;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
+import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.AssistUtils;
 
 import javax.swing.BorderFactory;
@@ -39,8 +49,11 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
     //ID一样的话 不用新建chartEditPane
     private String currentID;
 
+    private static PluginEventListener pluginEventListener;
+
     private ChartPropertyPane() {
         initComponent();
+        addListener();
     }
 
     protected void initComponent() {
@@ -48,6 +61,27 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
         this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
     }
 
+    private void addListener() {
+        if (pluginEventListener != null) {
+            GeneralContext.stopListenPlugin(pluginEventListener);
+        }
+        pluginEventListener = new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                //禁用启用图表插件 这边id置空。这样展示图表配置属性不管和上一个id是否一样 都新建chartEditPane
+                currentID = null;
+            }
+        };
+        GeneralContext.listenPlugin(PluginEventType.AfterRun, pluginEventListener, new PluginFilter() {
+
+            @Override
+            public boolean accept(PluginContext context) {
+
+                return context.contain(PluginModule.ExtraChartDesign);
+            }
+        });
+    }
+
     @Override
     public void updateChartEditPane(String plotID) {
         if (!AssistUtils.equals(currentID, plotID)) {