This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch test-helper in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 250ccf8df2ca41290a6119af80ceee2586bfb59b Merge: 668bda105 85482d99e Author: 100pah <[email protected]> AuthorDate: Sat May 24 18:29:33 2025 +0800 Merge branch 'v6' into test-helper # Conflicts: # test/lib/reset.css # test/lib/testHelper.js package-lock.json | 10 +- package.json | 2 +- src/chart/bar/BarView.ts | 13 + src/chart/chord/ChordEdge.ts | 192 +++ src/chart/chord/ChordPiece.ts | 169 ++ src/chart/chord/ChordSeries.ts | 340 ++++ src/chart/chord/ChordView.ts | 153 ++ src/chart/chord/chordLayout.ts | 269 +++ src/chart/{scatter => chord}/install.ts | 21 +- src/chart/custom/CustomSeries.ts | 2 + src/chart/custom/CustomView.ts | 3 + src/chart/funnel/funnelLayout.ts | 11 +- src/chart/pie/PieView.ts | 13 +- src/chart/pie/labelLayout.ts | 4 +- src/chart/pie/pieLayout.ts | 63 +- src/chart/sankey/sankeyLayout.ts | 14 +- src/chart/scatter/install.ts | 8 +- src/chart/scatter/jitterLayout.ts | 50 + src/chart/tree/layoutHelper.ts | 15 - src/chart/tree/treeLayout.ts | 2 +- src/component/axis/AngleAxisView.ts | 2 +- src/component/axis/AxisBuilder.ts | 232 ++- src/component/axis/CartesianAxisView.ts | 35 +- src/component/axis/ParallelAxisView.ts | 2 +- src/component/axis/RadiusAxisView.ts | 5 +- src/component/axis/SingleAxisView.ts | 38 +- src/component/axis/axisAction.ts | 147 ++ src/component/axis/axisBreakHelper.ts | 90 + src/component/axis/axisBreakHelperImpl.ts | 559 ++++++ src/component/axis/axisSplitHelper.ts | 4 +- .../api/time.ts => component/axis/installBreak.ts} | 12 +- src/component/axisPointer/axisTrigger.ts | 3 +- src/component/marker/MarkPointView.ts | 21 +- src/component/marker/MarkerModel.ts | 1 + src/component/marker/markerHelper.ts | 14 +- src/component/radar/RadarView.ts | 6 +- src/component/tooltip/TooltipView.ts | 17 +- src/coord/Axis.ts | 20 +- src/coord/CoordinateSystem.ts | 6 +- src/coord/axisAlignTicks.ts | 15 +- src/coord/axisCommonTypes.ts | 106 +- src/coord/axisDefault.ts | 35 +- src/coord/axisHelper.ts | 113 +- src/coord/axisModelCreator.ts | 15 +- src/coord/axisTickLabelBuilder.ts | 34 +- src/coord/cartesian/Cartesian2D.ts | 7 +- src/coord/polar/Polar.ts | 8 +- src/coord/single/AxisModel.ts | 6 +- src/core/ExtendedElement.ts | 9 + src/core/echarts.ts | 287 +++- src/data/DataStore.ts | 57 - src/data/SeriesData.ts | 14 - src/echarts.all.ts | 12 +- src/echarts.common.ts | 10 +- src/export/api/time.ts | 2 +- src/export/charts.ts | 2 + src/export/core.ts | 11 +- src/export/features.ts | 5 +- src/export/option.ts | 3 + src/label/labelLayoutHelper.ts | 114 +- src/legacy/dataSelectAction.ts | 6 +- src/model/Global.ts | 1 + src/model/Series.ts | 61 +- src/scale/Interval.ts | 148 +- src/scale/Log.ts | 160 +- src/scale/Ordinal.ts | 21 +- src/scale/Scale.ts | 122 +- src/scale/Time.ts | 312 ++-- src/scale/break.ts | 147 ++ src/scale/breakImpl.ts | 717 ++++++++ src/scale/helper.ts | 45 +- src/util/graphic.ts | 5 +- src/util/jitter.ts | 185 ++ src/util/layout.ts | 59 +- src/util/states.ts | 1 + src/util/time.ts | 340 +++- src/util/types.ts | 196 ++- test/axis-break-2.html | 1812 ++++++++++++++++++++ test/axis-break-3.html | 552 ++++++ test/axis-break-4.html | 831 +++++++++ test/axis-break.html | 1109 ++++++++++++ test/chord.html | 719 ++++++++ test/connect.html | 3 + test/custom-feature.html | 177 +- test/dataSelect.html | 11 +- test/lib/caseFrame.js | 5 +- test/lib/config.js | 2 + test/markPoint-stock.html | 207 +++ test/runTest/actions/__meta__.json | 5 + test/runTest/actions/axis-break-2.json | 1 + test/runTest/actions/axis-break-3.json | 1 + test/runTest/actions/axis-break-4.json | 1 + test/runTest/actions/axis-break.json | 1 + test/runTest/actions/chord.json | 1 + test/runTest/cli.js | 42 +- test/runTest/client/client.js | 4 +- test/runTest/compareScreenshot.js | 6 +- test/runTest/runtime/ActionPlayback.js | 30 +- test/runTest/runtime/main.js | 24 +- test/scatter-jitter.html | 633 +++++++ test/tooltip-axisPointer-snap.html | 370 ++++ test/ut/spec/data/SeriesData.test.ts | 21 - test/ut/spec/scale/interval.test.ts | 3 +- test/ut/spec/util/time.test.ts | 49 +- test/violin.html | 208 +++ 105 files changed, 11873 insertions(+), 914 deletions(-) diff --cc package-lock.json index dc17b343d,dc17b343d..31f728967 --- a/package-lock.json +++ b/package-lock.json @@@ -10,7 -10,7 +10,7 @@@ "license": "Apache-2.0", "dependencies": { "tslib": "2.3.0", -- "zrender": "5.6.1" ++ "zrender": "github:ecomfe/zrender#v6" }, "devDependencies": { "@babel/code-frame": "7.10.4", @@@ -11799,8 -11799,8 +11799,7 @@@ }, "node_modules/zrender": { "version": "5.6.1", -- "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz";, -- "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", ++ "resolved": "git+ssh://[email protected]/ecomfe/zrender.git#f7a821be838335178571edbf5cc425a464db1361", "license": "BSD-3-Clause", "dependencies": { "tslib": "2.3.0" @@@ -20568,9 -20568,9 +20567,8 @@@ } }, "zrender": { -- "version": "5.6.1", -- "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz";, -- "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", ++ "version": "git+ssh://[email protected]/ecomfe/zrender.git#f7a821be838335178571edbf5cc425a464db1361", ++ "from": "zrender@github:ecomfe/zrender#v6", "requires": { "tslib": "2.3.0" } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
