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

* commit '88afbc2010e0286f6f4b5d0ec3e5f258321f5143':
  CHART-15419 甘特图增加大数据配置
  REPORT-37950 普通报表-多sheet-报表块缩放失效 1. bug原因：当新建一个Sheet后，代码会走到这一步，新建一个JFormSliderPane，然后在进行缩放时，修改的是旧的JFormSliderPane中的showValue，而ReportComponentComposite中getShowValue取到的都是新的JFormSliderPane中的值，所以会发现新的JFormSliderPane中showValue一直不变，滚动条失效 2. 修改思路为，新建sheet后，仍然使用原来的JFormSliderPane，而因为界面的缩放后的绘制是跟resolution分辨率有关，所以共用JFormSliderPane之后，不同sheet中的界面缩放还是可以分开控制

designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

@@ -29,6 +29,7 @@ import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.plugin.chart.base.VanChartConstants;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
+import com.fr.plugin.chart.gantt.attr.AttrGanttLabel;
 import com.fr.plugin.chart.map.line.condition.AttrLineEffect;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrLabel;
 import com.fr.plugin.chart.vanchart.VanChart;
@@ -436,6 +437,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
             conditionAttr.remove(AttrEffect.class);
             conditionAttr.remove(AttrLineEffect.class);
             conditionAttr.remove(AttrFloatColor.class);
+            conditionAttr.remove(AttrGanttLabel.class);
 
             VanChartAttrMarker attrMarker = conditionAttr.getExisted(VanChartAttrMarker.class);
             if (attrMarker != null && !attrMarker.isCommon()) {

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/other/VanChartGanttConditionPane.java

@@ -12,6 +12,7 @@ import com.fr.plugin.chart.gantt.attr.AttrGanttLabel;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltip;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
 import com.fr.plugin.chart.type.ConditionKeyType;
+import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
@@ -40,16 +41,18 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
-        classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+        if (!PlotFactory.largeDataModel(plot)) {
-        classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot){
+            classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+        }
+        classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot) {
 
             @Override
             protected VanChartPlotTooltipPane createTooltipContentsPane() {
-                return new VanChartPlotTooltipNoCheckPane(getPlot(), null){
+                return new VanChartPlotTooltipNoCheckPane(getPlot(), null) {
                     @Override
                     protected AttrTooltip getAttrTooltip() {
                         AttrGanttTooltip attrGanttTooltip = new AttrGanttTooltip();
-                        ((AttrGanttTooltipContent)attrGanttTooltip.getContent()).getDurationFormat().setEnable(true);
+                        ((AttrGanttTooltipContent) attrGanttTooltip.getContent()).getDurationFormat().setEnable(true);
                         return attrGanttTooltip;
                     }
                 };
@@ -65,7 +68,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
 
     @Override
     protected ChartConditionPane createListConditionPane() {
-        return new ChartConditionPane(){
+        return new ChartConditionPane() {
             @Override
             protected ConditionKeyType[] conditionKeyTypes() {
                 return ConditionKeyType.Gantt_CONDITION_KEY_TYPES;
@@ -75,6 +78,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
 
     /**
      * 返回图表class对象
+     *
      * @return class对象
      */
     public Class<? extends Plot> class4Correspond() {

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

@@ -44,7 +44,8 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         Component[][] components = new Component[][]{
                 new Component[]{createGanntStylePane()},
                 new Component[]{createLinkLinePane()},
-                new Component[]{createMarkerPane()}
+                new Component[]{createMarkerPane()},
+                new Component[]{createLargeDataModelPane()}
         };
 
         contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col);
@@ -58,6 +59,10 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
         return ganntStylePane;
     }
 
+    protected void checkCompsEnabledWithLarge(Plot plot) {
+
+    }
+
     private JPanel createLinkLinePane(){
         lineWidth = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
         colorSelect = new ColorSelectBoxWithOutTransparent(100);

designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java

@@ -119,7 +119,8 @@ public class ReportComponentComposite extends JComponent implements RemoveListen
                 templateStateList.add(null);
             }
             centerCardPane.editingComponet.setSelection(centerCardPane.editingComponet.getDefaultSelectElement());
-            jSliderContainer = JFormSliderPane.getInstance();
+            // Yvan: REPORT-37950 普通报表-多sheet-报表块缩放失效
+            //jSliderContainer = JFormSliderPane.getInstance();
         }
 
         if (centerCardPane.editingComponet.elementCasePane == null) {