Pull request #2039: CHART-14925 & CHART-14960 & CHART-15003 交互界面增加收缩于抽屉内、结果数据的系列和中位数增加无、分类默认选中无

Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit 'cec02263561410e0e1b97ab827a2f2a55dfadd4d':
  CHART-15003 交互界面增加收缩于抽屉内
  CHART-14960 结果数据的系列和中位数增加无
  CHART-14925 分类默认选中无

designer-chart/src/main/java/com/fr/van/chart/box/BoxIndependentVanChartInterface.java

@@ -6,7 +6,6 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -76,10 +75,7 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart
                 return new VanChartInteractivePane() {
 
                     protected Component[][] createToolBarComponents() {
-                        return new Component[][]{
+                        return createToolBarComponentsWithOutSort();
-                                new Component[]{null, exportImages},
-                                new Component[]{null, fullScreenDisplay}
-                        };
                     }
 
                     protected AutoRefreshPane getMoreLabelPane(VanChartPlot plot) {
@@ -87,11 +83,6 @@ public class BoxIndependentVanChartInterface extends AbstractIndependentVanChart
                         return new AutoRefreshPaneWithoutTooltip(chart, isLargeModel);
                     }
 
-                    protected double[] getToolBarRowSize() {
-                        double p = TableLayout.PREFERRED;
-                        return new double[]{p, p};
-                    }
-
                     protected ZoomPane createZoomPane() {
                         return new ZoomPane();
                     }

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableResultDataSeriesPane.java

@@ -56,6 +56,11 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
         median = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Median"));
         q1 = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Q1"));
         min = createUIComboBoxWithEditLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Min"));
+
+        addNoneItem();
+
+        seriesName.setSelectedItem(null);
+        median.populateComboBox(null);
     }
 
     private JPanel createUIComboBoxPane(UIComboBox comboBox, String title) {
@@ -134,6 +139,8 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
         refreshBoxItems(median.getComboBox(), list);
         refreshBoxItems(q1.getComboBox(), list);
         refreshBoxItems(min.getComboBox(), list);
+
+        addNoneItem();
     }
 
     public void clearAllBoxList() {
@@ -145,6 +152,13 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
         clearBoxItems(median.getComboBox());
         clearBoxItems(q1.getComboBox());
         clearBoxItems(min.getComboBox());
+
+        addNoneItem();
+    }
+
+    private void addNoneItem() {
+        seriesName.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        median.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
     }
 
     public void populateBean(ChartCollection collection) {

designer-chart/src/main/java/com/fr/van/chart/box/data/table/BoxPlotTableSeriesTypeUsePane.java

@@ -71,6 +71,7 @@ public class BoxPlotTableSeriesTypeUsePane extends UIComboBoxPane<ChartCollectio
         categoryCombox = new UIComboBox();
         categoryCombox.setPreferredSize(new Dimension(100, 20));
         categoryCombox.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
+        categoryCombox.setSelectedItem(null);
 
         north.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox, null, null, label, null}));
         north.setPreferredSize(new Dimension(246, 30));

designer-chart/src/main/java/com/fr/van/chart/box/data/table/UIComboBoxWithEditLabel.java

@@ -45,6 +45,10 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv
         this.comboBox = comboBox;
     }
 
+    public void addItem(String value) {
+        comboBox.addItem(value);
+    }
+
     protected void addItemListener(ItemListener aListener) {
         comboBox.addItemListener(aListener);
     }