Merge branch 'release/10.0' of https://code.fineres.com/scm/~hades/design into release/10.0

designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java

@@ -159,9 +159,9 @@ public enum SupportLocaleImpl implements SupportLocale {
     },
 
     /**
-     * 更新升级-社区菜单下
+     * 更新升级-帮助菜单下
      */
-    UPDATE_COMMUNITY {
+    UPDATE_HELP {
         @Override
         public Set<Locale> support() {
             Set<Locale> set = new HashSet<>();

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

@@ -59,6 +59,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
 
         addNoneItem();
 
+        category.setSelectedItem(null);
         seriesName.setSelectedItem(null);
         median.populateComboBox(null);
     }
@@ -158,6 +159,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
     }
 
     private void addNoneItem() {
+        category.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
         seriesName.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
         median.addItem(Toolkit.i18nText("Fine-Design_Chart_Use_None"));
     }

designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java

@@ -9,11 +9,16 @@ import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.base.GradientStyle;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.frpane.UINumberDragPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.style.series.AbstractPlotSeriesPane;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
@@ -39,9 +44,11 @@ import com.fr.van.chart.pie.RadiusCardLayoutPane;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
+import java.awt.Component;
 
 /**
  * 图表样式-系列抽象界面
@@ -183,7 +190,16 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     //半径界面
     protected JPanel createRadiusPane(String title) {
         radiusPane = initRadiusPane();
-        radiusPaneWithTitle = TableLayout4VanChartHelper.createGapTableLayoutPane(title, radiusPane);
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {f, TableLayout4VanChartHelper.EDIT_AREA_WIDTH};
+        double[] rowSize = {p};
+        UILabel label = FRWidgetFactory.createLineWrapLabel(title);
+        label.setVerticalAlignment(SwingConstants.TOP);
+        Component[][] components = new Component[][]{
+                new Component[]{label, radiusPane},
+        };
+        radiusPaneWithTitle = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, TableLayout4VanChartHelper.COMPONENT_INTERVAL, LayoutConstants.VGAP_LARGE);
         return ((VanChartPlot) plot).isInCustom() ? null : radiusPaneWithTitle;
     }
 

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

@@ -68,7 +68,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f};
-        double[] rowSize = {p,p,p,p,p,p,p};
+        double[] rowSize = {p,p,p,p,p,p,p,p,p,p};
         Component[][] components = new Component[][]{
                 new Component[]{createGaugeLayoutPane()},
                 new Component[]{createGaugeStylePane(rowSize, new double[]{f,e})},