Skip to content

Commit

Permalink
Merge pull request #17614 from apache/master
Browse files Browse the repository at this point in the history
Add #15291 #17598 #17587 #17551 to release for 5.4.0
  • Loading branch information
100pah authored Sep 5, 2022
2 parents b9f330b + 74cd6ad commit 4d218b1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/chart/sunburst/sunburstAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export function installSunburstAction(registers: EChartsExtensionInstallRegister
}

if (__DEV__) {
deprecateReplaceLog('highlight', 'sunburstHighlight');
deprecateReplaceLog('sunburstHighlight', 'highlight');
}

// Fast forward action
Expand All @@ -103,7 +103,7 @@ export function installSunburstAction(registers: EChartsExtensionInstallRegister
payload = extend({}, payload);

if (__DEV__) {
deprecateReplaceLog('downplay', 'sunburstUnhighlight');
deprecateReplaceLog('sunburstUnhighlight', 'downplay');
}

api.dispatchAction(extend(payload, {
Expand All @@ -112,4 +112,4 @@ export function installSunburstAction(registers: EChartsExtensionInstallRegister
}
);

}
}
1 change: 1 addition & 0 deletions src/export/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export {ZRColor as Color, Payload} from '../util/types';
export {LinearGradientObject} from 'zrender/src/graphic/LinearGradient';
export {RadialGradientObject} from 'zrender/src/graphic/RadialGradient';
export {PatternObject, ImagePatternObject, SVGPatternObject} from 'zrender/src/graphic/Pattern';
export {ElementEvent} from 'zrender/src/Element';

// ComposeOption
import type { ComponentOption, ECBasicOption as EChartsCoreOption } from '../util/types';
Expand Down
2 changes: 1 addition & 1 deletion src/util/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function deprecateReplaceLog(oldOpt: string, newOpt: string, scope?: stri
/**
* If in __DEV__ environment, get console printable message for users hint.
* Parameters are separated by ' '.
* @usuage
* @usage
* makePrintable('This is an error on', someVar, someObj);
*
* @param hintInfo anything about the current execution context to hint users.
Expand Down

0 comments on commit 4d218b1

Please sign in to comment.