From 0e529ab1a399ff47941b93af8550846923a71343 Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Fri, 5 Nov 2021 15:53:19 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-61610=20fix:=E5=9B=9E=E9=80=80=E6=9C=80?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=85=B3=E4=BA=8E=20=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E8=A1=A8=E7=B1=BB=E5=9E=8B=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E6=96=B0=E5=BB=BA=E5=9B=BE=E8=A1=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=20=E7=9A=84=E9=80=BB=E8=BE=91=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/ChartPropertyPane.java   | 40 ++-----------------
 1 file changed, 3 insertions(+), 37 deletions(-)

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 7d787f15a..4efe977ff 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
@@ -16,14 +16,6 @@ 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.utils.gui.GUICoreUtils;
-import com.fr.general.GeneralContext;
-import com.fr.plugin.context.PluginContext;
-import com.fr.plugin.injectable.PluginModule;
-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;
 import javax.swing.Icon;
@@ -43,12 +35,8 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
 
     protected ChartEditPane chartEditPane;
 
-    //ID一样的话 不用新建chartEditPane
-    private String currentID;
-
     private ChartPropertyPane() {
         initComponent();
-        addListener();
     }
 
     protected void initComponent() {
@@ -56,33 +44,11 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
         this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
     }
 
-    private void addListener() {
-        GeneralContext.listenPlugin(PluginEventType.AfterRun, new PluginEventListener() {
-            @Override
-            public void on(PluginEvent event) {
-                //禁用启用图表插件 这边id置空。这样展示图表配置属性不管和上一个id是否一样 都新建chartEditPane
-                currentID = null;
-            }
-        }, new PluginFilter() {
-
-            @Override
-            public boolean accept(PluginContext context) {
-
-                return context.contain(PluginModule.ExtraChartDesign);
-            }
-        });
-    }
-
     @Override
     public void updateChartEditPane(String plotID) {
-        if (!AssistUtils.equals(currentID, plotID)) {
-            chartEditPane = ChartTypeInterfaceManager.getInstance().getChartEditPane(plotID);
-            chartEditPane.setContainer(container);
-            currentID = plotID;
-            resetChartEditPane();
-        } else {
-            chartEditPane.resetLastChartCollection();
-        }
+        chartEditPane = ChartTypeInterfaceManager.getInstance().getChartEditPane(plotID);
+        chartEditPane.setContainer(container);
+        resetChartEditPane();
     }
 
     @Override