Browse Source

Pull request #6867: CHART-22060 fix:fvs图表第一个不是跟随主题default 是normal

Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0

* commit '8a4c03997e6c20eef2ca340fb67e89139f067d39':
  CHART-22060 fix:fvs图表第一个不是跟随主题default 是normal
bugfix/11.0
zheng 3 years ago
parent
commit
6341419726
  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