Browse Source

Merge remote-tracking branch 'origin/release/11.0' into release/11.0

final/11.0
Hoky 3 years ago
parent
commit
f6247b4f04
  1. 2
      designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java
  2. 9
      designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.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;

9
designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java

@ -409,6 +409,15 @@ public class ShareMainPane extends JPanel {
childClassify.clearBoxItems(); childClassify.clearBoxItems();
childClassify.refreshBoxItems(children); childClassify.refreshBoxItems(children);
} }
notifyRequiredSettingChanged(new ChangeEvent(parentClassify));
}
});
childClassify.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
notifyRequiredSettingChanged(new ChangeEvent(parentClassify));
} }
}); });

Loading…
Cancel
Save