Merge pull request #5972 in DESIGN/design from feature/10.0 to research/10.0

* commit 'ddb83185d8af36fcc9a289f5a7589a5619ef0eda':
  CHART-20686 大屏模板中的图表不支持导出
  CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
  CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
  REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -19,6 +19,7 @@ import com.fr.design.mainframe.chart.gui.item.FlexibleComboBox;
 import com.fr.design.mainframe.chart.gui.item.ItemEventType;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.mode.ChartEditContext;
+import com.fr.design.mainframe.chart.mode.ChartEditMode;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
@@ -313,7 +314,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
 
             //第一步就是重构cards
             cards.clear();
-            if (DesignModeContext.isDuchampMode()) {
+            if (ChartEditContext.duchampMode()) {
                 addOnePlotIDCards(priority, chartID);
             } else if (enabledChart) {
                 if (collection.getChartCount() == 1) {

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

@@ -471,7 +471,11 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected Component[][] createToolBarComponents() {
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), isSort},
+                new Component[]{null, fullScreenDisplay},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse},
+        } : new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), isSort},
                 new Component[]{null, exportImages},
                 new Component[]{null, fullScreenDisplay},
@@ -480,7 +484,10 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected Component[][] createToolBarComponentsWithOutSort() {
-        return new Component[][]{
+        return ChartEditContext.duchampMode() ? new Component[][]{
+                new Component[]{null, fullScreenDisplay},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse}
+        } : new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), exportImages},
                 new Component[]{null, fullScreenDisplay},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")), collapse}

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

@@ -16,6 +16,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.style.series.ColorPickerPaneWithMaxMin;
 import com.fr.design.mainframe.chart.gui.style.series.UIColorPickerPane;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.attr.GaugeDetailStyle;
@@ -199,7 +200,9 @@ public class VanChartGaugeSeriesPane extends VanChartMultiColorSeriesPane {
                 if (attrLabelDetail == null || attrLabelDetail.getTextAttr() == null) {
                     return;
                 }
-                attrLabelDetail.getTextAttr().setFRFont(VanChartGaugePlot.THERMOMETER_LABEL_FONT);
+                if (!ChartEditContext.duchampMode()) {
+                    attrLabelDetail.getTextAttr().setFRFont(VanChartGaugePlot.THERMOMETER_LABEL_FONT);
+                }
                 if (gaugeLayout.getSelectedIndex() == 0) {
                     attrLabel.getAttrLabelDetail().setPosition(Constants.LEFT);
                     attrLabel.getGaugeValueLabelDetail().setPosition(Constants.LEFT);

designer-form/src/main/java/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java

@@ -104,6 +104,15 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		refreshStylePreviewEffect();
 	}
 
+	/**
+	 * @deprecated 该方法在样式数据模型发生变化，如主题更新/body布局类型切换等均会被调用，并不仅限于初始化，
+	 * 因此原方法名称废弃，不应当被继续使用
+	 * @link {{@link #refreshStylePreviewEffect()}}
+	 */
+	protected void initStyle() {
+		refreshStylePreviewEffect();
+	}
+
 	public void refreshStylePreviewEffect() {
     	BorderPacker style = toData().getBorderStyle();
      	refreshBorderAndBackgroundStylePreviewEffect();
@@ -117,6 +126,15 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		reshuffleBorderAndBackgroundPaintingEffectIfTitleExists();
      }
 
+	/**
+	 * @deprecated 该方法在样式数据模型发生变化，如主题更新/图表默认开启标题等时均会被调用，并不仅限于初始化，
+	 * 因此原方法名称废弃，不应当被继续使用
+	 * @link {{@link #refreshBorderAndBackgroundStylePreviewEffect()} ()}}
+	 */
+	protected void initBorderAndBackgroundStyle() {
+		refreshBorderAndBackgroundStylePreviewEffect();
+	}
+
     public void refreshBorderAndBackgroundStylePreviewEffect() {
     	BorderPacker style = toData().getBorderStyle();
 		LineBorder DEFAULT_LINE_BORDER = (LineBorder) DEFALUTBORDER;