This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a change to branch v6
in repository https://gitbox.apache.org/repos/asf/echarts.git


    from eed7264fe chore: merge master into v6
     add ecd2ff02c feat: init matrix coordinate
     add 780dd4b09 feat: render a rect for matrix coordinate
     add 3c1dcb413 feat(matrix): basic table labels
     add ce4530f5e feat(matrix): correct cell info and draw table borders
     add 55883fca5 feat(matrix): render cells border and text
     add ef9c3bd19 feat(matrix): matrix with heatmap
     add 0b90a9530 test(matrix): add test for pie
     add ce5fa4330 feat(matrix): pie series with matrix
     add 9b1c9a089 test(matrix): test case for pie series
     add 859ab1d22 feat(matrix): graph, scatter, custom
     add 0daaae1c7 test(matrix): update test cases
     add e510f3e57 fix(matrix): fix lint errors
     add 0b3f14bc8 fix(matrix): fix import
     add 9d1b48d0e test(matrix): more applications
     add 6e8c626fd test(matrix): fix test cases
     add b0529f915 feat(matrix): support convertToPixel and add a case for 
Periodic Table
     add 8bedb782f feat(matrix): support darkMode, headers can be hidden
     add ab3efd315 fix(matrix): remove unnecessary field
     add 6fe5d6991 fix(matrix): improve code
     add 31295e1e3 chore(matrix): update package.json
     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 a43e38d07 chore: merge branch 'v6' into 'feat-matrix'
     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 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
     add 09cdac9f0 feat(matrix): Add clipPath for text.
     add 469ad3503 fix(test infra): fix test bug introduced in 
8005bc3d41a24d06e7508d47e7b480f172ab6b1b
     add 1a9faac34 chore: fix comment and TS type error.
     add b2ac4939f feat(roam): Change cursor style to indicate the draggable 
area. (effect geo/insideDataZoom/treemap/sankey/graph roam)
     add 10b4528c1 test(infra): testHelper support multiple inner range in 
select input.
     add 72cf70d2e test: Support suffix to range input
     add 0b9b08a0f test: Add resize cb.
     add 0661c799d fix(graph): #16904 introcuded percentage string here, such 
as '33%'. But it was based on canvas width/height, which is not reasonable - 
the unit may incorrect, and it is unpredictable if the `View['_rect']` is not 
calculated based on the current canvas rect. Therefore the percentage value is 
changed to based on `View['_rect'].width/height` since v6. Under this 
definition, users can use '0%' to map the top-left of `View['_rect']` to the 
center of `View['_viewRect']`.
     add 237badb87 feat: (1) Support `preserveAspect` `preserveAspectAlign` 
`preserveAspectVerticalAlign` for series.map/geo/series.graph in box layout 
(lay out by left/right/top/bottom/width/height). (2) Support `clip` on 
geo/series.map (3) Support `roamTigger: 'global' | 'selfRect'` to switch roam 
area to global on only self bounding rect. (4) Support cursor style change when 
hovering the roaming enabled area to hint users. (5) Fix that center and zoom 
option does not work in series.san [...]
     add 1465e18d9 feat(matrix): use tokens for color
     add 9ea647f21 Merge branch 'feat-matrix' of 
github.com:apache/incubator-echarts into feat-matrix
     add 74af455d4 feat(thumbnail): (1) Refactor thumbnail to a component for 
further extension, and add test cases. (2) Fix RoamController cursor style.
     add b5e06ca13 fix(graph): fix NPE when triggering graphRoam action after 
removing.
     add 732331794 test(matrix): complete visual test for matrix.
     add 7974074c7 switch zrender dep to v6
     new e4c0eb896 Merge pull request #19807 from apache/feat-matrix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 package-lock.json                                  |   10 +-
 package.json                                       |    2 +
 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           |    9 +-
 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/{chart/bar.ts => component/matrix.ts}          |    3 +-
 src/component/matrix/MatrixView.ts                 |  400 ++++
 src/component/{aria => matrix}/install.ts          |   12 +-
 src/{chart/bar.ts => component/thumbnail.ts}       |    5 +-
 src/component/thumbnail/ThumbnailBridgeImpl.ts     |   93 +
 src/component/thumbnail/ThumbnailModel.ts          |  161 ++
 src/component/thumbnail/ThumbnailView.ts           |  322 +++
 .../custom => component/thumbnail}/install.ts      |   10 +-
 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                                  |   88 +-
 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/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 +
 134 files changed, 16765 insertions(+), 1968 deletions(-)
 delete mode 100644 src/action/roamHelper.ts
 delete mode 100644 src/chart/graph/Thumbnail.ts
 create mode 100644 src/component/helper/thumbnailBridge.ts
 copy src/{chart/bar.ts => component/matrix.ts} (95%)
 create mode 100644 src/component/matrix/MatrixView.ts
 copy src/component/{aria => matrix}/install.ts (75%)
 copy src/{chart/bar.ts => component/thumbnail.ts} (94%)
 create mode 100644 src/component/thumbnail/ThumbnailBridgeImpl.ts
 create mode 100644 src/component/thumbnail/ThumbnailModel.ts
 create mode 100644 src/component/thumbnail/ThumbnailView.ts
 copy src/{chart/custom => component/thumbnail}/install.ts (81%)
 create mode 100644 src/coord/matrix/Matrix.ts
 create mode 100644 src/coord/matrix/MatrixBodyCorner.ts
 create mode 100644 src/coord/matrix/MatrixDim.ts
 create mode 100644 src/coord/matrix/MatrixModel.ts
 create mode 100644 src/coord/matrix/matrixCoordHelper.ts
 copy src/coord/{calendar => matrix}/prepareCustom.ts (58%)
 create mode 100644 test/calendar-other-coord-sys.html
 create mode 100644 test/geo-map-roam.html
 create mode 100644 test/graph-layout-roam.html
 create mode 100644 test/matrix.html
 create mode 100644 test/matrix2.html
 create mode 100644 test/matrix3.html
 create mode 100644 test/matrix_application.html
 create mode 100644 test/matrix_application2.html
 create mode 100644 test/runTest/actions/graph-thumbnail.json
 create mode 100644 test/runTest/actions/matrix2.json
 create mode 100644 test/runTest/actions/matrix3.json
 create mode 100644 test/runTest/actions/matrix_application.json
 create mode 100644 test/runTest/actions/matrix_application2.json


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to