Browse Source

Merge pull request #6912 in DESIGN/design from release/11.0 to feature/x

* commit '6341419726da42de17684f0c742ea871ca9b05ac':
  CHART-22060 fix:fvs图表第一个不是跟随主题default 是normal
feature/x
superman 3 years ago
parent
commit
01560e1da0
  1. 2
      designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java

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

@ -153,7 +153,7 @@ public class ColorSchemeComboBox extends UIComboBox {
if (selectedIndex == itemCount - 2) { if (selectedIndex == itemCount - 2) {
return SelectType.COMBINATION_COLOR; return SelectType.COMBINATION_COLOR;
} }
if (selectedIndex == 0) { if (selectedIndex == 0 && ChartEditContext.supportTheme()) {
return SelectType.DEFAULT; return SelectType.DEFAULT;
} }
return SelectType.NORMAL; return SelectType.NORMAL;

Loading…
Cancel
Save