Repository navigation
Conversation
|
Thanks for your contribution! Please DO NOT commit the files in dist, i18n, and ssr/client/dist folders in a non-release pull request. These folders are for release use only. |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brief Information
This pull request is in the type of:
What does this PR do?
Applies the fix from #21751 to the other string formatter templates (
{value},{name},{a}), so names and values containing$$,$&,$`or$'are shown as they are.Fixed issues
None reported. Follow-up to #21751 and #21787, which fixed the same problem in
formatTpland the aria labels.Details
Before: What was the problem?
Several components fill a string formatter with
formatter.replace('{value}', text). When the replacement is a string,String.prototype.replaceinterprets$sequences in it, so the inserted name or value is changed:xAxis: { type: 'category', data: ['$$'], axisLabel: { formatter: '<{value}>' } }shows<$>; a category$&shows<{value}>.legend.formatter: '[{name}]'with a series namedUS$$shows[US$].radar.axisName.formatter,visualMap.formatter(piecewise categories),dataZoom.labelFormatter, the axis pointer labelformatterandgeo.label.formatter.Price tiers (
$,$$,$$$) as axis categories or series names are a realistic example.After: How does it behave after the fixing?
These calls pass a function as the replacement, as #21751 did in
formatTpl, so the inserted text is used literally. Formatters that only insert numbers (gauge, boxplot item names, the scrollable legend page counter) are unchanged.test/ut/spec/component/formatterLiteralDollar.test.tschecks the axis label, legend, radar indicator name and visualMap category text with each of the four sequences: all 16 cases fail onreleaseand pass with this change. The full unit test suite (242 tests),npx tsc --noEmitand eslint on the changed files pass.Document Info
One of the following should be checked.
Misc
Security Checking
ZRender Changes
Related test cases or examples to use the new APIs
N.A.
Merging options
Other information