Merge pull request #2090 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '92c083a9e458e6c8a2ca03513c601217a4f6fb00':
  CHART-14800 图表的模块加载慢导致了服务菜单第一次点击缺少图表菜单
  CHART-15096 注解
  CHART-15096 条件属性数据表样式问题
  CHART-15054 调整数据面板标签宽度

designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java

@@ -6,9 +6,7 @@ import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.chart.gui.ChartComponent;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.ChartPropertyPane;
-import com.fr.design.module.ChartEmptyDataStyleAction;
 import com.fr.design.module.ChartHyperlinkGroup;
-import com.fr.design.module.ChartPreStyleAction;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.ChartEditor;
 import com.fr.locale.InterMutableKey;
@@ -20,7 +18,6 @@ import com.fr.plugin.chart.vanchart.export.ImagePainter;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
 import com.fr.van.chart.DownloadOnlineSourcesHelper;
-import com.fr.van.chart.map.server.ChartMapEditorAction;
 
 /**
  * Created by juhaoyu on 2018/6/27.
@@ -43,10 +40,6 @@ public class ChartDesignerActivator extends Activator implements Prepare {
 
         DesignModuleFactory.registerChartPropertyPaneClass(ChartPropertyPane.class);
 
-        ActionFactory.registerChartPreStyleAction(new ChartPreStyleAction());
-        ActionFactory.registerChartEmptyDataStyleAction(new ChartEmptyDataStyleAction());
-        ActionFactory.registerChartMapEditorAction(new ChartMapEditorAction());
-
         ActionFactory.registerChartCollection(ChartCollection.class);
 
         DesignModuleFactory.registerExtraWidgetOptions(ChartTypeInterfaceManager.initWidgetOption());

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@@ -99,13 +99,13 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         double f = TableLayout.FILL;
         double[] columnSize = {f};
         double[] rowSize = {p, p, p, p};
-        UILabel Label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
+        UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
-        Label1.setPreferredSize(new Dimension(75, 20));
+        label1.setPreferredSize(getLabelDimension());
-        UILabel Label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
+        UILabel label2 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Value"));
-        Label2.setPreferredSize(new Dimension(75, 20));
+        label2.setPreferredSize(getLabelDimension());
-        UILabel Label3 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
+        UILabel label3 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Summary_Method"));
-        Label3.setPreferredSize(new Dimension(75, 20));
+        label3.setPreferredSize(getLabelDimension());
-        Component[][] components = getUseComponentWithOutSummary(Label1, Label2, Label3);
+        Component[][] components = getUseComponentWithOutSummary(label1, label2, label3);
 
         centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 4, 6);
         centerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1));
@@ -113,6 +113,10 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         this.add(centerPane, BorderLayout.CENTER);
     }
 
+    protected Dimension getLabelDimension() {
+        return new Dimension(75, 20);
+    }
+
     protected Component[][] getUseComponent(UILabel Label1, UILabel Label2, UILabel Label3) {
         return new Component[][]{
                 new Component[]{GUICoreUtils.createBorderLayoutPane(new Component[]{seriesName, null, null, Label1, null})},

designer-chart/src/main/java/com/fr/van/chart/box/data/report/BoxPlotReportDataContentPane.java

@@ -58,7 +58,7 @@ public class BoxPlotReportDataContentPane extends AbstractReportDataContentPane
 
         pane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{dataType, null, null, label, null}));
         pane.setPreferredSize(new Dimension(246, 30));
-        pane.setBorder(BorderFactory.createEmptyBorder(0, 24, 10, 15));
+        pane.setBorder(BorderFactory.createEmptyBorder(0, 18, 10, 15));
 
         return pane;
     }

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

@@ -65,7 +65,7 @@ public class BoxPlotTableResultDataSeriesPane extends AbstractTableDataContentPa
 
     private JPanel createUIComboBoxPane(UIComboBox comboBox, String title) {
         UILabel label = new UILabel(title);
-        label.setPreferredSize(new Dimension(75, 20));
+        label.setPreferredSize(new Dimension(80, 20));
 
         JPanel panel = new JPanel();
 

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

@@ -1,12 +1,19 @@
 package com.fr.van.chart.box.data.table;
 
 import com.fr.chart.chartdata.OneValueCDDefinition;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.table.SeriesNameUseFieldValuePane;
 import com.fr.plugin.chart.box.data.VanBoxOneValueCDDefinition;
 
+import java.awt.Dimension;
+
 public class BoxPlotTableSeriesNameUseFieldValuePane extends SeriesNameUseFieldValuePane {
 
     protected OneValueCDDefinition createOneValueCDDefinition() {
         return new VanBoxOneValueCDDefinition();
     }
+
+    protected Dimension getLabelDimension() {
+        return new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT);
+    }
 }

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

@@ -29,7 +29,7 @@ public abstract class UIComboBoxWithEditLabel extends JPanel implements UIObserv
             }
         };
 
-        editLabel.setPreferredSize(new Dimension(75, 20));
+        editLabel.setPreferredSize(new Dimension(80, 20));
         comboBox = new UIComboBox();
 
         this.setLayout(new BorderLayout(4, 0));

designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanchartDataSheetNoCheckPane.java

@@ -1,10 +1,12 @@
 package com.fr.van.chart.designer.style.datasheet;
 
 import com.fr.chart.chartglyph.DataSheet;
+import com.fr.design.gui.iscrollbar.UIScrollBar;
 import com.fr.plugin.chart.base.AttrDataSheet;
 
 import javax.swing.JPanel;
 import java.awt.Component;
+import java.awt.Container;
 
 /**
  * Created by mengao on 2017/5/24.
@@ -19,6 +21,20 @@ public class VanchartDataSheetNoCheckPane extends VanChartDataSheetPane {
         return components;
     }
 
+    @Override
+    protected void layoutContentPane() {
+        leftcontentPane = createContentPane();
+        this.add(leftcontentPane);
+    }
+
+    @Override
+    protected void setLeftContentPaneBounds(Container parent, UIScrollBar scrollBar, int beginY, int maxheight) {
+        int width = parent.getWidth();
+        int height = parent.getHeight();
+        scrollBar.setBounds(0, 0, 0, 0);
+        leftcontentPane.setBounds(0, 0, width, height);
+    }
+
     public void populate(AttrDataSheet attrDataSheet) {
         populate(attrDataSheet.getDataSheet());
     }

designer-realize/src/main/java/com/fr/start/MainDesigner.java

@@ -3,7 +3,6 @@ package com.fr.start;
 import com.fr.base.BaseUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.actions.file.newReport.NewPolyReportAction;
 import com.fr.design.actions.file.newReport.NewWorkBookAction;
@@ -34,6 +33,8 @@ import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
+import com.fr.design.module.ChartEmptyDataStyleAction;
+import com.fr.design.module.ChartPreStyleAction;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -54,23 +55,24 @@ import com.fr.stable.xml.XMLTools;
 import com.fr.start.module.StartupArgs;
 import com.fr.start.server.ServerTray;
 import com.fr.third.org.apache.commons.lang3.time.StopWatch;
+import com.fr.van.chart.map.server.ChartMapEditorAction;
 import com.fr.workspace.WorkContext;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.border.MatteBorder;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class MainDesigner extends BaseDesigner {
 
@@ -160,15 +162,7 @@ public class MainDesigner extends BaseDesigner {
 
             if (WorkContext.getCurrent().isRoot()) {
                 menuDef.addShortCut(new ServerConfigManagerAction(), new StyleListAction(), new WidgetManagerAction());
-                if (ActionFactory.getChartPreStyleAction() != null) {
+                menuDef.addShortCut(new ChartPreStyleAction(), new ChartEmptyDataStyleAction(),new ChartMapEditorAction());
-                    menuDef.addShortCut(ActionFactory.getChartPreStyleAction());
-                }
-                if (ActionFactory.getChartEmptyDataStyleAction() != null) {
-                    menuDef.addShortCut(ActionFactory.getChartEmptyDataStyleAction());
-                }
-                if (ActionFactory.getChartMapEditorAction() != null) {
-                    menuDef.addShortCut(ActionFactory.getChartMapEditorAction());
-                }
             }
 
             insertMenu(menuDef, MenuHandler.SERVER);