CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项

designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java

@@ -8,17 +8,12 @@ import com.fr.cert.token.lang.Collections;
 import com.fr.chart.base.ChartConstants;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.general.GeneralUtils;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JLabel;
 import javax.swing.JList;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -27,6 +22,12 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.LinearGradientPaint;
 import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Bjorn
@@ -69,21 +70,22 @@ public class ColorSchemeComboBox extends UIComboBox {
         Iterator names = config.names();
 
         if (preDefined) {
-            ColorInfo colorInfo = new ColorInfo();
-            List<Color> list = new ArrayList<>();
-            colorInfo.setColors(list);
-            TemplateTheme templateTheme = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTemplateTheme();
-            ThemedChartSeriesColor themedChartSeriesColor = templateTheme.getChartStyle().getThemedChartSeriesColor();
-            if (themedChartSeriesColor.isCombineColor()) {
-                colorInfo.setGradient(false);
-                list.addAll(templateTheme.getColorScheme().getColors());
-            } else {
-                colorInfo.setGradient(true);
-                list.add(themedChartSeriesColor.getBeginColor());
-                list.add(themedChartSeriesColor.getEndColor());
+            if (ChartEditContext.supportTheme()) {
+                ColorInfo colorInfo = new ColorInfo();
+                List<Color> list = new ArrayList<>();
+                colorInfo.setColors(list);
+                TemplateTheme templateTheme = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTemplateTheme();
+                ThemedChartSeriesColor themedChartSeriesColor = templateTheme.getChartStyle().getThemedChartSeriesColor();
+                if (themedChartSeriesColor.isCombineColor()) {
+                    colorInfo.setGradient(false);
+                    list.addAll(templateTheme.getColorScheme().getColors());
+                } else {
+                    colorInfo.setGradient(true);
+                    list.add(themedChartSeriesColor.getBeginColor());
+                    list.add(themedChartSeriesColor.getEndColor());
+                }
+                colorSchemes.put(Toolkit.i18nText("Fine-Design_Chart_Follow_Theme"), colorInfo);
             }
-            colorSchemes.put(Toolkit.i18nText("Fine-Design_Chart_Follow_Theme"), colorInfo);
-
         } else {
             //添加默认的方案和第一个方案
             String defaultName = config.getCurrentStyle();

designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java

@@ -23,4 +23,13 @@ public class ChartEditContext {
     public static boolean normalMode() {
         return current == ChartEditMode.NORMAL;
     }
+
+    /**
+     * 是否支持 主题样式 设置
+     *
+     * @return duchamp大屏模板模式 不支持
+     */
+    public static boolean supportTheme() {
+        return !duchampMode();
+    }
 }

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

@@ -5,7 +5,7 @@ import com.fr.design.dialog.BasicPane;
 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.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
@@ -39,18 +39,16 @@ public class ColorSelectBoxWithThemeStyle extends BasicPane {
     }
 
     private void initContent() {
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-        double[] columnSize = {f, e};
-        double p = TableLayout.PREFERRED;
 
-        double[] rowSize = {p, p, p};
         UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color"), SwingConstants.LEFT);
-        Component[][] components = {
+        Component[][] components = ChartEditContext.supportTheme() ? new Component[][]{
                 new Component[]{text, preButton},
                 new Component[]{null, colorSelectBox},
+        } : new Component[][]{
+                new Component[]{text, colorSelectBox}
         };
-        JPanel gapTableLayoutPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+
+        JPanel gapTableLayoutPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components);
         this.setLayout(new BorderLayout());
         this.add(gapTableLayoutPane, BorderLayout.CENTER);
     }
@@ -66,7 +64,7 @@ public class ColorSelectBoxWithThemeStyle extends BasicPane {
 
     private void checkPreButton() {
         colorSelectBox.setVisible(preButton.getSelectedIndex() == CUSTOM);
-        this.setPreferredSize(preButton.getSelectedIndex() == CUSTOM ? new Dimension(0, 55) : new Dimension(0, 23));
+        this.setPreferredSize(ChartEditContext.supportTheme() && preButton.getSelectedIndex() == CUSTOM ? new Dimension(0, 55) : new Dimension(0, 23));
     }
 
     public String title4PopupWindow() {
@@ -74,14 +72,14 @@ public class ColorSelectBoxWithThemeStyle extends BasicPane {
     }
 
     public void populate(ColorWithThemeStyle colorWithPreStyle) {
-        preButton.setSelectedIndex(colorWithPreStyle.isThemed() ? PREDEFINED_STYLE : CUSTOM);
+        preButton.setSelectedIndex(ChartEditContext.supportTheme() && colorWithPreStyle.isThemed() ? PREDEFINED_STYLE : CUSTOM);
         colorSelectBox.setSelectObject(colorWithPreStyle.getColor());
         checkPreButton();
     }
 
     public ColorWithThemeStyle update() {
         ColorWithThemeStyle colorWithPreStyle = new ColorWithThemeStyle();
-        colorWithPreStyle.setThemed(preButton.getSelectedIndex() == PREDEFINED_STYLE);
+        colorWithPreStyle.setThemed(ChartEditContext.supportTheme() && preButton.getSelectedIndex() == PREDEFINED_STYLE);
         colorWithPreStyle.setColor(colorSelectBox.getSelectObject());
         return colorWithPreStyle;
     }

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java

@@ -1,6 +1,7 @@
 package com.fr.van.chart.designer.component;
 
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.style.VanChartStylePane;
@@ -25,7 +26,7 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
     }
 
     public JPanel createCommonStylePane() {
-        if (isInCondition()) {
+        if (isInCondition() || !ChartEditContext.supportTheme()) {
             return super.createCommonStylePane();
         }
         setTextAttrPane(new ChartTextAttrPaneWithThemeStyle());
@@ -37,7 +38,7 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
     }
 
     public void updateTextAttr(AttrTooltipContent attrTooltipContent) {
-        if (isInCondition()) {
+        if (isInCondition() || !ChartEditContext.supportTheme()) {
             super.updateTextAttr(attrTooltipContent);
             return;
         }

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

@@ -16,6 +16,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.plugin.chart.attr.VanChartLegend;
 import com.fr.plugin.chart.type.LayoutType;
@@ -288,7 +289,7 @@ public class VanChartPlotLegendPane extends BasicPane {
     }
 
     private JPanel createTitleStylePane() {
-        textAttrPane = new ChartTextAttrPaneWithThemeStyle();
+        textAttrPane = ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() : new ChartTextAttrPane();
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 

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

@@ -17,8 +17,10 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.plugin.chart.attr.VanChartTitle;
 import com.fr.plugin.chart.vanchart.VanChart;
@@ -57,7 +59,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
     private JPanel titlePane;
 
     private TinyFormulaPane titleContent;
-    private ChartTextAttrPaneWithThemeStyle textAttrPane;
+    private ChartTextAttrPane textAttrPane;
     private UIButtonGroup<Integer> alignmentPane;
     private VanChartBackgroundWithOutShadowWithRadiusPane backgroundPane;
     private UIToggleButton useHtml;
@@ -188,7 +190,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
     }
 
     private JPanel createTitleStylePane() {
-        textAttrPane = new ChartTextAttrPaneWithThemeStyle();
+        textAttrPane = ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() : new ChartTextAttrPane();
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -22,6 +22,7 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
 import com.fr.design.mainframe.chart.gui.style.ColorSelectBoxWithThemeStyle;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
@@ -380,10 +381,21 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     }
 
     protected ChartTextAttrPane getChartTextAttrPane() {
-        return new ChartTextAttrPaneWithThemeStyle() {
+        return ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() {
             protected double getEdithAreaWidth() {
                 return TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
             }
+        } : new ChartTextAttrPane() {
+            @Override
+            protected JPanel getContentPane(JPanel buttonPane) {
+                double p = TableLayout.PREFERRED;
+                double f = TableLayout.FILL;
+                double e = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH;
+                double[] columnSize = {f, e};
+                double[] rowSize = {p, p, p};
+
+                return TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), rowSize, columnSize);
+            }
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java

@@ -9,6 +9,7 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithAuto;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.axis.VanChartGaugeAxis;
@@ -103,7 +104,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
         if (isMulti(gaugeStyle)) {
             return new ChartTextAttrPaneWithAuto(FontAutoType.SIZE_AND_COLOR);
         } else {
-            return new ChartTextAttrPaneWithThemeStyle();
+            return ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() : new ChartTextAttrPane();
         }
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java

@@ -8,6 +8,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.PaneTitleConstants;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.van.chart.designer.AbstractVanChartScrollPane;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.background.VanChartBackgroundPane;
@@ -49,7 +50,7 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane<Chart
         if(isPlot) {
             chartBackgroundPane = new VanChartBackgroundPane();
         } else {
-            chartBackgroundPane = new VanChartBackgroundPaneWithThemeStyle();
+            chartBackgroundPane = ChartEditContext.supportTheme() ? new VanChartBackgroundPaneWithThemeStyle() : new VanChartBackgroundPane();
         }
 
         double p = TableLayout.PREFERRED;

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

@@ -12,6 +12,7 @@ import com.fr.design.mainframe.chart.PaneTitleConstants;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
@@ -106,11 +107,11 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected VanChartBorderPane createBorderPanePane() {
-        return new VanChartBorderPaneWithPreStyle();
+        return ChartEditContext.supportTheme() ? new VanChartBorderPaneWithPreStyle() : new VanChartBorderPane();
     }
 
     protected ChartTextAttrPane createChartTextAttrPane() {
-        return new ChartTextAttrPaneWithThemeStyle();
+        return ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() : new ChartTextAttrPane();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterLabelContentPane.java

@@ -1,6 +1,8 @@
 package com.fr.van.chart.scatter;
 
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithThemeStyle;
+import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.van.chart.designer.component.VanChartHtmlLabelPane;
 import com.fr.van.chart.designer.component.VanChartHtmlLabelPaneWithBackGroundLabel;
@@ -28,7 +30,7 @@ public class  VanChartScatterLabelContentPane extends VanChartScatterTooltipCont
         if (isInCondition()) {
             return super.createCommonStylePane();
         }
-        setTextAttrPane(new ChartTextAttrPaneWithThemeStyle());
+        setTextAttrPane(ChartEditContext.supportTheme() ? new ChartTextAttrPaneWithThemeStyle() : new ChartTextAttrPane());
 
         JPanel stylePanel = new JPanel(new BorderLayout());
         stylePanel.add(getTextAttrPane(), BorderLayout.CENTER);