Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into feature/10.0

designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java

@@ -16,12 +16,15 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-
-import com.fr.script.Calculator;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -155,7 +158,6 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
                     }
                 }
                 rtd.setTableDataSource(DesignTableDataManager.getEditingTableDataSource());
-                rtd.createDataModel(Calculator.createCalculator());
                 PreviewTablePane.previewTableData(rtd);
             }
         });

designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java

@@ -4,11 +4,11 @@ package com.fr.design.onlineupdate.domain;
  * Created by XINZAI on 2018/8/21.
  */
 
-import com.fr.third.org.apache.commons.collections4.collection.UnmodifiableCollection;
-import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList;
 
 import java.awt.Color;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 更新升级的常量
@@ -32,7 +32,7 @@ public interface UpdateConstants {
 
     int BYTE = 153600;
 
-    UnmodifiableList JARS_FOR_SERVER_X = new UnmodifiableList(Arrays.asList(new String[]{
+    List<String> JARS_FOR_SERVER_X = Collections.unmodifiableList(Arrays.asList(new String[]{
             "fine-activator-10.0.jar",
             "fine-core-10.0.jar",
             "fine-report-engine-10.0.jar",
@@ -47,13 +47,13 @@ public interface UpdateConstants {
             "fine-accumulator-10.0.jar"
     }));
 
-    UnmodifiableList  JARS_FOR_DESIGNER_X = new UnmodifiableList(Arrays.asList(new String[]{
+    List<String> JARS_FOR_DESIGNER_X = Collections.unmodifiableList(Arrays.asList(new String[]{
             "fine-report-designer-10.0.jar",
             "aspectjrt.jar"
     }));
 
 
-    UnmodifiableList  LOG_TYPE = new UnmodifiableList(Arrays.asList(new String[]{
+    List<String> LOG_TYPE = Collections.unmodifiableList(Arrays.asList(new String[]{
             "REPORT", "MOBILE", "CHART", "PFC", "BI"
     }));
 

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() {

designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java

@@ -34,8 +34,6 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     protected UIButtonGroup<Integer> isStacked;
     protected UIButtonGroup<Integer> isPercentStacked;
 
-    private ConditionAttr conditionAttr;
-
     private LiteConditionPane liteConditionPane;
 
     public VanChartCustomStackAndAxisConditionPane() {
@@ -99,10 +97,12 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     }
 
     public void populateBean(ConditionAttr conditionAttr) {
-        this.conditionAttr = conditionAttr;
+        AttrSeriesStackAndAxis seriesStackAndAxis = conditionAttr.getExisted(AttrSeriesStackAndAxis.class);
-        AttrSeriesStackAndAxis seriesStackAndAxis = (AttrSeriesStackAndAxis) conditionAttr.getExisted(AttrSeriesStackAndAxis.class);
+
+        if (XAxis == null || YAxis == null) {
             XAxis = new UIButtonGroup<Integer>(seriesStackAndAxis.getXAxisNamesArray());
             YAxis = new UIButtonGroup<Integer>(seriesStackAndAxis.getYAxisNameArray());
+        }
 
         doLayoutPane();
         XAxis.setSelectedIndex(seriesStackAndAxis.getXAxisIndex());
@@ -129,11 +129,16 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     }
 
     public ConditionAttr updateBean() {
-        AttrSeriesStackAndAxis seriesStackAndAxis = (AttrSeriesStackAndAxis)conditionAttr.getExisted(AttrSeriesStackAndAxis.class);        seriesStackAndAxis.setXAxisIndex(XAxis.getSelectedIndex());
+        ConditionAttr conditionAttr = new ConditionAttr();
+        AttrSeriesStackAndAxis seriesStackAndAxis = conditionAttr.getExisted(AttrSeriesStackAndAxis.class);
+        if (seriesStackAndAxis == null) {
+            seriesStackAndAxis = new AttrSeriesStackAndAxis();
+            conditionAttr.addDataSeriesCondition(seriesStackAndAxis);
+        }
+        seriesStackAndAxis.setXAxisIndex(XAxis.getSelectedIndex());
         seriesStackAndAxis.setYAxisIndex(YAxis.getSelectedIndex());
 
         updateStackAndPercent(seriesStackAndAxis);
-        conditionAttr.addDataSeriesCondition(seriesStackAndAxis);
 
         AbstractCondition con = (AbstractCondition) this.liteConditionPane.updateBean();
         conditionAttr.setCondition(con);

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;
@@ -98,7 +98,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());
             }
         });
     }