This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch v6 in repository https://gitbox.apache.org/repos/asf/echarts.git
commit eed7264fed3c9117cbc8bd429767afd5fb821089 Merge: 5d6645225 106ad3f88 Author: Ovilia <[email protected]> AuthorDate: Thu Jun 19 19:58:09 2025 +0800 chore: merge master into v6 src/component/dataZoom/SliderZoomView.ts | 3 +- src/processor/dataStack.ts | 29 ++- src/scale/Ordinal.ts | 2 +- src/util/types.ts | 1 + test/axis-dataset-null.html | 86 +++++++++ test/bar-stack-reverse.html | 281 ++++++++++++++++++++++++++++ test/runTest/actions/__meta__.json | 1 + test/runTest/actions/axis-dataset-null.json | 1 + 8 files changed, 397 insertions(+), 7 deletions(-) diff --cc src/scale/Ordinal.ts index 5c45f869c,61e7bd0b2..cf41374ff --- a/src/scale/Ordinal.ts +++ b/src/scale/Ordinal.ts @@@ -138,9 -140,10 +138,9 @@@ class OrdinalScale extends Scale<Ordina : Math.round(val); } - contain(rank: OrdinalRawValue | OrdinalNumber): boolean { - rank = this.parse(rank); - return scaleHelper.contain(rank, this._extent) - && rank >= 0 && rank < this._ordinalMeta.categories.length; + contain(val: OrdinalNumber): boolean { + return scaleHelper.contain(val, this._extent) - && this._ordinalMeta.categories[val] != null; ++ && val >= 0 && val < this._ordinalMeta.categories.length; } /** diff --cc test/runTest/actions/__meta__.json index 397679110,93b6f1faa..9570e3732 --- a/test/runTest/actions/__meta__.json +++ b/test/runTest/actions/__meta__.json @@@ -10,10 -10,7 +10,11 @@@ "axis": 1, "axis-align-ticks": 4, "axis-boundaryGap": 1, + "axis-break": 7, + "axis-break-2": 6, + "axis-break-3": 4, + "axis-break-4": 5, + "axis-dataset-null": 1, "axis-interval": 3, "axis-interval2": 3, "axis-lastLabel": 5, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
