Merge pull request #2667 in DESIGN/design from final/10.0 to release/10.0

* commit 'beb51e586ec6b569b92fc31e1ed6d226112c93ef':
  CHART-16330 修改甘特图、框架图条件属性界面

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

@@ -13,11 +13,11 @@ 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;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipNoCheckPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
+import com.fr.van.chart.gantt.designer.style.label.VanChartGanttLabelConditionPane;
 
 import java.awt.Dimension;
 
@@ -42,7 +42,7 @@ public class VanChartGanttConditionPane extends DataSeriesConditionPane {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         if (!PlotFactory.largeDataModel(plot)) {
-            classPaneMap.put(AttrGanttLabel.class, new VanChartLabelConditionPane(this, plot));
+            classPaneMap.put(AttrGanttLabel.class, new VanChartGanttLabelConditionPane(this, plot));
         }
         classPaneMap.put(AttrGanttTooltip.class, new VanChartTooltipConditionPane(this, plot) {
 

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttLabelConditionPane.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+public class VanChartGanttLabelConditionPane extends VanChartLabelConditionPane {
+
+    public VanChartGanttLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
+        super(conditionAttributesPane, plot);
+    }
+
+    protected VanChartPlotLabelPane createLabelPane() {
+        return new VanChartGanttPlotLabelNoCheckPane(getPlot(), null);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttPlotLabelNoCheckPane.java

@@ -0,0 +1,25 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.awt.BorderLayout;
+
+public class VanChartGanttPlotLabelNoCheckPane extends VanChartGanttPlotLabelPane {
+
+    public VanChartGanttPlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void addComponents() {
+        this.setLayout(new BorderLayout());
+        this.add(getLabelPane(), BorderLayout.CENTER);
+    }
+
+    public void populate(AttrLabel attr) {
+        super.populate(attr);
+        getLabelShowCheckBox().setSelected(true);
+        getLabelPane().setVisible(true);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/other/VanChartStructureConditionPane.java

@@ -11,10 +11,10 @@ import com.fr.plugin.chart.base.AttrTooltip;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.van.chart.designer.other.condition.item.VanChartFloatColorConditionPane;
-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.VanChartStructureNodeConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
+import com.fr.van.chart.structure.desinger.style.VanChartStructureLabelConditionPane;
 
 import java.awt.Dimension;
 
@@ -47,7 +47,7 @@ public class VanChartStructureConditionPane extends DataSeriesConditionPane {
     protected void addBasicAction() {
         classPaneMap.put(AttrBackground.class, new VanChartSeriesColorConditionPane(this));
         classPaneMap.put(AttrTooltip.class, new VanChartTooltipConditionPane(this, plot));
-        classPaneMap.put(AttrLabel.class, new VanChartLabelConditionPane(this, plot));
+        classPaneMap.put(AttrLabel.class, new VanChartStructureLabelConditionPane(this, plot));
         classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(AttrNode.class, new VanChartStructureNodeConditionPane(this));
     }

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelConditionPane.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
+
+public class VanChartStructureLabelConditionPane extends VanChartLabelConditionPane {
+
+    public VanChartStructureLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
+        super(conditionAttributesPane, plot);
+    }
+
+    protected VanChartPlotLabelPane createLabelPane() {
+        return new VanChartStructurePlotLabelNoCheckPane(getPlot(), null);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructurePlotLabelNoCheckPane.java

@@ -0,0 +1,25 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import java.awt.BorderLayout;
+
+public class VanChartStructurePlotLabelNoCheckPane extends VanChartStructurePlotLabelPane {
+
+    public VanChartStructurePlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void addComponents() {
+        this.setLayout(new BorderLayout());
+        this.add(getLabelPane(), BorderLayout.CENTER);
+    }
+
+    public void populate(AttrLabel attr) {
+        super.populate(attr);
+        getLabelShowCheckBox().setSelected(true);
+        getLabelPane().setVisible(true);
+    }
+}