Skip to content

Commit a14f462

Browse files
committed
fix(theme): update setTheme
1 parent 4344997 commit a14f462

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

src/core/echarts.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -692,10 +692,8 @@ class ECharts extends Eventful<ECEventDefinition> {
692692
this._updateTheme(theme);
693693
if (this._model) {
694694
this._model.setTheme(this._theme);
695-
// Force refresh to apply theme changes
696-
updateMethods.prepareAndUpdate.call(this, {
697-
type: 'themeChanged'
698-
});
695+
// Just call update directly without event type
696+
updateMethods.prepareAndUpdate.call(this);
699697
}
700698
}
701699

@@ -1672,7 +1670,7 @@ class ECharts extends Eventful<ECEventDefinition> {
16721670

16731671
prepareAndUpdate(this: ECharts, payload: Payload): void {
16741672
prepare(this);
1675-
updateMethods.update.call(this, payload, {
1673+
updateMethods.update.call(this, payload, payload && {
16761674
// Needs to mark option changed if newOption is given.
16771675
// It's from MagicType.
16781676
// TODO If use a separate flag optionChanged in payload?

src/model/Global.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,6 @@ echarts.use([${seriesImportName}]);`);
545545

546546
setTheme(theme: object) {
547547
this._theme = new Model(theme);
548-
// Merge theme with current option directly
549-
mergeTheme(this.option, this._theme.option);
550-
// Reset to apply theme changes
551548
this._resetOption('recreate', null);
552549
}
553550

src/model/globalDefault.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ export default {
3535
colorBy: 'series',
3636

3737
color: [
38-
'#5470c6',
39-
'#91cc75',
40-
'#fac858',
41-
'#ee6666',
42-
'#73c0de',
43-
'#3ba272',
38+
'#5780fe',
39+
'#b5e45a',
40+
'#656990',
41+
'#ffa75c',
42+
'#5adfd3',
43+
'#f47da3',
4444
'#fc8452',
4545
'#9a60b4',
4646
'#ea7ccc'

0 commit comments

Comments
 (0)