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 f690b1a3d33aba6e7a4e7a60981b811bf6ff1114 Merge: 87dd3221f 48ac3dd0a Author: Ovilia <[email protected]> AuthorDate: Mon Jun 23 15:39:55 2025 +0800 Merge branch 'v6' of github.com:apache/echarts into v6 package-lock.json | 10 +- package.json | 4 +- src/action/roamHelper.ts | 92 - src/chart/bar/BarSeries.ts | 10 +- src/chart/bar/PictorialBarSeries.ts | 5 +- src/chart/custom/CustomSeries.ts | 25 +- src/chart/custom/CustomView.ts | 6 +- src/chart/funnel/FunnelSeries.ts | 1 + src/chart/funnel/funnelLayout.ts | 6 +- src/chart/graph/GraphSeries.ts | 11 +- src/chart/graph/GraphView.ts | 273 +-- src/chart/graph/Thumbnail.ts | 273 --- src/chart/graph/createView.ts | 31 +- src/chart/graph/install.ts | 27 +- src/chart/heatmap/HeatmapSeries.ts | 14 +- src/chart/heatmap/HeatmapView.ts | 46 +- src/chart/helper/createGraphFromNodeEdge.ts | 2 +- src/chart/helper/createSeriesData.ts | 10 + src/chart/map/MapSeries.ts | 14 +- src/chart/pie/PieSeries.ts | 18 +- src/chart/pie/PieView.ts | 12 +- src/chart/pie/labelLayout.ts | 6 +- src/chart/pie/pieLayout.ts | 20 +- src/chart/sankey/SankeySeries.ts | 7 +- src/chart/sankey/SankeyView.ts | 29 +- src/chart/sankey/install.ts | 10 +- src/chart/sankey/sankeyLayout.ts | 5 +- src/chart/scatter/ScatterSeries.ts | 2 +- src/chart/tree/TreeSeries.ts | 6 +- src/chart/tree/TreeView.ts | 15 +- src/chart/tree/treeAction.ts | 11 +- src/chart/tree/treeLayout.ts | 5 +- src/chart/treemap/Breadcrumb.ts | 35 +- src/chart/treemap/TreemapSeries.ts | 7 + src/chart/treemap/TreemapView.ts | 49 +- src/chart/treemap/treemapLayout.ts | 21 +- src/component/axis/axisBreakHelper.ts | 2 +- src/component/axisPointer/modelHelper.ts | 1 + src/component/calendar/CalendarView.ts | 8 +- src/component/dataZoom/SliderZoomView.ts | 15 +- src/component/dataZoom/roams.ts | 29 +- src/component/geo/install.ts | 24 +- src/component/helper/MapDraw.ts | 72 +- src/component/helper/RoamController.ts | 373 +++- src/component/helper/cursorHelper.ts | 57 +- src/component/helper/interactionMutex.ts | 36 +- src/component/helper/listComponent.ts | 54 +- src/component/helper/roamHelper.ts | 159 +- src/component/helper/thumbnailBridge.ts | 91 + src/component/legend/LegendView.ts | 15 +- src/component/marker/markerHelper.ts | 2 +- src/component/{timeline.ts => matrix.ts} | 8 +- src/component/matrix/MatrixView.ts | 400 ++++ src/component/{timeline.ts => matrix/install.ts} | 16 +- src/component/{timeline.ts => thumbnail.ts} | 8 +- src/component/thumbnail/ThumbnailBridgeImpl.ts | 93 + src/component/thumbnail/ThumbnailModel.ts | 161 ++ src/component/thumbnail/ThumbnailView.ts | 322 +++ .../{timeline.ts => thumbnail/install.ts} | 14 +- src/component/timeline.ts | 2 +- src/component/timeline/SliderTimelineView.ts | 5 +- src/component/title/install.ts | 10 +- src/component/toolbox/ToolboxView.ts | 24 +- src/component/visualMap/VisualMapModel.ts | 45 +- src/component/visualMap/VisualMapView.ts | 3 +- src/coord/CoordinateSystem.ts | 70 +- src/coord/View.ts | 109 +- src/coord/axisAlignTicks.ts | 5 +- src/coord/calendar/Calendar.ts | 107 +- src/coord/calendar/CalendarModel.ts | 9 +- src/coord/calendar/prepareCustom.ts | 13 +- src/coord/cartesian/Cartesian2D.ts | 4 +- src/coord/cartesian/Grid.ts | 76 +- src/coord/cartesian/GridModel.ts | 8 +- src/coord/cartesian/cartesianAxisHelper.ts | 13 +- src/coord/cartesian/defaultAxisExtentFromData.ts | 13 +- src/coord/geo/Geo.ts | 25 +- src/coord/geo/GeoModel.ts | 10 +- src/coord/geo/geoCreator.ts | 52 +- src/coord/matrix/Matrix.ts | 630 ++++++ src/coord/matrix/MatrixBodyCorner.ts | 291 +++ src/coord/matrix/MatrixDim.ts | 460 +++++ src/coord/matrix/MatrixModel.ts | 333 +++ src/coord/matrix/matrixCoordHelper.ts | 363 ++++ src/coord/{calendar => matrix}/prepareCustom.ts | 31 +- src/coord/parallel/Parallel.ts | 9 +- src/coord/polar/Polar.ts | 31 +- src/coord/polar/polarCreator.ts | 11 +- src/coord/radar/Radar.ts | 11 +- src/coord/single/Single.ts | 44 +- src/core/CoordinateSystem.ts | 317 ++- src/core/ExtensionAPI.ts | 1 + src/core/echarts.ts | 200 +- src/data/OrdinalMeta.ts | 35 +- src/data/helper/dataProvider.ts | 59 +- src/echarts.all.ts | 13 +- src/export/components.ts | 6 + src/export/option.ts | 6 + src/label/labelStyle.ts | 25 +- src/model/Component.ts | 21 +- src/model/Global.ts | 1 + src/model/Series.ts | 3 +- src/model/referHelper.ts | 36 +- src/theme/dark.ts | 18 + src/util/graphic.ts | 226 +- src/util/layout.ts | 345 +++- src/util/model.ts | 87 +- src/util/number.ts | 46 +- src/util/types.ts | 137 +- test/build/mktest-tpl.html | 133 +- test/calendar-other-coord-sys.html | 882 ++++++++ test/geo-map-roam.html | 556 +++++ test/geo-svg-demo.html | 1 + test/graph-layout-roam.html | 515 +++++ test/graph-thumbnail.html | 170 +- test/lib/config.js | 4 +- test/lib/draggable.js | 8 +- test/lib/reset.css | 163 +- test/lib/testHelper.js | 2165 ++++++++++++++++---- test/markPoint-stock.html | 1 + test/matrix.html | 602 ++++++ test/matrix2.html | 1803 ++++++++++++++++ test/matrix3.html | 1319 ++++++++++++ test/matrix_application.html | 1381 +++++++++++++ test/matrix_application2.html | 801 ++++++++ test/pie-coordinate-system.html | 16 +- test/runTest/actions/__meta__.json | 5 + test/runTest/actions/graph-thumbnail.json | 1 + test/runTest/actions/matrix2.json | 1 + test/runTest/actions/matrix3.json | 1 + test/runTest/actions/matrix_application.json | 1 + test/runTest/actions/matrix_application2.json | 1 + test/sankey-roam.html | 220 +- test/tmp-base.html | 108 +- test/tree-roam.html | 321 ++- test/treemap-simple2.html | 103 + 136 files changed, 16776 insertions(+), 1983 deletions(-) diff --cc src/component/legend/LegendView.ts index 3239df360,2dc195fca..2761025fd --- a/src/component/legend/LegendView.ts +++ b/src/component/legend/LegendView.ts @@@ -131,15 -132,15 +132,15 @@@ class LegendView extends ComponentView selectorPosition = orient === 'horizontal' ? 'end' : 'start'; } - this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition); - // Perform layout. + const refContainer = layoutUtil.createBoxLayoutReference(legendModel, api).refContainer; const positionInfo = legendModel.getBoxLayoutParams(); - const viewportSize = {width: api.getWidth(), height: api.getHeight()}; const padding = legendModel.get('padding'); - const maxSize = layoutUtil.getLayoutRect(positionInfo, viewportSize, padding); + const maxSize = layoutUtil.getLayoutRect(positionInfo, refContainer, padding); + this.renderInner(itemAlign, legendModel, ecModel, api, selector, orient, selectorPosition, maxSize); + const mainRect = this.layoutInner(legendModel, itemAlign, maxSize, isFirstRender, selector, selectorPosition); // Place mainGroup, based on the calculated `mainRect`. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
