From 8a00f5f32100d313722e257add29cbd686104811 Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Tue, 30 Oct 2018 16:38:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-3275=20=E5=AE=89=E8=A3=85=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20=E5=9B=BE=E8=A1=A8=E7=B1=BB=E5=9E=8B=E4=B8=8D?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/ChartTypeInterfaceManager.java  | 26 +++++++++++++++++++
 .../design/mainframe/FormParaWidgetPane.java  |  7 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
index a01fc0ce5..154f4c097 100644
--- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
@@ -37,7 +37,9 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.ChartEditor;
+import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
@@ -57,8 +59,13 @@ import com.fr.plugin.chart.scatter.VanChartScatterPlot;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
+import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
+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.solution.closeable.CloseableContainedMap;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.AssistUtils;
@@ -119,6 +126,25 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         readDefault();
         readVanChart();
         PluginModule.registerAgent(PluginModule.ExtraChartDesign, classManager);
+
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+
+            @Override
+            public void on(PluginEvent event) {
+
+                synchronized (ChartTypeInterfaceManager.class) {
+                    //因为是CloseableContainedMap，所以不能在mount那边处理。
+                    DesignModuleFactory.registerExtraWidgetOptions(ChartTypeInterfaceManager.initWidgetOption());
+                }
+            }
+        }, new PluginFilter() {
+
+            @Override
+            public boolean accept(PluginContext context) {
+
+                return context.contain(PluginModule.ExtraChartDesign, SpecialLevel.IndependentChartUIProvider.getTagName());
+            }
+        });
     }
     
     public static WidgetOption[] initWidgetOption() {
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
index b78ecbf74..2fb695012 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -22,9 +22,9 @@ import com.fr.form.ui.WidgetConfig;
 import com.fr.form.ui.WidgetInfoConfig;
 import com.fr.general.ComparatorUtils;
 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;
@@ -47,6 +47,8 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import static com.fr.plugin.injectable.SpecialLevel.IndependentChartUIProvider;
+
 /**
  * @author null
  */
@@ -98,7 +100,8 @@ public class FormParaWidgetPane extends JPanel {
             @Override
             public boolean accept(PluginContext context) {
 
-                return context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG);
+                return context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG)
+                        || context.contain(PluginModule.ExtraChartDesign, SpecialLevel.IndependentChartUIProvider.getTagName());
             }
         });
     }

From ef1340db0e992817d33c35afe812089e561a41ce Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Tue, 30 Oct 2018 16:40:10 +0800
Subject: [PATCH 2/2] update

---
 .../main/java/com/fr/design/mainframe/FormParaWidgetPane.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
index 2fb695012..1958056b3 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -47,8 +47,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import static com.fr.plugin.injectable.SpecialLevel.IndependentChartUIProvider;
-
 /**
  * @author null
  */