This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch feat-matrix
in repository https://gitbox.apache.org/repos/asf/echarts.git
from a43e38d07 chore: merge branch 'v6' into 'feat-matrix'
add 6bcfe1064 test: sync test helper.
add 139206be7 test: manually sync visual test updates.
add 8ddd15d32 feat(visualMap): support specify `seriesId` on visualMap
option; previously only seriesIndex can be specified, not convenient and not
consistent with other components.
add 6beeef2f0 feat(matrix & calendar): (1). Support matrix col/row size
option. (2). Support corner content options in matrix. (3) Support body content
options. (4). Support matrix `mergeCells`. (5). Fix and refactor the matrix
style options, conserning their inheritance and z-order and flexibility. (6).
Support declaratively layout other components (including grid/polar/geo/graph
coord sys, and dataZoom/visualMap/legend/... components) based on
`matrix`/`calendar`. And and enhance t [...]
add 7e49f5153 fix(matrix): fix test case and typo
add 418b818ba Merge branch 'v6' into feat-matrix-enhance
add 13cf5621f refactor(layout): unify margin/padding apply util.
add a4ac20384 feat(matrix): (1). Support sankey, tree, treemap layout on
matrix and calendar coord sys. (2). Fix sankey layoutMode: 'box'.
add 5d555a296 feat(matrix): (1) Add lineOverflow to long text in cells.
(2) Fix text silent. It requires https://github.com/ecomfe/zrender/pull/1122
add a09d775f7 chore: merge branch 'feat-matrix' into 'feat-matrix-enhance'
add 31cf38681 tweak(series data): Add validator to hint incorrect option.
add 3123a3a93 test(matrix): Add an application case.
add 4a978a0a9 feat(matrix): fix treemap breadcrumb layout in matrix.
add 4c9428b7a feat: new theme color
add 1b19b8231 design: gray tokens
add 6fdd2bee8 design: colors using tokens
add 294ed78c2 feat: update theme
add 17a3bad35 feat: first round color all changed
add 5f0184b73 Merge branch 'v6' into feat-theme
add 6629fb2cd feat: update dataZoom theme
add 3898955ae fix: adjust themes
add c88e9f73c feat: update themes
add 74ddbde65 fix: fix unit test cases
add e23ed4442 feat(theme): use containDataZoom to avoid overlap
add 230ca049a fix(theme): adjust grid, legend, tokens
add f3c93a623 fix(theme): revert containDataZoom and update theme
add 8fd6cd4bc fix(theme): remove comment
add 731aac477 feat(theme): add dark theme
add 0882eddc7 feat(theme): remove light colorLayer
add 7b34b1923 fix(theme): update according to the pr review
add 77826be83 fix: update styles
add f9b2a821f chore(theme): support theme in visual test
add 8005bc3d4 test: support using theme in visual test
add f74b153af feat(theme): WIP v5 theme
add 88d658aa8 fix(theme): update v5 theme
add e7867e15a chore(test): support mark diff as expected
add bd4d96577 Merge branch 'v6' into feat-theme
add c4481090e test(theme): fix test cases of v6
add acf99c789 chore: fix visual test
add 21d4124f2 fix: remove an unintentionally added test case
add 4181b3f05 chore: merge v6
add 72f92ba3d chore(test): fix default actual source
add 3c33ba598 chore: remove unintentionally added files
add a1d61c223 chore: remove unintentionally added import
add b60f10569 Merge pull request #20865 from apache/feat-theme
add 5c11b747b fix(rich-text-inherit-plain): see
https://github.com/apache/echarts/pull/20977/files#r2128424459
add ad7c5c89a fix(rich-inherit-plain): fix and add test case.
add 90038733c Merge pull request #21016 from
apache/fix/rich-inherit-plain-label-2
add 29230b804 Merge remote-tracking branch 'origin/v6' into
feat-matrix-enhance
add 59e8c645a feat(matrix): change the definition of cell.size and
levelSize - based on matrix size rather than viewport size.
add 1a3e819da feat(matrix): (1) Fix text truncate area. (2) Remove extra
padding, use label.padding uniformly.
add 9b3f71eea test(matrix): Add visual test (partial, not complete)
add 069e68601 test: temporarily change zrender dep.
add e48b8ba58 Merge pull request #21005 from apache/feat-matrix-enhance
No new revisions were added by this update.
Summary of changes:
package-lock.json | 10 +-
package.json | 2 +-
src/chart/bar/BarSeries.ts | 14 +-
src/chart/bar/BaseBarSeries.ts | 9 +-
src/chart/bar/PictorialBarSeries.ts | 8 +-
src/chart/boxplot/BoxplotSeries.ts | 5 +-
src/chart/custom/CustomSeries.ts | 25 +-
src/chart/custom/CustomView.ts | 5 +-
src/chart/funnel/FunnelSeries.ts | 8 +-
src/chart/funnel/FunnelView.ts | 11 +-
src/chart/funnel/funnelLayout.ts | 6 +-
src/chart/gauge/GaugeSeries.ts | 21 +-
src/chart/graph/GraphSeries.ts | 6 +-
src/chart/graph/Thumbnail.ts | 21 +-
src/chart/graph/createView.ts | 23 +-
src/chart/heatmap/HeatmapLayer.ts | 3 +-
src/chart/heatmap/HeatmapSeries.ts | 11 +-
src/chart/heatmap/HeatmapView.ts | 30 +-
src/chart/helper/LargeLineDraw.ts | 3 +-
src/chart/helper/Line.ts | 3 +-
src/chart/helper/LinePath.ts | 3 +-
src/chart/helper/createGraphFromNodeEdge.ts | 2 +-
src/chart/helper/createSeriesData.ts | 10 +
src/chart/line/LineSeries.ts | 5 +-
src/chart/line/poly.ts | 3 +-
src/chart/map/MapSeries.ts | 31 +-
src/chart/pie/PieSeries.ts | 25 +-
src/chart/pie/PieView.ts | 12 +-
src/chart/pie/labelLayout.ts | 6 +-
src/chart/pie/pieLayout.ts | 20 +-
src/chart/sankey/SankeySeries.ts | 11 +-
src/chart/sankey/sankeyLayout.ts | 5 +-
src/chart/scatter/ScatterSeries.ts | 5 +-
src/chart/sunburst/sunburstVisual.ts | 6 +
src/chart/tree/TreeSeries.ts | 8 +-
src/chart/tree/TreeView.ts | 5 +-
src/chart/tree/treeLayout.ts | 5 +-
src/chart/treemap/Breadcrumb.ts | 35 +-
src/chart/treemap/TreemapSeries.ts | 32 +-
src/chart/treemap/TreemapView.ts | 5 +-
src/chart/treemap/treemapLayout.ts | 21 +-
src/component/axis/CartesianAxisView.ts | 5 +
src/component/axisPointer/AxisPointerModel.ts | 15 +-
src/component/axisPointer/modelHelper.ts | 1 +
src/component/brush/BrushModel.ts | 19 +-
src/component/calendar/CalendarView.ts | 8 +-
src/component/dataZoom/SliderZoomModel.ts | 46 +-
src/component/dataZoom/SliderZoomView.ts | 18 +-
src/component/helper/BrushController.ts | 5 +-
src/component/helper/listComponent.ts | 54 +-
src/component/legend/LegendModel.ts | 26 +-
src/component/legend/LegendView.ts | 18 +-
src/component/legend/ScrollableLegendModel.ts | 7 +-
src/component/marker/MarkAreaView.ts | 3 +-
src/component/matrix/MatrixView.ts | 472 +++--
src/component/timeline/SliderTimelineModel.ts | 58 +-
src/component/timeline/SliderTimelineView.ts | 5 +-
src/component/timeline/TimelineModel.ts | 5 +-
src/component/title/install.ts | 23 +-
src/component/toolbox/ToolboxModel.ts | 11 +-
src/component/toolbox/ToolboxView.ts | 27 +-
src/component/toolbox/feature/DataView.ts | 15 +-
src/component/toolbox/feature/DataZoom.ts | 3 +-
src/component/toolbox/feature/SaveAsImage.ts | 5 +-
src/component/tooltip/TooltipModel.ts | 14 +-
src/component/tooltip/TooltipView.ts | 8 +-
src/component/tooltip/tooltipMarkup.ts | 7 +-
src/component/visualMap/ContinuousModel.ts | 9 +-
src/component/visualMap/VisualMapModel.ts | 58 +-
src/component/visualMap/VisualMapView.ts | 3 +-
src/coord/CoordinateSystem.ts | 70 +-
src/coord/View.ts | 15 +-
src/coord/axisAlignTicks.ts | 5 +-
src/coord/axisDefault.ts | 20 +-
src/coord/calendar/Calendar.ts | 107 +-
src/coord/calendar/CalendarModel.ts | 28 +-
src/coord/calendar/prepareCustom.ts | 13 +-
src/coord/cartesian/Cartesian2D.ts | 4 +-
src/coord/cartesian/Grid.ts | 76 +-
src/coord/cartesian/GridModel.ts | 19 +-
src/coord/cartesian/cartesianAxisHelper.ts | 13 +-
src/coord/cartesian/defaultAxisExtentFromData.ts | 13 +-
src/coord/geo/Geo.ts | 18 +-
src/coord/geo/GeoModel.ts | 24 +-
src/coord/geo/geoCreator.ts | 40 +-
src/coord/matrix/Matrix.ts | 623 +++++-
src/coord/matrix/MatrixBodyCorner.ts | 291 +++
src/coord/matrix/MatrixDim.ts | 578 ++++--
src/coord/matrix/MatrixModel.ts | 336 ++-
src/coord/matrix/matrixCoordHelper.ts | 363 ++++
src/coord/matrix/prepareCustom.ts | 17 +-
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/radar/RadarModel.ts | 8 +-
src/coord/single/Single.ts | 44 +-
src/core/CoordinateSystem.ts | 313 ++-
src/core/echarts.ts | 119 +-
src/data/OrdinalMeta.ts | 35 +-
src/data/helper/dataProvider.ts | 59 +-
src/label/labelStyle.ts | 58 +-
src/layout/barGrid.ts | 5 +-
src/loading/default.ts | 7 +-
src/model/Component.ts | 10 +-
src/model/Global.ts | 4 +-
src/model/Series.ts | 3 +-
src/model/globalDefault.ts | 21 +-
src/model/referHelper.ts | 36 +-
src/theme/dark.ts | 212 +-
src/theme/light.ts | 35 -
src/util/graphic.ts | 101 +-
src/util/layout.ts | 275 ++-
src/util/model.ts | 86 +-
src/util/number.ts | 46 +-
src/util/styleCompat.ts | 7 +-
src/util/symbol.ts | 3 +-
src/util/types.ts | 99 +-
src/visual/tokens.ts | 214 ++
src/visual/visualDefault.ts | 3 +-
test/areaLineUpdate.html | 4 +-
test/axis-extrema.html | 10 +-
test/bar-markArea.html | 1 +
test/build/mktest-tpl.html | 137 +-
test/calendar-other-coord-sys.html | 882 ++++++++
test/check-build.html | 5 +-
test/circle-packing-with-d3.compat.html | 7 +-
test/circle-packing-with-d3.html | 9 +-
test/custom-shape-morphing2.html | 6 +-
test/custom-shape-morphing3.html | 1 -
test/custom-transition-ecStat.html | 1 -
test/dataZoom-action.html | 18 +-
test/ie-svg-export.html | 9 +-
test/ios13-z-bug.html | 6 +-
test/lib/config.js | 65 +-
test/lib/reset.css | 163 +-
test/lib/testHelper.js | 2137 ++++++++++++++++----
test/lines-ny.html | 7 +-
test/matrix.html | 240 ++-
test/matrix2.html | 1803 +++++++++++++++++
test/matrix3.html | 1281 ++++++++++++
test/matrix_application.html | 711 ++++++-
test/matrix_application2.html | 801 ++++++++
test/pie-coordinate-system.html | 16 +-
test/pie-label.html | 4 +-
test/rich-inherit-plain-label.html | 190 +-
test/runTest/actions/__meta__.json | 5 +-
test/runTest/actions/matrix2.json | 1 +
test/runTest/actions/matrix_application.json | 1 +
test/runTest/actions/matrix_application2.json | 1 +
test/runTest/actions/rich-inherit-plain-label.json | 2 +-
test/runTest/cli.js | 13 +-
test/runTest/client/client.css | 117 +-
test/runTest/client/client.js | 445 +++-
test/runTest/client/index.html | 98 +-
test/runTest/genReport.js | 265 ++-
test/runTest/marks/axis-break-2.json | 10 +
test/runTest/marks/axis-break-3.json | 10 +
test/runTest/marks/axis-break-4.json | 10 +
test/runTest/marks/axis-break.json | 10 +
test/runTest/marks/brush2.json | 10 +
test/runTest/marks/dataSelect.json | 10 +
test/runTest/marks/decal.json | 10 +
test/runTest/marks/emphasis-disabled.json | 10 +
test/runTest/marks/force-edge-ignoreLayout.json | 10 +
test/runTest/marks/gauge.json | 10 +
test/runTest/marks/graph-edge-highlight.json | 10 +
test/runTest/marks/graph-grid.json | 10 +
test/runTest/marks/graph-thumbnail.json | 10 +
test/runTest/marks/graph.json | 10 +
test/runTest/marks/hoverFocus.json | 10 +
test/runTest/marks/loading.json | 10 +
test/runTest/marks/sankey-labelValue.json | 10 +
test/runTest/marks/sunburst-book.json | 10 +
test/runTest/marks/sunburst-emphasis-focus.json | 10 +
test/runTest/marks/sunburst-label-align.json | 10 +
test/runTest/marks/sunburst-label-rotate.json | 10 +
test/runTest/marks/sunburst-label.json | 10 +
test/runTest/marks/sunburst-simple.json | 10 +
test/runTest/marks/theme-list.json | 10 +
test/runTest/marks/theme.json | 10 +
test/runTest/marks/universalTransition3.json | 10 +
test/runTest/server.js | 124 +-
test/runTest/store.js | 196 +-
test/runTest/util.js | 8 +
test/theme-list.html | 665 ++++++
test/tmp-base.html | 108 +-
test/ut/spec/api/containPixel.test.ts | 6 +-
test/ut/spec/api/converter.test.ts | 6 +-
test/ut/spec/component/visualMap/setOption.test.ts | 3 +-
test/ut/spec/series/custom.test.ts | 7 +
theme/{roma.js => rainbow.js} | 80 +-
theme/v5.js | 581 ++++++
193 files changed, 15334 insertions(+), 2137 deletions(-)
create mode 100644 src/coord/matrix/MatrixBodyCorner.ts
create mode 100644 src/coord/matrix/matrixCoordHelper.ts
delete mode 100644 src/theme/light.ts
create mode 100644 src/visual/tokens.ts
create mode 100644 test/calendar-other-coord-sys.html
create mode 100644 test/matrix2.html
create mode 100644 test/matrix3.html
create mode 100644 test/matrix_application2.html
create mode 100644 test/runTest/actions/matrix2.json
create mode 100644 test/runTest/actions/matrix_application.json
create mode 100644 test/runTest/actions/matrix_application2.json
create mode 100644 test/runTest/marks/axis-break-2.json
create mode 100644 test/runTest/marks/axis-break-3.json
create mode 100644 test/runTest/marks/axis-break-4.json
create mode 100644 test/runTest/marks/axis-break.json
create mode 100644 test/runTest/marks/brush2.json
create mode 100644 test/runTest/marks/dataSelect.json
create mode 100644 test/runTest/marks/decal.json
create mode 100644 test/runTest/marks/emphasis-disabled.json
create mode 100644 test/runTest/marks/force-edge-ignoreLayout.json
create mode 100644 test/runTest/marks/gauge.json
create mode 100644 test/runTest/marks/graph-edge-highlight.json
create mode 100644 test/runTest/marks/graph-grid.json
create mode 100644 test/runTest/marks/graph-thumbnail.json
create mode 100644 test/runTest/marks/graph.json
create mode 100644 test/runTest/marks/hoverFocus.json
create mode 100644 test/runTest/marks/loading.json
create mode 100644 test/runTest/marks/sankey-labelValue.json
create mode 100644 test/runTest/marks/sunburst-book.json
create mode 100644 test/runTest/marks/sunburst-emphasis-focus.json
create mode 100644 test/runTest/marks/sunburst-label-align.json
create mode 100644 test/runTest/marks/sunburst-label-rotate.json
create mode 100644 test/runTest/marks/sunburst-label.json
create mode 100644 test/runTest/marks/sunburst-simple.json
create mode 100644 test/runTest/marks/theme-list.json
create mode 100644 test/runTest/marks/theme.json
create mode 100644 test/runTest/marks/universalTransition3.json
create mode 100644 test/theme-list.html
copy theme/{roma.js => rainbow.js} (50%)
create mode 100644 theme/v5.js
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
