(echarts) branch workflow/update-notice-year deleted (was 642f37766)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git was 642f37766 style: remove redundant empty lines The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (d3733876f -> 323814424)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from d3733876f Merge pull request #19449 from hugo-syn/master add c422a5d26 chore(workflow): add a scheduled workflow to update the NOTICE year automatically add 642f37766 style: remove redundant empty lines new 323814424 Merge pull request #19452 from apache/workflow/update-notice-year 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: .github/workflows/.scripts/update-notice-year.js | 90 .github/workflows/update-notice-year.yml | 24 +++ 2 files changed, 114 insertions(+) create mode 100644 .github/workflows/.scripts/update-notice-year.js create mode 100644 .github/workflows/update-notice-year.yml - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: Merge pull request #19452 from apache/workflow/update-notice-year
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 32381442428e890d010a81003b66029ddc08825b Merge: d3733876f 642f37766 Author: Yi Shen AuthorDate: Sun Dec 31 23:07:54 2023 +0800 Merge pull request #19452 from apache/workflow/update-notice-year chore(workflow): add a scheduled workflow to update the NOTICE year automatically .github/workflows/.scripts/update-notice-year.js | 90 .github/workflows/update-notice-year.yml | 24 +++ 2 files changed, 114 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (f22a8edf8 -> d7ac6c380)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from f22a8edf8 Merge pull request #18525 from apache/fix-18517 add 18645a72f chore: update `jest-canvas-mock` to fix test fails on node v18 add 5fd7a07c8 chore: fix node version doesn't work and update node to v18 add d7ac6c380 Merge pull request #18538 from apache/fix/jest-canvas-mock No new revisions were added by this update. Summary of changes: .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly-next.yml | 4 +++- .github/workflows/nightly.yml| 5 - .github/workflows/source-release.yml | 6 +++--- package-lock.json| 14 +++--- package.json | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18420 from apache/master
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 5c1c53d2af1c21dd47a33d2178529006b5ff0e5c
Merge: 7749341f7 f27b6154f
Author: Yi Shen
AuthorDate: Mon Mar 27 22:11:06 2023 +0800
Merge pull request #18420 from apache/master
chore: merge master to next
.npmignore | 4 +-
CONTRIBUTING.md| 24 +-
KEYS | 49
NOTICE | 2 +-
README.md | 8 +-
dist/echarts.common.js | 286 +++---
dist/echarts.common.js.map | 2 +-
dist/echarts.common.min.js | 4 +-
dist/echarts.esm.js| 326 -
dist/echarts.esm.js.map| 2 +-
dist/echarts.esm.min.js| 4 +-
dist/echarts.js| 326 -
dist/echarts.js.map| 2 +-
dist/echarts.min.js| 4 +-
dist/echarts.simple.js | 206 -
dist/echarts.simple.js.map | 2 +-
dist/echarts.simple.min.js | 4 +-
i18n/langCS-obj.js | 1 +
i18n/langCS.js | 1 +
i18n/langDE-obj.js | 1 +
i18n/langDE.js | 1 +
i18n/langSI-obj.js | 1 +
i18n/langSI.js | 1 +
src/i18n/langTR.ts => i18n/langTR-obj.js | 33 ++-
src/i18n/langTR.ts => i18n/langTR.js | 29 +-
i18n/langVI-obj.js | 198 +
i18n/langVI.js | 194
i18n/langZH-obj.js | 1 +
i18n/langZH.js | 1 +
package-lock.json | 52 ++--
package.json | 8 +-
src/chart/bar/BarSeries.ts | 4 +-
src/chart/bar/BarView.ts | 28 +-
src/chart/bar/BaseBarSeries.ts | 73 -
src/chart/helper/{pieHelper.ts => sectorHelper.ts} | 0
src/chart/line/LineView.ts | 14 +-
src/chart/parallel/ParallelSeries.ts | 2 +-
src/chart/pie/PieView.ts | 2 +-
src/chart/sankey/SankeySeries.ts | 2 +-
src/chart/sankey/SankeyView.ts | 11 +-
src/chart/sunburst/SunburstPiece.ts| 7 +-
src/chart/sunburst/SunburstSeries.ts | 16 +-
src/chart/tree/TreeSeries.ts | 2 +-
src/component/axis/AxisBuilder.ts | 4 +-
src/component/axisPointer/BaseAxisPointer.ts | 8 +-
src/component/axisPointer/axisTrigger.ts | 6 +-
src/component/axisPointer/modelHelper.ts | 8 +-
src/component/axisPointer/viewHelper.ts| 2 +-
src/component/dataZoom/SliderZoomView.ts | 4 +-
src/component/helper/BrushController.ts| 12 +-
src/component/helper/BrushTargetManager.ts | 4 +-
src/component/helper/MapDraw.ts| 8 +-
src/component/marker/markerHelper.ts | 6 +-
src/component/toolbox/ToolboxView.ts | 4 +-
src/component/tooltip/TooltipHTMLContent.ts| 6 +-
src/component/tooltip/TooltipRichContent.ts| 7 +-
src/component/tooltip/TooltipView.ts | 16 +-
src/component/tooltip/seriesFormatTooltip.ts | 4 +-
src/component/tooltip/tooltipMarkup.ts | 4 +-
src/component/transform/filterTransform.ts | 8 +-
src/component/visualMap/ContinuousModel.ts | 4 +-
src/component/visualMap/ContinuousView.ts | 8 +-
src/component/visualMap/PiecewiseModel.ts | 4 +-
src/component/visualMap/VisualMapModel.ts | 4 +-
src/core/echarts.ts| 6 +-
src/data/DataStore.ts | 6 +-
src/data/Graph.ts | 88 +-
src/data/Source.ts | 8 +-
src/i18n/langCS.ts | 36 +--
src/i18n/langDE.ts | 38 +--
src/i18n/langEN.ts | 34 +--
src/i18n/langFR.ts | 34 +--
src/i18n/langHU.ts | 34 +--
src/i18n/langIT.ts
[echarts] branch next updated (7749341f7 -> 5c1c53d2a)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/echarts.git
from 7749341f7 Merge pull request #18049 from apache/master
add b0eeb4192 chore(deps-dev): bump terser from 5.3.8 to 5.14.2
add a9330a130 chore: update package-lock.json
add 88766b450 Merge pull request #18055 from neostfox/master
add a29290ad7 chore: fix several typos
add b76eff2b3 Merge pull request #18061 from striezel-stash/several-typos
add 4b4a732ae fix(tree): change symbol type. close #17946
add 6be45ba66 Merge pull request #18070 from ChepteaCatalin/fix-17946
add 47b6407f9 fix(ssr): fix label doesn't show in line series when `ssr`
is enabled.`
add d6ab9d4c8 Merge pull request #18032 from apache/fix-ssr-line
add 1c579089c chore: fix a few typos
add c86e55841 Merge pull request #18103 from striezel-stash/fix-small-typos
add c5eb4fa28 upload example
add 843c1e841 Merge pull request #18115 from huangyulie/fix-auto-huangyulie
add c91620ee3 chore: update notice year to 2023
add eaa332bb5 Merge pull request #18128 from apache/update-notice-year
add 3e22c04d6 chore(deps): bump json5 from 2.1.3 to 2.2.3
add 27415e3b8 Merge pull request #18142 from
apache/dependabot/npm_and_yarn/json5-2.2.3
add 2d8bc8f29 chore: fix few typos (#18203)
add 8120aaba4 docs: fix a lot of grammatical errors in CONTRIBUTING.md
(#18244)
add fc2be1895 feat(i18n): add Vietnamese(vi_VN) translation (#18279)
add da29a8d28 fix(dataset): object source contains `length` breaks render
add 9191ab257 Merge pull request #18276 from susiwen8/18050
add 6d1f49149 chore: ignore files about 'contributing' when publishing to
npm (#18301)
add 9335a76cf fix(sunburst): `radial` rotation label might upside down
add 3941fc9d2 fix(sunburst): adjust label rotation
add c206dc33d chore: simplify code
add dbec96f4a Merge pull request #18240 from susiwen8/#18023
add 6af586f69 (tooltip): fix alwaysShowContent doesn't work after
leaving the tooltip . close #18111
add 376e45580 (tooltip): fix alwaysShowContent doesn't work after
leaving the tooltip . close #18111
add ac64e3f1c (tooltip): fix alwaysShowContent doesn't work after
leaving the tooltip . close #18111
add 19c3c9d45 (tooltip): fix alwaysShowContent doesn't work after
leaving the tooltip . close #18111
add 0e2954c6d Merge pull request #18221 from jianghaoran116/fix-18111
add a20820117 fix(type): fix `treePathInfo` is missing in the type of
sunburst formatter callback & add missing type definition for the `data` option
add 9c743bee2 Merge pull request #18310 from apache/fix/sunburst-types
add 8401d1abe fix(markArea): markArea range in bar series #18130
add dc3a694cd chore: merge
add d5ea9373c fix(markArea): fix situations when dims is not defined
add 710e79d92 test: add test case for markers
add e02ca3816 style(marker): improve code
add 2752bea86 Merge pull request #18229 from apache/fix-18130
add bd767e20f fix(polar): support borderRadius for polar bars #17980
add 566743232 fix(polar): forgot to commit a new file
add dca62c973 feat: support bar background borderRadius
add 50641dba8 Merge branch 'master' into fix-17980
add baa57b0ae Merge pull request #17995 from apache/fix-17980
add 0be0cfcc0 feat(sankey): support `trajectory` for emphasis state #17451
add 5f49fbb38 fix(i18n): fix the abbr of "March" for the DE language
("Mar" -> "Mrz) (#18387)
add b84493a7f fix(custom): add info in custom renderItem #15789
add fdda0254e fix(sankey): provide missing label value in formatter #18212
add 33b4b87aa Merge pull request #18338 from apache/master
add 5b74a2208 fix: `sunbrust` label abnormal
add 1e6f6a9cd Merge pull request #18341 from susiwen8/fix-sunbrust-book
add cfb3a8a54 chore: release v5.4.2 (#18374)
add c89565a14 Merge remote-tracking branch 'origin/release' into
fix/merge-release-to-master
add e450ae01f Merge pull request #18414 from
apache/fix/merge-release-to-master
add 99e0c4e33 chore: update KEYS
add 3e9bd24c8 Merge pull request #18415 from apache/update-keys
add ebe5a4e3c chore: update deprecated npm `prepublish` hook to `prepare`
add 59180fd7c Merge pull request #18416 from apache/update-script
add bb9d488a1 fix(src/chart/parall): fix datatype. close #18411
add f27b6154f Merge pull request #18425 from ManishDait/fix-18411
new 5c1c53d2a Merge pull request #18420 from apache/master
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:
.npmignore
[echarts] branch master updated (f27b6154f -> 6dbe25ca7)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from f27b6154f Merge pull request #18425 from ManishDait/fix-18411 add 9caa5f8dd chore: update `prepublish` to `prepare` in build script. (follow up ecomfe/zrender#998 & #18416) new 6dbe25ca7 Merge pull request #18427 from apache/update-script 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: build/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18427 from apache/update-script
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 6dbe25ca7e5655c9a6cd73b2d489df8ff38f5fbe Merge: f27b6154f 9caa5f8dd Author: Yi Shen AuthorDate: Mon Mar 27 22:10:38 2023 +0800 Merge pull request #18427 from apache/update-script chore: update `prepublish` to `prepare` in build script build/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (6be45ba66 -> d6ab9d4c8)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 6be45ba66 Merge pull request #18070 from ChepteaCatalin/fix-17946 add 47b6407f9 fix(ssr): fix label doesn't show in line series when `ssr` is enabled.` new d6ab9d4c8 Merge pull request #18032 from apache/fix-ssr-line 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: src/chart/line/LineView.ts | 14 ++--- test/runTest/actions/__meta__.json | 1 + test/runTest/actions/svg-ssr.json | 1 + test/svg-ssr.html | 122 + 4 files changed, 131 insertions(+), 7 deletions(-) create mode 100644 test/runTest/actions/svg-ssr.json create mode 100644 test/svg-ssr.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18032 from apache/fix-ssr-line
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit d6ab9d4c80dde6613fe3cdc8e9f67d325b0df6eb Merge: 6be45ba66 47b6407f9 Author: Yi Shen AuthorDate: Tue Dec 20 19:13:23 2022 +0800 Merge pull request #18032 from apache/fix-ssr-line fix(ssr): fix label doesn't show in line series when `ssr` is enabled src/chart/line/LineView.ts | 14 ++--- test/runTest/actions/__meta__.json | 1 + test/runTest/actions/svg-ssr.json | 1 + test/svg-ssr.html | 122 + 4 files changed, 131 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #17861 from apache/fix/hashmap
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 273f3ede31f97a52060827baa7dfc9ea3ce9a055 Merge: 9c4b7423e 3f1de7425 Author: Yi Shen AuthorDate: Sun Nov 6 11:09:22 2022 +0800 Merge pull request #17861 from apache/fix/hashmap fix(data): change deprecated `map.data.hasOwnProperty` to `map.hasKey` package-lock.json | 15 --- package.json| 2 +- src/data/helper/createDimensions.ts | 11 +-- 3 files changed, 14 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (9c4b7423e -> 273f3ede3)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 9c4b7423e Merge pull request #17873 from striezel-stash/fix-some-typos add 68b2862ea fix(data): fix deprecated access to `HashMap.data` due to ecomfe/zrender#966, change `hasOwnProperty` to `hasKey`. add 3f1de7425 chore(dep): update zrender to the latest nightly version new 273f3ede3 Merge pull request #17861 from apache/fix/hashmap 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 | 15 --- package.json| 2 +- src/data/helper/createDimensions.ts | 11 +-- 3 files changed, 14 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch next-funnel updated (6781a9ec -> 6413d9b2)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next-funnel in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 6781a9ec docs: update documents for multiple level drilldown - `childGroupId` (#295) new 195c1478 feat(funnel): set prop to flaten the exit piece new 53673830 feat(funnel): add dynamicHegiht prop new 6d224c23 feat(funnel):add exitWidth prop new 1359abf4 feat(funnel):add transform rate between each data new e671605f feat(funnel): add attr explains new 92efefb3 feat(funnel): supplt doc new 6f9d7ad9 feat(funnel): use formatter to set funnel rate label new 308121b8 feat(funnel): prefect the api of rate label formatter new 6cdff619 feat(funnel): del tpl from rate label formatter new 84158a0c feat(funnel) add precision to funnl conversion rate new 6413d9b2 Merge pull request #281 from pe-3/feat-funnel-newProp The 2426 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: en/option/series/funnel.md | 74 ++-- zh/option/series/funnel.md | 76 -- 2 files changed, 146 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch next-funnel created (now 6781a9ec)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next-funnel in repository https://gitbox.apache.org/repos/asf/echarts-doc.git at 6781a9ec docs: update documents for multiple level drilldown - `childGroupId` (#295) No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next-funnel updated (1dadcabe2 -> 3034a94ea)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next-funnel in repository https://gitbox.apache.org/repos/asf/echarts.git from 1dadcabe2 Merge pull request #17611 from tyn1998/feat/multi-drill new c80384b5d feat(funnel): set prop to flatten the funnel exit #14863 new 4605cfca3 feat(funnel): add dynamic height new prop #16445 new cf4166c38 feat(funnel): add dynamic height new prop #16445 new 5d65776d1 feat(funnel): fix code styles error new 903f00e02 feat(funnel): add exitWidth prop new a67891c0b feat(funnel):add transform rate between each data new 8703c20d0 feat(funnel):add transform rate between each data new 94ad84bce feat(funnel): add dynamic size mapping mode new 4e0842e85 feat(funnel): fix funnel code style new fa55aca4e feat(funnel): change lastWidth as thickDegree which mean dynamicHeight funnel thick new 5aaf7b45c feat(funnel): fix the bug thay exit width can greater than 100% new 18a0dea34 feat(funnel):add auto test, and change dynamciSize into dynamciArea new 0ca2b9ebf feat(funnel): use formatter to set rate label text new 151de1dbd chore(workflow): dump github context object for debug new 06f50559e Merge branch 'master' into 'feat-funnel-newStyle' new a236499bc chore(workflow): remove debug step new d128b3fe9 Merge branch 'feat-funnel-newStyle' of github.com:pe-3/echarts-funnel-newfeat into feat-funnel-newStyle new fe14b3ba7 feat(funnel): use formatter to set rate label text new 646736cb5 feat(funnel): run test visual of funnel new feat new 83d6a844c feat(funnle): visual test of all funnel new feat new f5b1065e3 feat(funnel): rename test case file, delete dynamicArea new b7a2e5ca2 feat(funnel): remove unnecessary data from label format params new 19d9b6b14 feat(funnel): remove tpl from rate label fomatter new f4d568148 feat(funnel): fix overall rate label set styles separately new ebda31ab0 feat(funnel): give formatter in params new 3034a94ea Merge pull request #17461 from pe-3/feat-funnel-newStyle The 8957 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: src/chart/funnel/FunnelSeries.ts | 20 ++ src/chart/funnel/FunnelView.ts | 201 --- src/chart/funnel/funnelLayout.ts | 327 - test/funnel-dynamicHeight.html | 162 test/funnel-showRate.html | 159 test/runTest/actions/__meta__.json | 2 + test/runTest/actions/funnel-dynamicHeight.json | 1 + test/runTest/actions/funnel-showRate.json | 1 + 8 files changed, 779 insertions(+), 94 deletions(-) create mode 100644 test/funnel-dynamicHeight.html create mode 100644 test/funnel-showRate.html create mode 100644 test/runTest/actions/funnel-dynamicHeight.json create mode 100644 test/runTest/actions/funnel-showRate.json - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next-funnel created (now 1dadcabe2)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next-funnel in repository https://gitbox.apache.org/repos/asf/echarts.git at 1dadcabe2 Merge pull request #17611 from tyn1998/feat/multi-drill No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next updated (7a12c0ba8 -> 1dadcabe2)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git from 7a12c0ba8 Merge pull request #17796 from apache/master new 6f500be79 test(universalTransition): a possible test file new 0f850296a wip: successfully get childGroupId (a possible new interface) new 4d4634fd4 wip: can decide "parent2child" or "child2parent" new a4cf7f9f2 wip: new createKeyGetters that suppot multi-drill (but only get key from dim) new 788daecc1 wip: should consider getting direction from more ways & using groupId only when direction is 'nodirection' new 5063c519f refactor: rename "KeyDim" to "GroupIdDim" new 01ba523a7 learning: add some comments new 5e475a208 fix: incorrect dataGroupId for old data items in universalTransition new 6e555b754 feat: multiple level drill down (alpha) new 9fcbc7c58 refactor: more readable universalTransition-multiLevelDrillDown.html new ce89ee778 docs: add comments for code new b123f35e3 docs: improve comments in test html new 6168f98e2 docs: update universalTransition-multiLevelDrilldown.html new e5b9be310 Merge branch 'master' into feat/multi-drill new d6895216a revert changes introduced by a merge in mistake new 938e4152b rename `childGroupId` to `itemChildGroupId` to make it consistent with `itemGroupId` new 8e80c0116 no need to return undefined, just return new 55ba82589 use `!= null` to test if equal to `undefined` or `null` new ffbc6afaf not use enum, just use const variables new 5321c2d8d merge `getGroupId` and `getChildGroupId` into one function new dc9a3f68c use createHashMap() to improve performance new 6f7a395ac add another test case new edd2d3cf3 slow down animation update in test cases new 9d52862cb fix unexpected appearance of xAxis.name after switching options new 3d5b32c42 simplify code new 1dadcabe2 Merge pull request #17611 from tyn1998/feat/multi-drill The 8931 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: src/animation/universalTransition.ts | 174 +--- src/util/types.ts | 5 +- test/universalTransition-multiLevelDrillDown.html | 476 ++ 3 files changed, 606 insertions(+), 49 deletions(-) create mode 100644 test/universalTransition-multiLevelDrillDown.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next updated (0c82ead72 -> 7a12c0ba8)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/echarts.git
from 0c82ead72 Merge pull request #17716 from apache/master
add 96f859c92 fix: #17667 EChartsInitOpts type error about height and width
add db0f92abd Merge pull request #17727 from MainHou/master
add 049533132 chore: fix some typos
add a80fec3f8 fix(pie): fix percent isn't updated when the legend is
changed
add 8c8a1a2b8 refactor(pie): mount `seats` on data inner
add a840d4639 Merge pull request #17734 from apache/fix/pie-percent
add e79b4d40a Fix spelling mistake 'unkown' to 'unknown'
add 672c7240b Merge pull request #17750 from
mountainash/fix/unkown-spelling
add d7ff8c564 chore: update deprecated nodejs v12 in favor of v16 and
update action dependency version.
add c61494fcf Merge pull request #17764 from apache/action-node-version
add 069b69295 fix: incorrect dataGroupId for old data items in
universalTransition (#17559)
add 3f093f715 feat(sankey): `sankey` support `edgeLabel`
add ed36fbd8f feat(sankey): set edge style to sankeyVisual
add 69ec4c85d Merge branch 'master' into 7233
add 1a23b9da6 feat(sankey): `edgeLabel` only supports `inside`
add 79dffe615 Merge pull request #16767 from susiwen8/7233
add 28812d168 chore: fix some typos
add 788e09112 Merge pull request #17776 from striezel-stash/fix-typos
add 728cf4e81 feat(candlestick): provide borderColorDoji option for custom
doji color
add 004c3fa90 Merge pull request #17717 from apache/fix-11042
add 5cdbdd2de chore: fix a few typos
add 06ccd5c3d Merge pull request #17782 from striezel-stash/fix-typos
add 5309444d6 chore(workflow): always install the latest nightly version
of zrender when publishing nightly echarts
add cd7ec4cc6 fix(nightly-build): update echarts & zrender version to real
nightly version
add 5d6910f30 Merge pull request #17779 from apache/nightly-build
new 7a12c0ba8 Merge pull request #17796 from apache/master
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:
.github/workflows/ci.yml | 4 +-
.github/workflows/nightly-next.yml | 11 +-
.github/workflows/nightly.yml | 11 +-
.github/workflows/source-release.yml | 28 +--
.github/workflows/stale.yml| 2 +-
.../actions/update.js => build/nightly/post.js | 22 +-
build/{prepareNightly.js => nightly/prepare.js}| 7 +-
src/animation/customGraphicTransition.ts | 6 +-
src/animation/universalTransition.ts | 49 +++--
src/chart/candlestick/CandlestickSeries.ts | 2 +
src/chart/candlestick/CandlestickView.ts | 13 +-
src/chart/candlestick/candlestickLayout.ts | 37 +++-
src/chart/candlestick/candlestickVisual.ts | 6 +-
src/chart/lines/LinesSeries.ts | 2 +-
src/chart/pie/PieSeries.ts | 35 ++--
src/chart/sankey/SankeySeries.ts | 10 +
src/chart/sankey/SankeyView.ts | 10 +
src/chart/sankey/sankeyVisual.ts | 9 +-
src/component/dataZoom/roams.ts| 4 +-
src/component/helper/MapDraw.ts| 4 +-
src/coord/View.ts | 4 +-
src/coord/axisHelper.ts| 2 +-
src/coord/geo/GeoSVGResource.ts| 2 +-
src/coord/geo/Region.ts| 2 +-
src/core/CoordinateSystem.ts | 4 +-
src/core/Scheduler.ts | 16 +-
src/core/echarts.ts| 38 ++--
src/core/impl.ts | 4 +-
src/core/task.ts | 6 +-
src/data/DataStore.ts | 2 +-
src/data/SeriesData.ts | 44 ++--
src/data/helper/SeriesDataSchema.ts| 4 +-
src/data/helper/transform.ts | 8 +-
src/export/api.ts | 4 +-
src/export/api/helper.ts | 12 +-
src/export/charts.ts | 4 +-
src/layout/barGrid.ts | 2 +-
src/model/Component.ts | 8 +-
src/model/Global.ts| 14 +-
src/model/Model.ts | 2 +-
src/model/OptionManager.ts | 16 +-
src/model/Series.ts| 10 +-
src/mod
[echarts] 01/01: Merge pull request #17796 from apache/master
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 7a12c0ba82e4d5216ed274cc51d806bca2f9ab4b
Merge: 0c82ead72 5d6910f30
Author: Yi Shen
AuthorDate: Thu Oct 20 11:05:50 2022 +0800
Merge pull request #17796 from apache/master
Merge branch 'master' into 'next'
.github/workflows/ci.yml| 4 +-
.github/workflows/nightly-next.yml | 11 +-
.github/workflows/nightly.yml | 11 +-
.github/workflows/source-release.yml| 28 +--
.github/workflows/stale.yml | 2 +-
src/core/impl.ts => build/nightly/post.js | 34 +---
build/{prepareNightly.js => nightly/prepare.js} | 7 +-
src/animation/customGraphicTransition.ts| 6 +-
src/animation/universalTransition.ts| 49 --
src/chart/candlestick/CandlestickSeries.ts | 2 +
src/chart/candlestick/CandlestickView.ts| 13 +-
src/chart/candlestick/candlestickLayout.ts | 37 ++--
src/chart/candlestick/candlestickVisual.ts | 6 +-
src/chart/lines/LinesSeries.ts | 2 +-
src/chart/pie/PieSeries.ts | 35 ++--
src/chart/sankey/SankeySeries.ts| 10 ++
src/chart/sankey/SankeyView.ts | 10 ++
src/chart/sankey/sankeyVisual.ts| 9 +-
src/component/dataZoom/roams.ts | 4 +-
src/component/helper/MapDraw.ts | 4 +-
src/coord/View.ts | 4 +-
src/coord/axisHelper.ts | 2 +-
src/coord/geo/GeoSVGResource.ts | 2 +-
src/coord/geo/Region.ts | 2 +-
src/core/CoordinateSystem.ts| 4 +-
src/core/Scheduler.ts | 16 +-
src/core/echarts.ts | 38 ++--
src/core/impl.ts| 4 +-
src/core/task.ts| 6 +-
src/data/DataStore.ts | 2 +-
src/data/SeriesData.ts | 44 ++---
src/data/helper/SeriesDataSchema.ts | 4 +-
src/data/helper/transform.ts| 8 +-
src/export/api.ts | 4 +-
src/export/api/helper.ts| 12 +-
src/export/charts.ts| 4 +-
src/layout/barGrid.ts | 2 +-
src/model/Component.ts | 8 +-
src/model/Global.ts | 14 +-
src/model/Model.ts | 2 +-
src/model/OptionManager.ts | 16 +-
src/model/Series.ts | 10 +-
src/model/internalComponentCreator.ts | 6 +-
src/model/mixin/dataFormat.ts | 4 +-
src/scale/Interval.ts | 4 +-
src/scale/Time.ts | 10 +-
src/util/types.ts | 2 +-
src/view/Chart.ts | 2 +-
src/view/Component.ts | 2 +-
src/visual/VisualMapping.ts | 4 +-
src/visual/aria.ts | 2 +-
src/visual/helper.ts| 4 +-
src/visual/style.ts | 4 +-
test/candlestick-doji.html | 223
test/pie-percent.html | 126 -
test/runTest/actions/__meta__.json | 1 +
test/runTest/actions/pie-percent.json | 1 +
test/sankey-depth.html | 5 +
test/universalTransition2.html | 2 +-
59 files changed, 632 insertions(+), 262 deletions(-)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (069b69295 -> 79dffe615)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 069b69295 fix: incorrect dataGroupId for old data items in universalTransition (#17559) new 3f093f715 feat(sankey): `sankey` support `edgeLabel` new ed36fbd8f feat(sankey): set edge style to sankeyVisual new 69ec4c85d Merge branch 'master' into 7233 new 1a23b9da6 feat(sankey): `edgeLabel` only supports `inside` new 79dffe615 Merge pull request #16767 from susiwen8/7233 The 8894 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: src/chart/sankey/SankeySeries.ts | 10 ++ src/chart/sankey/SankeyView.ts | 10 ++ src/chart/sankey/sankeyVisual.ts | 9 - test/sankey-depth.html | 5 + 4 files changed, 33 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix: incorrect dataGroupId for old data items in universalTransition (#17559)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/master by this push:
new 069b69295 fix: incorrect dataGroupId for old data items in
universalTransition (#17559)
069b69295 is described below
commit 069b69295e3a65e16d9d2fbdef86a8d3bfc8023a
Author: Lam Tang
AuthorDate: Sat Oct 15 21:33:48 2022 +0800
fix: incorrect dataGroupId for old data items in universalTransition
(#17559)
---
src/animation/universalTransition.ts | 49 ++--
test/universalTransition2.html | 2 +-
2 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/animation/universalTransition.ts
b/src/animation/universalTransition.ts
index dabd7ee3e..c82d3d78f 100644
--- a/src/animation/universalTransition.ts
+++ b/src/animation/universalTransition.ts
@@ -43,16 +43,18 @@ import Displayable from 'zrender/src/graphic/Displayable';
const DATA_COUNT_THRESHOLD = 1e4;
-interface GlobalStore { oldSeries: SeriesModel[], oldData: SeriesData[] };
+interface GlobalStore { oldSeries: SeriesModel[], oldDataGroupIds: string[],
oldData: SeriesData[] };
const getUniversalTransitionGlobalStore = makeInner();
interface DiffItem {
+dataGroupId: string
data: SeriesData
dim: DimensionLoose
divide: UniversalTransitionOption['divideShape']
dataIndex: number
}
interface TransitionSeries {
+dataGroupId: string
data: SeriesData
divide: UniversalTransitionOption['divideShape']
dim?: DimensionLoose
@@ -83,6 +85,7 @@ function flattenDataDiffItems(list: TransitionSeries[]) {
const groupDim = getGroupIdDimension(data);
for (let dataIndex = 0; dataIndex < indices.length; dataIndex++) {
items.push({
+dataGroupId: seriesInfo.dataGroupId,
data,
dim: seriesInfo.dim || groupDim,
divide: seriesInfo.divide,
@@ -207,7 +210,7 @@ function transitionBetween(
// Use group id as transition key by default.
// So we can achieve multiple to multiple animation like drilldown
/ up naturally.
// If group id not exits. Use id instead. If so, only one to one
transition will be applied.
-const dataGroupId = data.hostModel && (data.hostModel as
SeriesModel).get('dataGroupId') as string;
+const dataGroupId = diffItem.dataGroupId;
// If specified key dimension(itemGroupId by default). Use this
same dimension from other data.
// PENDING: If only use key dimension of newData.
@@ -470,26 +473,35 @@ function findTransitionSeriesBatches(
) {
const updateBatches = createHashMap();
-const oldDataMap = createHashMap();
+const oldDataMap = createHashMap<{
+dataGroupId: string,
+data: SeriesData
+}>();
// Map that only store key in array seriesKey.
// Which is used to query the old data when transition from one to
multiple series.
const oldDataMapForSplit = createHashMap<{
key: string,
+dataGroupId: string,
data: SeriesData
}>();
each(globalStore.oldSeries, (series, idx) => {
+const oldDataGroupId = globalStore.oldDataGroupIds[idx] as string;
const oldData = globalStore.oldData[idx];
const transitionKey = getSeriesTransitionKey(series);
const transitionKeyStr = convertArraySeriesKeyToString(transitionKey);
-oldDataMap.set(transitionKeyStr, oldData);
+oldDataMap.set(transitionKeyStr, {
+dataGroupId: oldDataGroupId,
+data: oldData
+});
if (isArray(transitionKey)) {
// Same key can't in different array seriesKey.
each(transitionKey, key => {
oldDataMapForSplit.set(key, {
-data: oldData,
-key: transitionKeyStr
+key: transitionKeyStr,
+dataGroupId: oldDataGroupId,
+data: oldData
});
});
}
@@ -502,6 +514,7 @@ function findTransitionSeriesBatches(
}
each(params.updatedSeries, series => {
if (series.isUniversalTransitionEnabled() &&
series.isAnimationEnabled()) {
+const newDataGroupId = series.get('dataGroupId') as string;
const newData = series.getData();
const transitionKey = getSeriesTransitionKey(series);
const transitionKeyStr =
convertArraySeriesKeyToString(transitionKey);
@@ -515,16 +528,18 @@ function findTransitionSeriesBatches(
// TODO check if data is same?
updateBatches.set(transitionKeyStr, {
oldSeries: [{
-divide: getDivideShapeFromData(oldData),
-data: oldD
[echarts] branch release updated (3e068d7a4 -> b9f330b15)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/echarts.git from 3e068d7a4 Merge pull request #17570 from apache/master new 204f7a836 fix(theme): fix tooltips text style of the theme macarons new 71e954886 Merge pull request #17551 from mousne/master new 8b66bf74b fix: ensure compatibility with typescript@4.8 fixes #17581 new b9f330b15 Merge pull request #17582 from AviVahl/fix-ts4.8-compatibility The 8827 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: src/animation/basicTransition.ts | 8 src/chart/bar/BaseBarSeries.ts | 7 --- theme/macarons.js| 4 3 files changed, 12 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated (847e47cc -> c6ccf94d)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 847e47cc Merge pull request #270 from apache/fix-custom-merge new b0de16d3 feat:add 'atmosphere' new ab7dc772 fix: delete 'highlight' and 'downplay' from 'events' and 'action' new c899e497 Revert "fix: delete 'highlight' and 'downplay' from 'events' and 'action'" new 5c3e94d7 feat:supplement 'atmosphere' configuration new c6ccf94d Merge pull request #271 from yyp0716/dev The 2364 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: en/option-gl/component/globe.md| 5 + en/option-gl/partial/atmosphere.md | 28 zh/option-gl/component/globe.md| 5 + zh/option-gl/partial/atmosphere.md | 28 4 files changed, 66 insertions(+) create mode 100644 en/option-gl/partial/atmosphere.md create mode 100644 zh/option-gl/partial/atmosphere.md - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-www] branch master updated: switch to apache cdn in zh site
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-www.git
The following commit(s) were added to refs/heads/master by this push:
new 24ecf120 switch to apache cdn in zh site
24ecf120 is described below
commit 24ecf120f35bcf10783e117a06b37b61cc68882b
Author: pissang
AuthorDate: Sun Jul 3 11:28:01 2022 +0800
switch to apache cdn in zh site
---
config/env.asf.js | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/config/env.asf.js b/config/env.asf.js
index 65976c63..83d2b125 100644
--- a/config/env.asf.js
+++ b/config/env.asf.js
@@ -6,13 +6,15 @@ config.host = 'https://echarts.apache.org';
config.cdnPayRootMap = {
// Expensive!!! use it carefully.
// zh: 'https://echarts-www.cdn.bcebos.com', // origin:
'https://echarts-www.bj.bcebos.com'
-zh: 'https://fastly.jsdelivr.net/gh/apache/echarts-website@asf-site',
+// zh: 'https://fastly.jsdelivr.net/gh/apache/echarts-website@asf-site',
+zh: 'https://echarts.apache.org',
en: 'https://echarts.apache.org'
};
config.cdnFreeRootMap = {
// 'echarts.cdn.apache.org' have been configured for zh (?)
// zh: 'https://echarts.cdn.apache.org',
-zh: 'https://fastly.jsdelivr.net/gh/apache/echarts-website@asf-site',
+// zh: 'https://fastly.jsdelivr.net/gh/apache/echarts-website@asf-site',
+zh: 'https://echarts.apache.org',
en: 'https://echarts.apache.org'
};
config.galleryPath = 'https://echarts.apache.org/examples/';
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-publish-ci-on-fork updated (aeca584e7 -> f950face5)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch fix-publish-ci-on-fork in repository https://gitbox.apache.org/repos/asf/echarts.git from aeca584e7 chore: fix publish ci on fork add f950face5 chore: check owner on specific workflows No new revisions were added by this update. Summary of changes: .github/workflows/source-release.yml | 1 + .github/workflows/stale.yml | 1 + 2 files changed, 2 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-publish-ci-on-fork created (now aeca584e7)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch fix-publish-ci-on-fork in repository https://gitbox.apache.org/repos/asf/echarts.git at aeca584e7 chore: fix publish ci on fork This branch includes the following new commits: new aeca584e7 chore: fix publish ci on fork 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. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: chore: fix publish ci on fork
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch fix-publish-ci-on-fork
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit aeca584e79e44fa2a23dbfa2f4b081d403b6e7c3
Author: pissang
AuthorDate: Sun Jun 19 22:57:26 2022 +0800
chore: fix publish ci on fork
---
.github/workflows/nightly-next.yml | 1 +
.github/workflows/nightly.yml | 1 +
2 files changed, 2 insertions(+)
diff --git a/.github/workflows/nightly-next.yml
b/.github/workflows/nightly-next.yml
index a8f1f2a9c..b8c797884 100644
--- a/.github/workflows/nightly-next.yml
+++ b/.github/workflows/nightly-next.yml
@@ -11,6 +11,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
+if: ${{ github.repository_owner == 'apache' }}
strategy:
matrix:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 030044bbb..5f4a30238 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -11,6 +11,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
+if: ${{ github.repository_owner == 'apache' }}
strategy:
matrix:
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: fix: typo of "initial"
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new a24e60c8 fix: typo of "initial"
new 4ec97b31 Merge pull request #264 from jiawulin001/typo-'initial'
a24e60c8 is described below
commit a24e60c89df36cc31dd732bafc36f6c720dcf9eb
Author: jiawulin001
AuthorDate: Fri Jun 17 14:25:43 2022 +0800
fix: typo of "initial"
---
en/option/partial/axisPointer-common.md | 2 +-
en/tutorial/renderer.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/en/option/partial/axisPointer-common.md
b/en/option/partial/axisPointer-common.md
index 05e37c73..9e1c3070 100644
--- a/en/option/partial/axisPointer-common.md
+++ b/en/option/partial/axisPointer-common.md
@@ -108,7 +108,7 @@ Whether to trigger tooltip.
#${prefix} value(number) = null
-current value. When using [axisPointer.handle](xAxisPointer.handle), `value`
can be set to define the initail position of axisPointer.
+current value. When using [axisPointer.handle](xAxisPointer.handle), `value`
can be set to define the initial position of axisPointer.
#${prefix} status(boolean)
diff --git a/en/tutorial/renderer.md b/en/tutorial/renderer.md
index a43a69b4..4fdaac5b 100644
--- a/en/tutorial/renderer.md
+++ b/en/tutorial/renderer.md
@@ -4,7 +4,7 @@
Most of browser-side charting libraries use SVG or Canvas as their underlying
renderer. In the scope of Apache EChartsTM, they are usually
alternative, without critical differences. But in some environment and
scenarios, they show notable differences in performance or functionality.
-ECharts has been using Canvas as its renderer (use VML for IE8-) from the
beginning. As of [ECharts v3.8](https://github.com/apache/echarts/releases) we
provide an SVG renderer (beta version) as another option. Either of them can be
used by specifing parameter [renderer](api.html#echarts.init) as `'canvas'` or
`'svg'` when initailizing a chart instance.
+ECharts has been using Canvas as its renderer (use VML for IE8-) from the
beginning. As of [ECharts v3.8](https://github.com/apache/echarts/releases) we
provide an SVG renderer (beta version) as another option. Either of them can be
used by specifing parameter [renderer](api.html#echarts.init) as `'canvas'` or
`'svg'` when initializing a chart instance.
> Both SVG and Canvas, which are very different rendering implementations, are
> supported in ECharts by leveraging the Canvas and SVG renderers offered by
> the [zrender](https://github.com/ecomfe/zrender) library.
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated: fix translate issue
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/dev by this push:
new 994bb1da fix translate issue
994bb1da is described below
commit 994bb1daadba830edd61b28e5ad51eac34035a21
Author: pissang
AuthorDate: Thu Jun 9 20:00:52 2022 +0800
fix translate issue
---
zh/option/series/bar.md | 2 +-
zh/option/series/line.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zh/option/series/bar.md b/zh/option/series/bar.md
index 4bdb6b65..518d848c 100644
--- a/zh/option/series/bar.md
+++ b/zh/option/series/bar.md
@@ -229,7 +229,7 @@ option = {
如果[stack](~series-bar.stack)属性已被设置，如何堆积数值。选项。
+ `'samesign'` 只在要堆叠的值与当前累积的堆叠值具有相同的符号时才堆叠。
+ `'all' 堆叠所有的值，不管当前或累积的堆叠值的符号是什么。
-+ `'正' 只堆积正值。
++ `'positive' 只堆积正值。
+ `'negatve' 只堆叠负值。
## sampling(string)
diff --git a/zh/option/series/line.md b/zh/option/series/line.md
index 43d6d0bb..920a8916 100644
--- a/zh/option/series/line.md
+++ b/zh/option/series/line.md
@@ -106,7 +106,7 @@ const option = {
如果[stack](~series-bar.stack)属性已被设置，如何堆积数值。选项。
+ `'samesign'` 只在要堆叠的值与当前累积的堆叠值具有相同的符号时才堆叠。
+ `'all' 堆叠所有的值，不管当前或累积的堆叠值的符号是什么。
-+ `'正' 只堆积正值。
++ `'positive' 只堆积正值。
+ `'negatve' 只堆叠负值。
{{ use: partial-cursor() }}
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix(tree): fix tree unexpected expand (#16548)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/master by this push:
new 3ece5c065 fix(tree): fix tree unexpected expand (#16548)
3ece5c065 is described below
commit 3ece5c0658941a406ffe50e04bb8af991391a52d
Author: linghaoSu <56526981+lingha...@users.noreply.github.com>
AuthorDate: Tue Jun 7 13:39:21 2022 +0800
fix(tree): fix tree unexpected expand (#16548)
* fix(tree): fix tree unexpected expand
* [fix] remove redunant format code
* style: tweak code to be more clear
Co-authored-by: pissang
---
src/chart/tree/TreeView.ts | 5 -
test/runTest/actions/__meta__.json | 1 +
test/runTest/actions/tree-polyline.json | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/chart/tree/TreeView.ts b/src/chart/tree/TreeView.ts
index 2fab46a34..bd6a4ecc6 100644
--- a/src/chart/tree/TreeView.ts
+++ b/src/chart/tree/TreeView.ts
@@ -535,6 +535,8 @@ function drawEdge(
const edgeForkPosition = seriesModel.get('edgeForkPosition');
const lineStyle = itemModel.getModel('lineStyle').getLineStyle();
let edge = symbolEl.__edge;
+// curve edge from node -> parent
+// polyline edge from node -> children
if (edgeShape === 'curve') {
if (node.parentNode && node.parentNode !== virtualRoot) {
if (!edge) {
@@ -583,7 +585,8 @@ function drawEdge(
}
}
-if (edge) {
+// show all edge when edgeShape is 'curve', filter node `isExpand` is
false when edgeShape is 'polyline'
+if (edge && !(edgeShape === 'polyline' && !node.isExpand)) {
edge.useStyle(zrUtil.defaults({
strokeNoScale: true, fill: null
}, lineStyle));
diff --git a/test/runTest/actions/__meta__.json
b/test/runTest/actions/__meta__.json
index a46838963..473fa64b8 100644
--- a/test/runTest/actions/__meta__.json
+++ b/test/runTest/actions/__meta__.json
@@ -190,6 +190,7 @@
"tree-image": 1,
"tree-legend": 1,
"tree-radial": 2,
+ "tree-polyline": 1,
"treemap-action": 3,
"treemap-disk": 3,
"treemap-disk2": 3,
diff --git a/test/runTest/actions/tree-polyline.json
b/test/runTest/actions/tree-polyline.json
new file mode 100644
index 0..0804954af
--- /dev/null
+++ b/test/runTest/actions/tree-polyline.json
@@ -0,0 +1 @@
+[{"name":"Action
1","ops":[{"type":"mousemove","time":1697,"x":518,"y":593},{"type":"mousemove","time":1907,"x":481,"y":502},{"type":"mousemove","time":2114,"x":454,"y":483},{"type":"mousemove","time":2330,"x":448,"y":490},{"type":"mousedown","time":2590,"x":448,"y":492},{"type":"mousemove","time":2624,"x":448,"y":492},{"type":"mouseup","time":2704,"x":448,"y":492},{"time":2705,"delay":400,"type":"screenshot-auto"},{"type":"mousemove","time":3048,"x":449,"y":492},{"type":"mousemove","tim
[...]
\ No newline at end of file
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: docs(visual-map-continuous): fix spelling error
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new dfdf075c docs(visual-map-continuous): fix spelling error
new 176d9baf Merge pull request #259 from ren-wei/master
dfdf075c is described below
commit dfdf075c6c89c15d697a208d00837cf540b1c38a
Author: ren-wei
AuthorDate: Fri Jun 3 22:32:39 2022 +0800
docs(visual-map-continuous): fix spelling error
---
zh/option/component/visual-map-continuous.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zh/option/component/visual-map-continuous.md
b/zh/option/component/visual-map-continuous.md
index 7d143558..492c4629 100644
--- a/zh/option/component/visual-map-continuous.md
+++ b/zh/option/component/visual-map-continuous.md
@@ -37,7 +37,7 @@ option =
{"tooltip":{},"xAxis":{"type":"category","data":[0,1,2,3,4,5,6,7,8,9,10
## range(Array)
-
+
指定手柄对应数值的位置。`range` 应在 `min` `max` 范围内。例如：
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #17150 from apache/fix/geo
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 7a8808d63cdd7bf91f0152a91fbb4203ac4e1a03 Merge: 1a8002b0a 16016881a Author: Yi Shen AuthorDate: Fri Jun 3 11:58:29 2022 +0800 Merge pull request #17150 from apache/fix/geo fix(geo): fix `dataToPoint` may not be working in lineGL series. src/coord/geo/Geo.ts| 2 +- test/linesGL-ny-appendData.html | 6 -- 2 files changed, 5 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (1a8002b0a -> 7a8808d63)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 1a8002b0a Merge pull request #17086 from preset-io/villebro/negative-stack add 16016881a fix(geo): add back two missing arguments to `projectedToPoint` called in Geo `dataToPoint` function. new 7a8808d63 Merge pull request #17150 from apache/fix/geo 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: src/coord/geo/Geo.ts| 2 +- test/linesGL-ny-appendData.html | 6 -- 2 files changed, 5 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated (93983a46 -> 544e1f9d)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 93983a46 Merge branch 'master' into dev new 64a15472 feat: add stackStrategy docs new d4d6baa6 add version new 91952666 fix typo and add anchors new ecb8f10a add stackStrategy zh doc new 544e1f9d Merge pull request #255 from villebro/villebro/stackStrategy The 2322 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: en/option-gl/series/bar3D.md | 13 + en/option/series/bar.md | 14 ++ en/option/series/line.md | 14 ++ zh/option/series/bar.md | 15 ++- zh/option/series/line.md | 14 ++ 5 files changed, 69 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge branch 'master' into dev
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 93983a4654a66de33905f33e0b4be11abf1ae6e0 Merge: 1df22bda fa7708a1 Author: pissang AuthorDate: Sun May 29 17:13:19 2022 +0800 Merge branch 'master' into dev en/option-gl/partial/icon.md| 2 +- en/option/component/visual-map-piecewise.md | 6 -- en/option/partial/component-common-style.md | 6 ++ en/option/partial/icon.md | 2 +- en/option/series/bar.md | 7 ++- en/option/series/heatmap.md | 6 -- package-lock.json | 6 +++--- public/en/api.html | 12 ++-- public/en/option-gl.html| 12 ++-- public/en/option.html | 12 ++-- public/en/tutorial.html | 12 ++-- public/zh/api.html | 12 ++-- public/zh/option-gl.html| 12 ++-- public/zh/option.html | 12 ++-- public/zh/tutorial.html | 12 ++-- src/config.js | 2 +- zh/option-gl/partial/icon.md| 2 +- zh/option/component/visual-map-piecewise.md | 6 -- zh/option/partial/component-common-style.md | 6 ++ zh/option/partial/icon.md | 2 +- zh/option/series/bar.md | 7 ++- zh/option/series/heatmap.md | 6 -- 22 files changed, 96 insertions(+), 66 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated (1df22bda -> 93983a46)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 1df22bda Merge branch 'master' into dev add 0c9c7af6 chore(deps): bump async from 2.6.3 to 2.6.4 add cb1901f1 Merge pull request #247 from apache/dependabot/npm_and_yarn/async-2.6.4 add 83e3842f feat(piecewise): add `boolean` for `selectedMode` (#249) add f150447c fix: doc for realtimeSort. Close apache/echarts#16770 add 5c1669dc fix(cdn): use fastly CDN temporarily add 281968f7 fix(heatmap): add missing version hint for `itemStyle.borderRadius`, resolves apache/echarts#17128. add d1ab8590 fix(heatmap): add missing version hint for `itemStyle.borderRadius`. add 745be26a fix(cdn): change to fastly CDN. add fe67441d Add square as allowed builtin icon add 768dfac7 Merge pull request #256 from MasterOdin/patch-1 add fa7708a1 fix(icon): add missing icon `square`. new 93983a46 Merge branch 'master' into dev 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: en/option-gl/partial/icon.md| 2 +- en/option/component/visual-map-piecewise.md | 6 -- en/option/partial/component-common-style.md | 6 ++ en/option/partial/icon.md | 2 +- en/option/series/bar.md | 7 ++- en/option/series/heatmap.md | 6 -- package-lock.json | 6 +++--- public/en/api.html | 12 ++-- public/en/option-gl.html| 12 ++-- public/en/option.html | 12 ++-- public/en/tutorial.html | 12 ++-- public/zh/api.html | 12 ++-- public/zh/option-gl.html| 12 ++-- public/zh/option.html | 12 ++-- public/zh/tutorial.html | 12 ++-- src/config.js | 2 +- zh/option-gl/partial/icon.md| 2 +- zh/option/component/visual-map-piecewise.md | 6 -- zh/option/partial/component-common-style.md | 6 ++ zh/option/partial/icon.md | 2 +- zh/option/series/bar.md | 7 ++- zh/option/series/heatmap.md | 6 -- 22 files changed, 96 insertions(+), 66 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated (ecbe8faf -> 1df22bda)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from ecbe8faf optimize doc style add e0e37776 fix: changelog version add 09bbf84c fix(tree): add `tree.data.collapsed` (#229) add 301f2158 add missing `darkMode` option for en doc. add 2749c252 fix default value of toolbox `itemGap` add e6489f05 fix: Update ch/visual-map-piecewise.md add 0c2a981b Merge pull request #231 from jiawulin001/eChIssue#16706 add 1c16a7e9 Update text-style.md add 8d998509 Merge pull request #232 from mpolverini/patch-1 add 36d99f5f feat(scatter.scale): add `number` for `scale` add d46b16ac fix: remove space add bc8088b8 Merge pull request #233 from apache/scale add 039ddc01 Update document of areaStyle.origin add 84e302d9 Refine areaStyle.origin documentation add 58d6ca8d Merge pull request #234 from jiawulin001/eChPR#16719 add b4e3fb34 tweak areaStyle document. add version hint & example control. add 90aed520 tweak areaStyle document add 9c3a0fae add 5.33.2 changelog add 61b360ba tweak 5.3.2 changelog add 0ff40b62 tweak 5.3.2 changelog add 8e4da635 fix: reminded added to specify scope of `stack` add 901215a4 Merge pull request #236 from jiawulin001/eChIssue#16766 add a3acd6cb fix: Removing colorAlpha for bug existence and low priority add 6e2d0ac8 Remove itemStyle.colorAlpha, keep series.colorAlpha add cd9a3a94 Merge pull request #235 from jiawulin001/eChPR#16760 add 90d2b3fd fix(bar-race): realtimeSort was moved to series in apache/echarts@d155de1 add 94af90e4 fix(areaStyle.opacity): line areaStyle default opacity is 0.7 add 6eaac6c5 fix(radar): areaStyle.opacity default is 0.7 add 498c711c Merge pull request #237 from apache/area-style-opacity add 26b3a052 fix typo in 5.3.2 changelog add 67c0b2c0 add 5.3.2 release date add 7b4c643d add version hints add 597d4c87 chore(deps): bump moment from 2.27.0 to 2.29.2 in /editor add 281dc963 Merge pull request #241 from apache/dependabot/npm_and_yarn/editor/moment-2.29.2 add 578ee0cb Add Clarification to axis.position/offset add 9a5aa77f Update neater English specification add 514b4bad Merge pull request #239 from jiawulin001/issue#238 add 313dbb7d chore(deps): bump plist from 3.0.1 to 3.0.5 in /editor add 67f9859b Merge pull request #242 from apache/dependabot/npm_and_yarn/editor/plist-3.0.5 add c18d5c05 optimize doc style add f56d423c Fix params example for formatter code block add c787521b Merge pull request #245 from MasterOdin/docs_close_codeblock add 3f8af47d fix(tree): add `center` and `zoom` for `tree` add 0cf9d4c1 Merge pull request #244 from apache/tree add 5f9040c7 fix(formatter): sync en formatter doc from zh add 4253c856 Merge pull request #246 from apache/fix-formatter add 3c90a834 Merge branch 'master' of https://github.com/apache/echarts-doc new 1df22bda Merge branch 'master' into dev 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: editor/package-lock.json| 34 ++-- en/changelog.md | 24 -- en/option-gl/series/bar3D.md| 2 ++ en/option/component/geo-common.md | 4 +++ en/option/component/toolbox.md | 4 +-- en/option/component/x-axis.md | 19 +++ en/option/component/y-axis.md | 17 ++ en/option/option.md | 49 ++--- en/option/partial/area-style.md | 15 + en/option/partial/formatter.md | 41 +++- en/option/partial/text-style.md | 4 +-- en/option/partial/universal-transition.md | 4 +++ en/option/series/bar.md | 2 ++ en/option/series/line.md| 5 ++- en/option/series/radar.md | 6 ++-- en/option/series/scatter.md | 4 +-- en/option/series/tree.md| 19 ++- en/option/series/treemap.md | 12 --- zh/changelog.md | 24 -- zh/option-gl/series/bar3D.md| 2 ++ zh/option/component/geo-common.md | 4 +++ zh/option/component/toolbox.md | 4 +-- zh/option/component/visual-map-piecewise.md | 2 +- zh/option/component/x-axis.md | 19 +++ zh/option/component/y-axis.md | 17 +++--- zh/option/partial/area-style.md | 15 + zh/option/partial/universal-transition.
[echarts-doc] 01/01: Merge branch 'master' into dev
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 1df22bda916dcc7afa655936f65524d85c1b6860 Merge: ecbe8faf 3c90a834 Author: pissang AuthorDate: Sun May 29 17:12:13 2022 +0800 Merge branch 'master' into dev editor/package-lock.json| 34 ++-- en/changelog.md | 24 -- en/option-gl/series/bar3D.md| 2 ++ en/option/component/geo-common.md | 4 +++ en/option/component/toolbox.md | 4 +-- en/option/component/x-axis.md | 19 +++ en/option/component/y-axis.md | 17 ++ en/option/option.md | 49 ++--- en/option/partial/area-style.md | 15 + en/option/partial/formatter.md | 41 +++- en/option/partial/text-style.md | 4 +-- en/option/partial/universal-transition.md | 4 +++ en/option/series/bar.md | 2 ++ en/option/series/line.md| 5 ++- en/option/series/radar.md | 6 ++-- en/option/series/scatter.md | 4 +-- en/option/series/tree.md| 19 ++- en/option/series/treemap.md | 12 --- zh/changelog.md | 24 -- zh/option-gl/series/bar3D.md| 2 ++ zh/option/component/geo-common.md | 4 +++ zh/option/component/toolbox.md | 4 +-- zh/option/component/visual-map-piecewise.md | 2 +- zh/option/component/x-axis.md | 19 +++ zh/option/component/y-axis.md | 17 +++--- zh/option/partial/area-style.md | 15 + zh/option/partial/universal-transition.md | 4 +++ zh/option/series/bar.md | 2 ++ zh/option/series/line.md| 5 ++- zh/option/series/radar.md | 6 ++-- zh/option/series/scatter.md | 4 +-- zh/option/series/tree.md| 18 +++ zh/option/series/treemap.md | 12 --- 33 files changed, 232 insertions(+), 171 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (6ee5f7076 -> 99b0182c4)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 6ee5f7076 fix(time): Quarters split the year into 4 quarters not 3. close #17057 (#17073) new 99b012676 Add test for custom singleAxis. new d464d8c3f Fix prepareCustoms key for Single axis. new 9b670a075 Fix typo: pathes -> paths new 99b0182c4 Merge pull request #16850 from benlongo/fix_prepareCustoms_for_single_axis The 8670 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: src/chart/bar/PictorialBarView.ts | 8 ++-- src/chart/custom/CustomView.ts| 2 +- test/custom.html | 85 +-- 3 files changed, 86 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-www] 01/01: Merge pull request #33 from apache/fix-cdn
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-www.git commit 4470a5d76439a61dd948f95f894d4d6ef33c866f Merge: 4c9a7a81 5713495c Author: Yi Shen AuthorDate: Tue May 17 11:28:51 2022 +0800 Merge pull request #33 from apache/fix-cdn fix(cdn): use fastly CDN temporarily _jade/components/builder.jade | 2 +- _jade/en/events.jade | 2 +- _jade/en/events/2021-05-13-iscas.jade | 2 +- _jade/en/events/2021-07-05-apachecon.jade | 2 +- _jade/en/feature.jade | 2 +- _jade/en/index.jade | 6 ++--- _jade/zh/events.jade | 2 +- _jade/zh/events/2021-05-13-iscas.jade | 2 +- _jade/zh/events/2021-07-05-apachecon.jade | 2 +- _jade/zh/feature.jade | 2 +- _jade/zh/index.jade | 8 +++ builder/build.js | 2 +- config/common.js | 40 +++ config/env.asf.js | 4 ++-- js/index.js | 2 +- 15 files changed, 40 insertions(+), 40 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-www] branch master updated (4c9a7a81 -> 4470a5d7)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-www.git from 4c9a7a81 fix event image style on mobile add 5713495c fix(cdn): use fastly CDN temporarily new 4470a5d7 Merge pull request #33 from apache/fix-cdn 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: _jade/components/builder.jade | 2 +- _jade/en/events.jade | 2 +- _jade/en/events/2021-05-13-iscas.jade | 2 +- _jade/en/events/2021-07-05-apachecon.jade | 2 +- _jade/en/feature.jade | 2 +- _jade/en/index.jade | 6 ++--- _jade/zh/events.jade | 2 +- _jade/zh/events/2021-05-13-iscas.jade | 2 +- _jade/zh/events/2021-07-05-apachecon.jade | 2 +- _jade/zh/feature.jade | 2 +- _jade/zh/index.jade | 8 +++ builder/build.js | 2 +- config/common.js | 40 +++ config/env.asf.js | 4 ++-- js/index.js | 2 +- 15 files changed, 40 insertions(+), 40 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] 01/01: Merge pull request #52 from apache/fix-cdn
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git commit bd073ef671eb1382bc6e44852d2673758afc114a Merge: a521d2e 396afc0 Author: Yi Shen AuthorDate: Tue May 17 11:28:28 2022 +0800 Merge pull request #52 from apache/fix-cdn fix(cdn): use fastly CDN temporarily app.html | 12 ++-- components/markdown/Live.vue | 6 +++--- components/partials/Navbar/zh.vue| 2 +- contents/en/basics/release-note/5-3-0.md | 2 +- contents/zh/basics/release-note/5-3-0.md | 2 +- layouts/default.vue | 2 +- nuxt.config.js | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] branch master updated (a521d2e -> bd073ef)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git from a521d2e Merge pull request #51 from Bruce20190410/patch-1 add 396afc0 fix(cdn): use fastly CDN temporarily new bd073ef Merge pull request #52 from apache/fix-cdn 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: app.html | 12 ++-- components/markdown/Live.vue | 6 +++--- components/partials/Navbar/zh.vue| 2 +- contents/en/basics/release-note/5-3-0.md | 2 +- contents/zh/basics/release-note/5-3-0.md | 2 +- layouts/default.vue | 2 +- nuxt.config.js | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-examples] 01/01: Merge pull request #43 from apache/feat-share
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/echarts-examples.git commit bafef5a3f33c5aaa9c778072036db7e54d50f512 Merge: 62c9f2a9 6110ae00 Author: Yi Shen AuthorDate: Sun May 1 22:24:02 2022 +0800 Merge pull request #43 from apache/feat-share feat: support sharing code and using nightly version. build/webpack.config.js| 5 +- package-lock.json | 13395 ++- package.json | 4 + src/common/config.js |44 +- src/common/helper.js |24 +- src/common/i18n.js |26 +- src/common/store.js|49 +- src/dep/showDebugDirtyRect.js |35 +- src/editor/CodeMonaco.vue |38 +- src/editor/Editor.vue | 103 +- src/editor/Preview.vue | 613 +- src/editor/downloadExample.js | 108 +- src/editor/sandbox.js | 216 - src/editor/sandbox/estraverse.browser.js | 1 + src/editor/sandbox/handleLoop.js |78 + src/editor/sandbox/index.js| 163 + src/editor/sandbox/loopController.js |60 + src/editor/sandbox/openwith/codepen.js |29 + src/editor/sandbox/openwith/codesandbox.js |64 + src/editor/sandbox/openwith/helper.js |79 + src/editor/sandbox/setup.js| 369 + src/editor/sandbox/srcdoc.html |73 + 22 files changed, 14593 insertions(+), 983 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-examples] branch gh-pages updated (62c9f2a9 -> bafef5a3)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch gh-pages in repository https://gitbox.apache.org/repos/asf/echarts-examples.git from 62c9f2a9 Merge pull request #44 from fuchunhui/gh-pages add 18cf8777 feat: support sharing code and using nightly version. add 9ce74520 feat: use sandbox add 5515be33 fix: enhance sandbox security add 7b924ede fix: optimize example download add 6496b650 fix: make sandbox `getOption` synchronized add 06346be8 fix: optimize code & fix dat gui add ab20675b fix: tweak style & fix example download add fb700f75 fix seedrandom add 753545e5 feat: show error hint when infinite loops exists in code add fb84e60f chore: enlarge `maxExecTimePerLoop` to 10s. add 259f51b9 chore: optimize style add 68688039 feat: support opening code with CodeSandBox & CodePen add c96cfed9 fix: log time only shows HMS add 62493ff1 fix(sandbox): fix wrong `Math.random` replacement causes compilation to be failed add ecf4c30d chore: add FIXME annotation add 79eaa361 fix wrong var name add e8e4c5ee fix ROOT_PATH add 31cb6dc7 fix(sandbox): block potential redirection in code & expose more values of window add 46ac670a fix: add missing `break` keyword add 241822fd chore: tweak comments add cdc2c9be fix: enhance sandbox policy & not expose chartInstance anymore add e1050e76 chore: update content security policy of sandbox add 85d65e91 fix: set sandbox csp & mock localStorage/sessionStorage/cookie for BMap add 23267919 chore: optimize compress helper add 74161314 chore: optimize compress helper add 111e7d06 fix: not check echarts script add cc5740e6 chore: add more domains to sandbox csp add a937619c fix chart off add 787ded1a fix: allow data:// and blob:// protocols add 044396d5 chore: optimize estraverse browser js import add df598ad5 fix: override `document.defaultView` with custom limited `window` add 27aa32c7 fix: add back `allow-same-origin` for sandbox and tweak CSP rules for FireFox compatibility. add 7a78a254 fix: set CSP `frame-src` to `'none'` add 8ae6adef fix: add bdstatic.com to CSP allow list add 515139b6 fix: add apache.github.io to CSP allow list add e2141f2b chore: reload sandbox when clicking `Run` add db87f961 fix: limit shared code's access to global vars add 6110ae00 fix darkMode new bafef5a3 Merge pull request #43 from apache/feat-share 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: build/webpack.config.js| 5 +- package-lock.json | 13395 ++- package.json | 4 + src/common/config.js |44 +- src/common/helper.js |24 +- src/common/i18n.js |26 +- src/common/store.js|49 +- src/dep/showDebugDirtyRect.js |35 +- src/editor/CodeMonaco.vue |38 +- src/editor/Editor.vue | 103 +- src/editor/Preview.vue | 613 +- src/editor/downloadExample.js | 108 +- src/editor/sandbox.js | 216 - src/editor/sandbox/estraverse.browser.js | 1 + src/editor/sandbox/handleLoop.js |78 + src/editor/sandbox/index.js| 163 + src/editor/sandbox/loopController.js |60 + src/editor/sandbox/openwith/codepen.js |29 + src/editor/sandbox/openwith/codesandbox.js |64 + src/editor/sandbox/openwith/helper.js |79 + src/editor/sandbox/setup.js| 369 + src/editor/sandbox/srcdoc.html |73 + 22 files changed, 14593 insertions(+), 983 deletions(-) delete mode 100644 src/editor/sandbox.js create mode 100644 src/editor/sandbox/estraverse.browser.js create mode 100644 src/editor/sandbox/handleLoop.js create mode 100644 src/editor/sandbox/index.js create mode 100644 src/editor/sandbox/loopController.js create mode 100644 src/editor/sandbox/openwith/codepen.js create mode 100644 src/editor/sandbox/openwith/codesandbox.js create mode 100644 src/editor/sandbox/openwith/helper.js create mode 100644 src/editor/sandbox/setup.js create mode 100644 src/editor/sandbox/srcdoc.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-www] branch master updated: Add Rails Charts
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-www.git
The following commit(s) were added to refs/heads/master by this push:
new 69bd080d Add Rails Charts
new 5b0d8940 Merge pull request #32 from bkmgit/ruby
69bd080d is described below
commit 69bd080dbe64423ffc6168ca77b473d3e00fe3fb
Author: Benson Muite
AuthorDate: Sat Apr 30 10:45:09 2022 +0300
Add Rails Charts
---
config/common.js | 10 ++
1 file changed, 10 insertions(+)
diff --git a/config/common.js b/config/common.js
index eca84207..3e96a835 100644
--- a/config/common.js
+++ b/config/common.js
@@ -213,6 +213,16 @@ module.exports = {
}],
desc: 'Krisk bring Echarts to Python, and helpful tools for
statistical interactive visualization.',
descEN: 'Krisk bring Echarts to Python, and helpful tools for
statistical interactive visualization.'
+}, {
+image: '',
+name: 'Rails Charts',
+website: 'https://github.com/railsjazz/rails_charts',
+authors: [{
+name: 'Rails Charts',
+website: 'https://github.com/railsjazz/rails_charts'
+}],
+desc: 'Rails Charts提供了一个Ruby gem，可以在Ruby on Rails应用程序中使用图表。',
+descEN: 'Rails Charts provides a Ruby gem enabling use of ECharts
in Ruby on Rails applications.'
}, {
image: '',
name: 'recharts',
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (b98df5c45 -> b4250f8ae)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from b98df5c45 Merge pull request #16950 from fuchunhui/master add 5c53e9d84 chore: fix broken external editor links. add b4250f8ae Merge pull request #16966 from apache/fix-editor-link No new revisions were added by this update. Summary of changes: .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-examples] branch gh-pages updated: feat: enrich label-position, add more options
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/echarts-examples.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new c71fb882 feat: enrich label-position, add more options
new 62c9f2a9 Merge pull request #44 from fuchunhui/gh-pages
c71fb882 is described below
commit c71fb8827fee496732abc5d7e944614a788dd68e
Author: fuchunhui
AuthorDate: Fri Apr 1 18:42:51 2022 +0800
feat: enrich label-position, add more options
---
public/examples/ts/doc-example/label-position.js | 85
1 file changed, 43 insertions(+), 42 deletions(-)
diff --git a/public/examples/ts/doc-example/label-position.js
b/public/examples/ts/doc-example/label-position.js
index 0f76f95f..43978879 100644
--- a/public/examples/ts/doc-example/label-position.js
+++ b/public/examples/ts/doc-example/label-position.js
@@ -1,17 +1,18 @@
-var posList = [
-'left', 'right', 'top', 'bottom',
-'inside',
-'insideTop', 'insideLeft', 'insideRight', 'insideBottom',
-'insideTopLeft', 'insideTopRight', 'insideBottomLeft', 'insideBottomRight'
-];
-
app.configParameters = {
position: {
-options: posList.reduce(function (map, pos) {
-map[pos] = pos;
-return map;
-}, {})
+options: [
+'left', 'right', 'top', 'bottom',
+'inside',
+'insideTop', 'insideLeft', 'insideRight', 'insideBottom',
+'insideTopLeft', 'insideTopRight', 'insideBottomLeft',
'insideBottomRight'
+]
+},
+align: {
+options: ['left', 'center', 'right']
+},
+verticalAlign: {
+options: ['top', 'middle', 'bottom']
},
distance: {
min: 0,
@@ -21,55 +22,55 @@ app.configParameters = {
app.config = {
position: 'top',
-distance: 20,
+align: 'center',
+verticalAlign: 'middle',
+distance: 5,
onChange: function () {
myChart.setOption({
series: {
type: 'scatter',
label: {
-normal: {
-position: app.config.position,
-distance: app.config.distance
-}
+position: app.config.position,
+align: app.config.align,
+verticalAlign: app.config.verticalAlign,
+distance: app.config.distance
}
}
});
}
};
-
-
option = {
series: [
{
type: 'scatter',
-symbolSize: 160,
+symbolSize: 360,
symbol: 'roundRect',
data: [[1, 1]],
label: {
-normal: {
-
-position: app.config.position,
-distance: app.config.distance,
-
-show: true,
-formatter: [
-'Label Text',
-].join('\n'),
-backgroundColor: '#eee',
-borderColor: '#555',
-borderWidth: 2,
-borderRadius: 5,
-padding: 10,
-fontSize: 18,
-shadowBlur: 3,
-shadowColor: '#888',
-shadowOffsetX: 0,
-shadowOffsetY: 3,
-textBorderColor: '#000',
-textBorderWidth: 3,
-color: '#fff'
-}
+position: app.config.position,
+align: app.config.align,
+verticalAlign: app.config.verticalAlign,
+distance: app.config.distance,
+show: true,
+formatter: [
+'Label Text',
+].join('\n'),
+width: 200,
+height: 60,
+backgroundColor: 'rgba(0, 255, 255, 0.3)',
+borderColor: '#555',
+borderWidth: 2,
+borderRadius: 5,
+padding: 10,
+fontSize: 18,
+shadowBlur: 3,
+shadowColor: '#888',
+shadowOffsetX: 0,
+shadowOffsetY: 3,
+textBorderColor: '#000',
+textBorderWidth: 3,
+color: '#fff'
}
}
],
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (f783cd8af -> b98df5c45)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from f783cd8af Merge pull request #16939 from jiawulin001/issue#16930 new 8e6e8bb4a fix(tree): radial tree with single root doesn't work new 027d64c6a fix(tree): remove unused html new b98df5c45 Merge pull request #16950 from fuchunhui/master The 8655 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: src/chart/tree/TreeView.ts| 2 +- test/runTest/actions/__meta__.json| 2 +- test/runTest/actions/tree-radial.json | 2 +- test/tree-radial.html | 96 ++- 4 files changed, 65 insertions(+), 37 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (3961cefc0 -> f783cd8af)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 3961cefc0 Merge pull request #16922 from jiawulin001/issue#16909 new 62ab37959 fix: tooltip content won't change with axis extent when triggerOn set to 'click' new 1258fa715 fix: use short phrase 'triggerOn' instead new f783cd8af Merge pull request #16939 from jiawulin001/issue#16930 The 8652 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: src/component/tooltip/TooltipView.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next updated (4493fceec -> 0fa933dfc)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git from 4493fceec Merge pull request #16945 from apache/master new dd950c78a feat(LineDraw):series-lines support the effect animation go back new 0478f51cd rename the option from goback to roundTrip new 0fa933dfc Merge pull request #16943 from wangguisong/feat-goback The 8672 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: src/chart/helper/EffectLine.ts | 26 +- src/chart/helper/EffectPolyline.ts | 8 src/chart/helper/LineDraw.ts | 1 + 3 files changed, 22 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next updated (a7ff84ae7 -> 4493fceec)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git from a7ff84ae7 Merge pull request #16944 from apache/merge-master-to-next add b2897aca0 Add 'decal' to ITEM_STYLE_KEY_MAP and add check if it is 'none' add 11e37cc68 Update legend decal style dealer add ec1db268f fix lint error add 94856a961 added passed down api for functions in legendView add 7c029eece remove decal from ITEM_STYLE_KEY_MAP add 66d064ca0 Update with ternary expression add 6626f488c fix lint errors add a956d3e7e fix: fix names legendItemModel->itemStyleModel, legendModel->legendItemModel add e9d1f833a fix: remove explicit input 'false'(default) from getShallow add 3961cefc0 Merge pull request #16922 from jiawulin001/issue#16909 add 4493fceec Merge pull request #16945 from apache/master No new revisions were added by this update. Summary of changes: src/component/legend/LegendView.ts | 33 - 1 file changed, 20 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next updated (5dd49b4d9 -> a7ff84ae7)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git from 5dd49b4d9 Merge pull request #16683 from apache/master add 61ef71c4b fix(labelLine): update labelLine `ignore` add 3d8e25574 fix(visualmap): add textShadowColor, make text shadow work on visualMap. close #14440 add 21eee5774 fix(visualmap): use createTextStyle for more properties. close #14440 add 764b5c869 fix(visualmap): remove getTextShadow, createTextStyle already did that. close #14440 add a255fa15d fix(visualmap): use createTextStyle on handleLabel and indicatorLabel. close #14440 add 7bf453a99 Merge pull request #16679 from fuchunhui/fix-14440 add 45a882c0a feat(scatter): `scale` support number add 2ce7e1c9a chore: remove extra bracket add 07eb58b2e Merge pull request #16688 from susiwen8/fix-10033 add 52c0de306 fix(dataview): fix unexpected scrollbar and outline when using default textview. add b364916dd fix(dataview): set `display` of the default `textview` as `block`. add e5d1f48d1 Merge pull request #16691 from apache/fix-dataview add 0ce725bb7 fix(toolbox): toolbox doesn't enter emphasis state when hovering on the icon. add 57b0d8876 Merge pull request #16702 from apache/fix-toolbox add 5d3e06f5d fix(gauge): fix progress bar may be unexpectedly circle when value is `0` and `progress.roundCap` is enabled, resolves #16640. add a4cda9f9d Merge pull request #16653 from apache/fix-gauge add a5ad5deba fix(heatmap): add 0.5px to avoid the gaps in Cartesian 2D coordinate system when dpr is not an integer. add 5c9430ce6 Merge pull request #16714 from apache/fix-heatmap-gap add d7786c52c fix(dataZoom): fix the dataZoom was unexpectedly displayed at the top when data contains null values. add 4f7e2d7cc Merge pull request #16730 from yuanjiangxia/fix-dataZoom add 48472ee85 feat: allow areaStyle.origin to take number as input add 0e5e896ef An example of origin Updated add ad3a07a4b Merge pull request #16719 from jiawulin001/eChIssue#16717 add 5b4ad8859 fix(splitLine): fix chart throws errors when `radiusAxis.splitLine` is enabled. add c2f4ac666 Merge pull request #16736 from apache/fix-radius-splitLine add d5e44697e Merge branch 'master' into fix-16539 add 291bf29df fix(labelLine): use correct state name add 6c721de6b Merge pull request #16542 from susiwen8/fix-16539 add ad7adc267 fix(toolbox): fix toolbox title may be outside of the chart. add d3dbf1215 Merge pull request #16704 from apache/fix-toolbox-text-position add 45b75977c fix: wrong jpg instead of jpeg types add dfa1f0732 Merge pull request #16747 from yassilah/types/export-image add d3c5bec26 fix: CONTRIBUTING.md grammar add 65f604466 Merge pull request #16754 from DalpatRathore/grammar-check add b0f8d9100 fix(radar): fix regression bug brought by branch merging. (#15985) add 977bba135 Merge pull request #16764 from apache/fix-radar-tooltip add a6769e86c Merge pull request #16756 from apache/master add f2a3aaea4 chore: fix audited packages. add 503b57482 style: fix lint problems. add 780832793 test: fix potential path issue in Windows. add fc152765c release 5.3.2 add 8b2a4c4fa Merge pull request #16759 from apache/release-dev add 0681e9be3 Merge pull request #16819 from apache/release add c17df2da8 chore: add NPM install link to vote-release template. add 8e3aceb0c chore: update KEYS. add 83cbb281e chore: update homepage link in package.json add d706bda50 chore: remove deprecated tutorial link for custom build in README. add 045c85d0a Merge pull request #16820 from apache/update-keys-materials add cda23a02d fix(DataStore): fix typo 'Invalid'. close #16786 add 25109e317 Merge pull request #16824 from XXXMrG/fix-16786 add da71a9ec4 ci: add lint step add d0e8626c8 Merge pull request #16836 from apache/workflow-add-lint-step add 8ea10f4d0 [infra] reset notifications to commits@echarts for commits, PRs and issues add a1d0a676b Merge pull request #16857 from apache/humbedooh/notifications add 2fafe28dd fix: Dump areaStyle polygon when notMerge is true add f5c6ecdff Update for lint flaws add d92ddba61 test: tweak test case title and add VRT action. add 3b7ff4fc2 Merge pull request #16772 from jiawulin001/issue#16769 add 0062d9938 ci: fix lint may not work when pr synchronizes. add 084ea7f52 Merge pull request #16866 from apache/ci/lint add 1a8f622cc fix: bug 16849 add 1b9afd847 feat: move comment as require add 2a67f86e6 Merge pull request #16854 from Ling310/features/fix-16849 add ee116a0f7 fix(graph): user cursor has higher priority (#16867) add 7114d76b6 ci: fix node module cache doesn't work add b2168d5f3 Merge pull request #16881
[echarts] 01/01: Merge pull request #16944 from apache/merge-master-to-next
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git commit a7ff84ae7ddeed85e11aa34d6091a18bf8913bf6 Merge: 5dd49b4d9 38bcddc40 Author: Yi Shen AuthorDate: Tue Apr 26 15:15:32 2022 +0800 Merge pull request #16944 from apache/merge-master-to-next Merge master to next .asf.yaml |4 + .github/workflows/ci.yml | 68 +- CONTRIBUTING.md| 12 +- KEYS | 178 + README.md |4 +- build/source-release/template/vote-release.tpl |6 +- dist/echarts.common.js | 6064 dist/echarts.common.js.map |2 +- dist/echarts.common.min.js |2 +- dist/echarts.esm.js| 9104 dist/echarts.esm.js.map|2 +- dist/echarts.esm.min.js|2 +- dist/echarts.js| 9104 dist/echarts.js.map|2 +- dist/echarts.min.js|2 +- dist/echarts.simple.js | 4688 ++-- dist/echarts.simple.js.map |2 +- dist/echarts.simple.min.js |2 +- dist/extension/bmap.js.map |2 +- dist/extension/dataTool.js.map |2 +- package-lock.json | 1361 ++-- package.json |4 +- src/chart/effectScatter/EffectScatterSeries.ts |2 +- src/chart/gauge/GaugeView.ts | 17 +- src/chart/graph/GraphSeries.ts |6 + src/chart/graph/GraphView.ts |2 +- src/chart/heatmap/HeatmapView.ts | 20 +- src/chart/helper/Symbol.ts | 12 +- src/chart/helper/SymbolDraw.ts |4 +- src/chart/line/LineSeries.ts |2 +- src/chart/line/LineView.ts |4 + src/chart/line/helper.ts |7 +- src/chart/sunburst/SunburstSeries.ts |4 +- src/chart/sunburst/sunburstLayout.ts |2 +- src/chart/themeRiver/themeRiverLayout.ts |8 +- src/component/axis/RadiusAxisView.ts |5 +- src/component/dataZoom/SliderZoomView.ts |3 +- src/component/marker/MarkAreaView.ts | 28 +- src/component/marker/markerHelper.ts | 13 + src/component/toolbox/ToolboxView.ts | 28 +- src/component/toolbox/feature/DataView.ts |5 +- src/component/toolbox/feature/SaveAsImage.ts |2 +- src/component/visualMap/ContinuousView.ts | 29 +- src/component/visualMap/PiecewiseView.ts | 11 +- src/component/visualMap/VisualMapModel.ts |1 - src/coord/cartesian/Cartesian2D.ts | 12 + src/coord/cartesian/Grid.ts|2 +- src/coord/radar/RadarModel.ts |3 - src/core/echarts.ts|6 +- src/data/DataStore.ts | 10 +- src/label/labelGuideHelper.ts |2 +- src/model/mixin/dataFormat.ts |2 +- test/area-origin.html | 180 + test/dataZoom-feature.html | 112 +- test/gauge-case.html | 65 +- test/graph-symbol.html |2 + test/heatmap-gap-bug.html |6 +- test/heatmap-large.html|8 +- test/markArea.html | 93 +- test/pie-label.html| 59 + test/runTest/actions/__meta__.json |8 +- test/runTest/actions/heatmap-gap-bug.json |1 + test/runTest/actions/markArea.json |2 +- test/runTest/actions/radar3.json |2 +- test/runTest/actions/setOption.json|2 +- test/runTest/actions/splitLine.json|1 + test/runTest/genReport.js |2 +- test/scatter.html |1 + test/setOption.html| 49 +- test/splitLine.html| 62 +- test/toolbox-title.html|4 +- test/visualMap-continuous.html | 171 +- test/visualMap-pieces.html | 158 +- 73 files changed, 16096 insertions(+), 15761 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch merge-master-to-next created (now 38bcddc40)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch merge-master-to-next in repository https://gitbox.apache.org/repos/asf/echarts.git at 38bcddc40 Merge branch 'master' into merge-master-to-next No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: optimize doc style
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new c18d5c05 optimize doc style
new 3c90a834 Merge branch 'master' of https://github.com/apache/echarts-doc
c18d5c05 is described below
commit c18d5c05573e5c8fa3b3df6acf82077183a308c4
Author: pissang
AuthorDate: Tue Apr 19 14:33:23 2022 +0800
optimize doc style
---
src/components/DocContentItemCard.vue | 10 +++---
zh/option/component/dataset.md | 2 +-
zh/option/partial/axisPointer-common.md | 2 --
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/components/DocContentItemCard.vue
b/src/components/DocContentItemCard.vue
index e5a57606..569c9741 100644
--- a/src/components/DocContentItemCard.vue
+++ b/src/components/DocContentItemCard.vue
@@ -219,7 +219,7 @@ export default {
[echarts-doc] branch master updated (0cf9d4c1 -> 4253c856)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 0cf9d4c1 Merge pull request #244 from apache/tree add 5f9040c7 fix(formatter): sync en formatter doc from zh new 4253c856 Merge pull request #246 from apache/fix-formatter 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: en/option/partial/formatter.md | 40 +++- 1 file changed, 39 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge pull request #246 from apache/fix-formatter
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 4253c8566e8fa70a6c0dd2f0999e711f860359d9 Merge: 0cf9d4c1 5f9040c7 Author: Yi Shen AuthorDate: Sun Apr 24 09:23:37 2022 +0800 Merge pull request #246 from apache/fix-formatter fix(formatter): sync en formatter doc from zh en/option/partial/formatter.md | 40 +++- 1 file changed, 39 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (c787521b -> 0cf9d4c1)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from c787521b Merge pull request #245 from MasterOdin/docs_close_codeblock add 3f8af47d fix(tree): add `center` and `zoom` for `tree` new 0cf9d4c1 Merge pull request #244 from apache/tree 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: en/option/series/tree.md | 13 + zh/option/series/tree.md | 14 ++ 2 files changed, 27 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge pull request #244 from apache/tree
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 0cf9d4c1572db3c7c0bd7cc9796f5ad12b3f0f5c Merge: c787521b 3f8af47d Author: Yi Shen AuthorDate: Fri Apr 22 16:26:17 2022 +0800 Merge pull request #244 from apache/tree fix(tree): add `center` and `zoom` for `tree` en/option/series/tree.md | 13 + zh/option/series/tree.md | 14 ++ 2 files changed, 27 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (4a5219984 -> 3961cefc0)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 4a5219984 Merge pull request #16897 from kongmoumou/fix-type new b2897aca0 Add 'decal' to ITEM_STYLE_KEY_MAP and add check if it is 'none' new 11e37cc68 Update legend decal style dealer new ec1db268f fix lint error new 94856a961 added passed down api for functions in legendView new 7c029eece remove decal from ITEM_STYLE_KEY_MAP new 66d064ca0 Update with ternary expression new 6626f488c fix lint errors new a956d3e7e fix: fix names legendItemModel->itemStyleModel, legendModel->legendItemModel new e9d1f833a fix: remove explicit input 'false'(default) from getShallow new 3961cefc0 Merge pull request #16922 from jiawulin001/issue#16909 The 8649 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: src/component/legend/LegendView.ts | 33 - 1 file changed, 20 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: Fix params example for formatter code block
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git The following commit(s) were added to refs/heads/master by this push: new f56d423c Fix params example for formatter code block new c787521b Merge pull request #245 from MasterOdin/docs_close_codeblock f56d423c is described below commit f56d423cdea96af556a9e2616552ca9c5599b177 Author: Matthew Peveler AuthorDate: Thu Apr 21 13:34:42 2022 -0400 Fix params example for formatter code block Signed-off-by: Matthew Peveler --- en/option/partial/formatter.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en/option/partial/formatter.md b/en/option/partial/formatter.md index e5707e2c..b45af349 100644 --- a/en/option/partial/formatter.md +++ b/en/option/partial/formatter.md @@ -34,4 +34,5 @@ dimensionIndex: number, // Color of data color: string, - +} +``` - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated: optimize doc style
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/dev by this push:
new ecbe8faf optimize doc style
ecbe8faf is described below
commit ecbe8faf6b5a8dfa74cbb95652ff603ddf328ba4
Author: pissang
AuthorDate: Tue Apr 19 14:33:23 2022 +0800
optimize doc style
---
src/components/DocContentItemCard.vue | 10 +++---
zh/option/component/dataset.md | 2 +-
zh/option/partial/axisPointer-common.md | 2 --
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/components/DocContentItemCard.vue
b/src/components/DocContentItemCard.vue
index e5a57606..569c9741 100644
--- a/src/components/DocContentItemCard.vue
+++ b/src/components/DocContentItemCard.vue
@@ -219,7 +219,7 @@ export default {
[echarts] branch aggregate-transform updated (7f14e94dc -> 93ff2715f)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch aggregate-transform in repository https://gitbox.apache.org/repos/asf/echarts.git from 7f14e94dc fix(dataset): fix using transform in dataset may cause dead loop. add 93ff2715f test(dataset): fix unit test after changing from seriesLayoutBy to sourceLayout No new revisions were added by this update. Summary of changes: test/ut/spec/data/SeriesData.test.ts | 8 test/ut/spec/data/createDimensions.test.ts | 4 ++-- test/ut/spec/data/dataTransform.test.ts| 16 3 files changed, 14 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix(types): graph autoCurveness option
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/master by this push:
new 7779e6192 fix(types): graph autoCurveness option
new 4a5219984 Merge pull request #16897 from kongmoumou/fix-type
7779e6192 is described below
commit 7779e61927b3735dbf23183f84a2342c59ad80d3
Author: kongmoumou
AuthorDate: Sat Apr 16 14:36:39 2022 +0800
fix(types): graph autoCurveness option
---
src/chart/graph/GraphSeries.ts | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/chart/graph/GraphSeries.ts b/src/chart/graph/GraphSeries.ts
index d6c84687a..299b9a44d 100644
--- a/src/chart/graph/GraphSeries.ts
+++ b/src/chart/graph/GraphSeries.ts
@@ -224,6 +224,11 @@ export interface GraphSeriesOption
layoutAnimation?: boolean
}
+
+/**
+ * auto curveness for multiple edge, invalid when `lineStyle.curveness` is
set
+ */
+autoCurveness?: boolean | number | number[]
}
class GraphSeriesModel extends SeriesModel {
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (b2168d5f3 -> a5257e38a)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from b2168d5f3 Merge pull request #16881 from apache/ci-cache new 8faf0f6e7 fix: markArea display filter correction new 8e0359ee7 fix lint style error and add test case new a5bba6590 Use BoundingRect.intersect instead of rectRectIntersect new e90c07eb1 fix lint style errors new cb80d3aee Fix another lint style error new ad0c2dd92 Update with new BoundingRect create new 16b24573c fix lint style error new 670ac6864 test(markArea): add zoom interaction testing new d87e51a2b test(markArea): optimize test interactions new d3366c904 fix: Update comment on MarkAreaView.ts new cc3f4a740 optimize variable in MarkAreaView.ts new a5257e38a Merge pull request #16861 from jiawulin001/issue#16853 The 8637 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: src/component/marker/MarkAreaView.ts | 28 +++ src/component/marker/markerHelper.ts | 13 + src/coord/cartesian/Cartesian2D.ts | 12 + test/markArea.html | 93 +++- test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/markArea.json | 2 +- 6 files changed, 136 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch aggregate-transform updated: fix(dataset): fix using transform in dataset may cause dead loop.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new 7f14e94dc fix(dataset): fix using transform in dataset may cause dead
loop.
7f14e94dc is described below
commit 7f14e94dc08eaf898d50129d78376c8a199f5a8b
Author: pissang
AuthorDate: Thu Apr 14 12:38:34 2022 +0800
fix(dataset): fix using transform in dataset may cause dead loop.
---
src/data/helper/sourceHelper.ts | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/data/helper/sourceHelper.ts b/src/data/helper/sourceHelper.ts
index 5408f6adc..449ff1b5e 100644
--- a/src/data/helper/sourceHelper.ts
+++ b/src/data/helper/sourceHelper.ts
@@ -26,7 +26,8 @@ import {
isString,
isObject,
isTypedArray,
-HashMap
+HashMap,
+filter
} from 'zrender/src/core/util';
import { Source } from '../Source';
@@ -322,7 +323,7 @@ export function queryDatasetUpstreamDatasetModels(
return [];
}
-return queryReferringComponents(
+return filter(queryReferringComponents(
datasetModel.ecModel,
'dataset',
{
@@ -330,7 +331,7 @@ export function queryDatasetUpstreamDatasetModels(
id: datasetModel.get('fromDatasetId', true)
},
SINGLE_REFERRING
-).models as DatasetModel[];
+).models as DatasetModel[], model => model !== datasetModel);
}
/**
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (ee116a0f7 -> b2168d5f3)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from ee116a0f7 fix(graph): user cursor has higher priority (#16867) add 7114d76b6 ci: fix node module cache doesn't work add b2168d5f3 Merge pull request #16881 from apache/ci-cache No new revisions were added by this update. Summary of changes: .github/workflows/ci.yml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge pull request #242 from apache/dependabot/npm_and_yarn/editor/plist-3.0.5
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 67f9859b7f1f013830083c4bf30ae0e871c4eef5 Merge: 514b4bad 313dbb7d Author: Yi Shen AuthorDate: Tue Apr 12 10:41:11 2022 +0800 Merge pull request #242 from apache/dependabot/npm_and_yarn/editor/plist-3.0.5 chore(deps): bump plist from 3.0.1 to 3.0.5 in /editor editor/package-lock.json | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (514b4bad -> 67f9859b)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 514b4bad Merge pull request #239 from jiawulin001/issue#238 add 313dbb7d chore(deps): bump plist from 3.0.1 to 3.0.5 in /editor new 67f9859b Merge pull request #242 from apache/dependabot/npm_and_yarn/editor/plist-3.0.5 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: editor/package-lock.json | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (281dc963 -> 514b4bad)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 281dc963 Merge pull request #241 from apache/dependabot/npm_and_yarn/editor/moment-2.29.2 new 578ee0cb Add Clarification to axis.position/offset new 9a5aa77f Update neater English specification new 514b4bad Merge pull request #239 from jiawulin001/issue#238 The 2293 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: en/option/component/x-axis.md | 6 -- en/option/component/y-axis.md | 4 +++- zh/option/component/x-axis.md | 6 -- zh/option/component/y-axis.md | 6 -- 4 files changed, 15 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #16857 from apache/humbedooh/notifications
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit a1d0a676b2b2009b8fd24dfff93b8daaa9ef1df7 Merge: d0e8626c8 8ea10f4d0 Author: Yi Shen AuthorDate: Sat Apr 9 21:55:16 2022 +0800 Merge pull request #16857 from apache/humbedooh/notifications [infra] reset notifications to commits@echarts for commits, PRs and issues .asf.yaml | 4 1 file changed, 4 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (d0e8626c8 -> a1d0a676b)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from d0e8626c8 Merge pull request #16836 from apache/workflow-add-lint-step add 8ea10f4d0 [infra] reset notifications to commits@echarts for commits, PRs and issues new a1d0a676b Merge pull request #16857 from apache/humbedooh/notifications 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: .asf.yaml | 4 1 file changed, 4 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (7b4c643d -> 281dc963)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 7b4c643d add version hints add 597d4c87 chore(deps): bump moment from 2.27.0 to 2.29.2 in /editor new 281dc963 Merge pull request #241 from apache/dependabot/npm_and_yarn/editor/moment-2.29.2 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: editor/package-lock.json | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (25109e317 -> d0e8626c8)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 25109e317 Merge pull request #16824 from XXXMrG/fix-16786 add da71a9ec4 ci: add lint step new d0e8626c8 Merge pull request #16836 from apache/workflow-add-lint-step 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: .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #16836 from apache/workflow-add-lint-step
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit d0e8626c8fe279bbcdcee95dd623b0529bef6418 Merge: 25109e317 da71a9ec4 Author: Yi Shen AuthorDate: Tue Apr 5 15:28:58 2022 +0800 Merge pull request #16836 from apache/workflow-add-lint-step ci: add lint step .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (901215a -> cd9a3a9)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. from 901215a Merge pull request #236 from jiawulin001/eChIssue#16766 new a3acd6c fix: Removing colorAlpha for bug existence and low priority new 6e2d0ac Remove itemStyle.colorAlpha, keep series.colorAlpha new cd9a3a9 Merge pull request #235 from jiawulin001/eChPR#16760 The 2281 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: en/option/series/treemap.md | 12 zh/option/series/treemap.md | 12 2 files changed, 24 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: fix: reminded added to specify scope of `stack`
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new 8e4da63 fix: reminded added to specify scope of `stack`
new 901215a Merge pull request #236 from jiawulin001/eChIssue#16766
8e4da63 is described below
commit 8e4da6350e25245eeb76e17cbe52925738df117b
Author: jiawulin001
AuthorDate: Wed Mar 30 10:29:57 2022 +0800
fix: reminded added to specify scope of `stack`
---
en/option-gl/series/bar3D.md | 2 ++
en/option/series/bar.md | 2 ++
en/option/series/line.md | 2 ++
zh/option-gl/series/bar3D.md | 2 ++
zh/option/series/bar.md | 2 ++
zh/option/series/line.md | 2 ++
6 files changed, 12 insertions(+)
diff --git a/en/option-gl/series/bar3D.md b/en/option-gl/series/bar3D.md
index 5f2f985..524eaaf 100644
--- a/en/option-gl/series/bar3D.md
+++ b/en/option-gl/series/bar3D.md
@@ -40,6 +40,8 @@ The smoothness of the bevel, the larger the value, the
smoother.
Stacking of bar chart. On the same category axis, the series with the same
`stack` name would be put on top of each other. Note that the data items that
need to be stack in different series must have the same index in the array.
+Notice: `stack` only supports stacking on `value` and `log` axis for now.
`time` and `category` axis are not supported.
+
## minHeight(number) = 0
diff --git a/en/option/series/bar.md b/en/option/series/bar.md
index 02c631c..5a63923 100644
--- a/en/option/series/bar.md
+++ b/en/option/series/bar.md
@@ -134,6 +134,8 @@ Configurations of select state. Available when
[selectedMode](~series-bar.select
Name of stack. On the same category axis, the series with the same `stack`
name would be put on top of each other.
+Notice: `stack` only supports stacking on `value` and `log` axis for now.
`time` and `category` axis are not supported.
+
## sampling(string)
The dowmsampling strategy used when the data size is much larger than pixel
size. It will improve the performance when turned on. Defaults to be turned
off, indicating that all the data points will be drawn.
diff --git a/en/option/series/line.md b/en/option/series/line.md
index 4e59d40..d1c1bea 100644
--- a/en/option/series/line.md
+++ b/en/option/series/line.md
@@ -60,6 +60,8 @@ Only work when main axis is `'category'` axis (`axis.type` is
`'category'`). Opt
If stack the value. On the same category axis, the series with the same
`stack` name would be put on top of each other.
+Notice: `stack` only supports stacking on `value` and `log` axis for now.
`time` and `category` axis are not supported.
+
The effect of the below example could be seen through stack switching of
[toolbox](~toolbox) on the top right corner:
~[600x400](${galleryViewPath}doc-example/line-stack-tiled=1=1)
diff --git a/zh/option-gl/series/bar3D.md b/zh/option-gl/series/bar3D.md
index c7705af..005e9b0 100644
--- a/zh/option-gl/series/bar3D.md
+++ b/zh/option-gl/series/bar3D.md
@@ -38,6 +38,8 @@
柱状图堆叠，相同 `stack` 值的柱状图系列数据会有叠加。注意不同系列需要叠加的数据项在数组中的索引必须是一样的。
+注：目前`stack`只支持堆叠于 `value` 和 `log` 类型的类目轴上，不支持 `time` 和 `category` 类型的类目轴。
+
## minHeight(number) = 0
最小柱子高度。
diff --git a/zh/option/series/bar.md b/zh/option/series/bar.md
index d816e33..a100b50 100644
--- a/zh/option/series/bar.md
+++ b/zh/option/series/bar.md
@@ -212,6 +212,8 @@ option = {
数据堆叠，同个类目轴上系列配置相同的`stack`值可以堆叠放置。
+注：目前`stack`只支持堆叠于 `value` 和 `log` 类型的类目轴上，不支持 `time` 和 `category` 类型的类目轴。
+
## sampling(string)
柱状图在数据量远大于像素点时候的降采样策略，开启后可以有效的优化图表的绘制效率，默认关闭，也就是全部绘制不过滤数据点。
diff --git a/zh/option/series/line.md b/zh/option/series/line.md
index e782923..435a83c 100644
--- a/zh/option/series/line.md
+++ b/zh/option/series/line.md
@@ -89,6 +89,8 @@ const option = {
数据堆叠，同个类目轴上系列配置相同的`stack`值后，后一个系列的值会在前一个系列的值上相加。
+注：目前`stack`只支持堆叠于 `value` 和 `log` 类型的类目轴上，不支持 `time` 和 `category` 类型的类目轴。
+
下面示例可以通过右上角 [toolbox](~toolbox) 中的堆叠切换看效果：
~[600x400](${galleryViewPath}doc-example/line-stack-tiled=1=1)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (65f6044 -> 977bba1)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from 65f6044 Merge pull request #16754 from DalpatRathore/grammar-check add b0f8d91 fix(radar): fix regression bug brought by branch merging. (#15985) new 977bba1 Merge pull request #16764 from apache/fix-radar-tooltip 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: src/coord/radar/RadarModel.ts | 3 --- test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/radar3.json | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #16764 from apache/fix-radar-tooltip
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 977bba1350eb9158699a81223b753b08a25b7d46 Merge: 65f6044 b0f8d91 Author: Yi Shen AuthorDate: Tue Mar 29 10:51:39 2022 +0800 Merge pull request #16764 from apache/fix-radar-tooltip fix(radar): fix regression bug brought by branch merging. src/coord/radar/RadarModel.ts | 3 --- test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/radar3.json | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix: CONTRIBUTING.md grammar
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git The following commit(s) were added to refs/heads/master by this push: new d3c5bec fix: CONTRIBUTING.md grammar new 65f6044 Merge pull request #16754 from DalpatRathore/grammar-check d3c5bec is described below commit d3c5bec2642b7aa5e54979c92b0eb5de973ea213 Author: Dalpat Rathore <69510006+dalpatrath...@users.noreply.github.com> AuthorDate: Sun Mar 27 11:16:14 2022 +0530 fix: CONTRIBUTING.md grammar --- CONTRIBUTING.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 52654df..0a7507e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ Contributions can be made in varied ways: - Help others in the issues - Help solve problems with the issues - Remind the authors to provide a demo if they are reporting for a bug -- Try to reproduce the problem as describe in the issues +- Try to reproduce the problem as described in the issues - Make pull requests to fix bugs or implement new features - Improve or translate the documents - Discuss in the [mailing list](https://echarts.apache.org/en/maillist.html) @@ -29,11 +29,11 @@ Any questions in the form of *how can I use echarts to* or *how to use echarts x ## Release Milestone Discussion -We will start the discussion about the bugs to fix and features of each release in the [mailing list](https://echarts.apache.org/en/maillist.html). You may subscribe to our [mailing list](https://echarts.apache.org/en/maillist.html) to give your valuable advice in milestone dicussions. +We will start the discussion about the bugs to fix and the features of each release in the [mailing list](https://echarts.apache.org/en/maillist.html). You may subscribe to our [mailing list](https://echarts.apache.org/en/maillist.html) to give your valuable advice in milestone discussions. -Regarding the release plan, we will release a mior version at the end of every month. Here is some detail. +Regarding the release plan, we will release a minor version at the end of every month. Here is some detail. -1. Assume our current stable release is 4.3.0. We will start the discussion of milestone of the release two versions ahead, which is 4.5.0 at the beginning of each month. At this time we should also kickoff the developing of the next release, which is 4.4.0. +1. Assume our current stable release is 4.3.0. We will start the discussion of the milestone of the release two versions ahead, which is 4.5.0 at the beginning of each month. At this time we should also kickoff the development of the next release, which is 4.4.0. 2. Finish 4.4.0 developing at about 22th of this month and start the testing. And the 4.5.0 milestone discussion is frozen and published on the [GitHub](https://github.com/apache/echarts/milestone/14) 3. Vote in the mailing list for the 4.4.0 release at the end of this month. @@ -48,7 +48,7 @@ Wiki: [How to setup the dev environment](https://github.com/apache/echarts/wiki/ ## Some hints about using code from other authors + About using some algorithms/formulas or inspired by other's work: -+ We can be inspired from other people’s work. There is no problem with copying ideas and no problems associated with that so long as the code is entirely yours and you aren’t violating the license of the inspirational work. You can just follow "normal" source code rules. ++ We can be inspired by other people’s work. There is no problem with copying ideas and no problems associated with that so long as the code is entirely yours and you aren’t violating the license of the inspirational work. You can just follow "normal" source code rules. + But when you copy the code, even parts of files, it must remain under the copyright of the original authors. + What's the right thing to do for the public good here? I'll go with: + Be transparent when implementing an existing idea/algorithm. @@ -62,7 +62,7 @@ Wiki: [How to setup the dev environment](https://github.com/apache/echarts/wiki/ + Licenses that are compatible with the Apache license: + BSD and MIT are compatible with the Apache license but CC_BY_SA is not (https://apache.org/legal/resolved.html#cc-sa). + Stack Overflow: -+ before intending to copy code from Stack Overlow, we must check: ++ before intending to copy code from Stack Overflow, we must check: + https://apache.org/legal/resolved.html#stackoverflow + https://issues.apache.org/jira/browse/LEGAL-471 + Wikipedia (and most Wikimedia Foundation projects): - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix: wrong jpg instead of jpeg types
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/master by this push:
new 45b7597 fix: wrong jpg instead of jpeg types
new dfa1f07 Merge pull request #16747 from yassilah/types/export-image
45b7597 is described below
commit 45b75977ca21422861468f18cdc32bb6f1a76943
Author: Yasser Lahbibi
AuthorDate: Fri Mar 25 10:35:55 2022 +0100
fix: wrong jpg instead of jpeg types
---
src/component/toolbox/feature/SaveAsImage.ts | 2 +-
src/core/echarts.ts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/component/toolbox/feature/SaveAsImage.ts
b/src/component/toolbox/feature/SaveAsImage.ts
index 7e9c690..8777a97 100644
--- a/src/component/toolbox/feature/SaveAsImage.ts
+++ b/src/component/toolbox/feature/SaveAsImage.ts
@@ -29,7 +29,7 @@ import { isFunction } from 'zrender/src/core/util';
export interface ToolboxSaveAsImageFeatureOption extends ToolboxFeatureOption {
icon?: string
title?: string
-type?: 'png' | 'jpg'
+type?: 'png' | 'jpeg'
backgroundColor?: ZRColor
connectedBackgroundColor?: ZRColor
diff --git a/src/core/echarts.ts b/src/core/echarts.ts
index a4323a4..c2f24dd 100644
--- a/src/core/echarts.ts
+++ b/src/core/echarts.ts
@@ -763,7 +763,7 @@ class ECharts extends Eventful {
getDataURL(opts?: {
// file type 'png' by default
-type?: 'png' | 'jpg' | 'svg',
+type?: 'png' | 'jpeg' | 'svg',
pixelRatio?: number,
backgroundColor?: ZRColor,
// component type array
@@ -807,7 +807,7 @@ class ECharts extends Eventful {
getConnectedDataURL(opts?: {
// file type 'png' by default
-type?: 'png' | 'jpg' | 'svg',
+type?: 'png' | 'jpeg' | 'svg',
pixelRatio?: number,
backgroundColor?: ZRColor,
connectedBackgroundColor?: ZRColor
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch aggregate-transform updated: fix(transform): fix count aggregate. clean codes
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new e69a6f4 fix(transform): fix count aggregate. clean codes
e69a6f4 is described below
commit e69a6f4f332b28519e44909d5bba1a931c2b4389
Author: pissang
AuthorDate: Fri Mar 25 17:16:06 2022 +0800
fix(transform): fix count aggregate. clean codes
---
src/component/transform/aggregateTransform.ts | 2 +-
src/component/transform/idTransform.ts| 14 ++-
src/component/transform/sortTransform.ts | 7 --
src/data/SeriesData.ts| 2 +-
src/processor/dataSample.ts | 2 +-
test/data-transform-aggregate2.html | 142 ++
6 files changed, 151 insertions(+), 18 deletions(-)
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index 51b16c6..9bab9f0 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -369,7 +369,7 @@ const methods: {
},
COUNT: {
init: () => 1,
-add: (prev: number) => prev++
+add: (prev: number) => prev + 1
},
FIRST: {
init: identity,
diff --git a/src/component/transform/idTransform.ts
b/src/component/transform/idTransform.ts
index 8c01628..0366d8f 100644
--- a/src/component/transform/idTransform.ts
+++ b/src/component/transform/idTransform.ts
@@ -71,13 +71,11 @@ export const idTransform:
ExternalDataTransform = {
type: 'echarts:id',
transform: function (params) {
-const upstream = params.upstream;
-const config = params.config;
-const dimensionIndex = config.dimensionIndex;
-const dimensionName = config.dimensionName;
+const {upstream, config} = params;
+const {dimensionIndex, dimensionName} = config;
-const dimsDef = upstream.cloneAllDimensionInfo() as
DimensionDefinitionLoose[];
-dimsDef[dimensionIndex] = dimensionName;
+const dimensions = upstream.cloneAllDimensionInfo() as
DimensionDefinitionLoose[];
+dimensions[dimensionIndex] = dimensionName;
const data = upstream.cloneRawData() as OptionSourceDataArrayRows;
@@ -88,8 +86,8 @@ export const idTransform:
ExternalDataTransform = {
}
return {
-dimensions: dimsDef,
-data: data
+dimensions,
+data
};
}
};
\ No newline at end of file
diff --git a/src/component/transform/sortTransform.ts
b/src/component/transform/sortTransform.ts
index dbe246c..5442964 100644
--- a/src/component/transform/sortTransform.ts
+++ b/src/component/transform/sortTransform.ts
@@ -114,13 +114,6 @@ export const sortTransform:
ExternalDataTransform = {
throwError(errMsg);
}
-if (order !== 'asc' && order !== 'desc') {
-if (__DEV__) {
-errMsg = 'Sort transform config must has "order"
specified.' + sampleLog;
-}
-throwError(errMsg);
-}
-
if (incomparable && (incomparable !== 'min' && incomparable !==
'max')) {
let errMsg = '';
if (__DEV__) {
diff --git a/src/data/SeriesData.ts b/src/data/SeriesData.ts
index 83421cc..b1565c2 100644
--- a/src/data/SeriesData.ts
+++ b/src/data/SeriesData.ts
@@ -473,7 +473,7 @@ class SeriesData<
private _initGetDimensionInfo(needsHasOwn: boolean): void {
const dimensionInfos = this._dimInfos;
this._getDimInfo = needsHasOwn
-? dimName => (dimensionInfos.hasOwnProperty(dimName) ?
dimensionInfos[dimName] : undefined)
+? dimName => ((zrUtil.hasOwn, dimName) ? dimensionInfos[dimName] :
undefined)
: dimName => dimensionInfos[dimName];
}
diff --git a/src/processor/dataSample.ts b/src/processor/dataSample.ts
index 28579a6..7695def 100644
--- a/src/processor/dataSample.ts
+++ b/src/processor/dataSample.ts
@@ -22,7 +22,7 @@ import { Dictionary } from 'zrender/src/core/types';
import SeriesModel from '../model/Series';
import { isFunction, isString } from 'zrender/src/core/util';
-
+// TODO Merge with methods in aggregate transform
type Sampler = (frame: ArrayLike) => number;
const samplers: Dictionary = {
average: function (frame) {
diff --git a/test/data-transform-aggregate2.html
b/test/data-transform-aggregate2.html
new file mode 100644
index 000..f2ffb6a
--- /dev/null
+++ b/test/data-transform-aggregate2.html
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.chart {
+width: 260px;
+
[echarts-doc] branch master updated (8d99850 -> bc8088b)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. from 8d99850 Merge pull request #232 from mpolverini/patch-1 add 36d99f5 feat(scatter.scale): add `number` for `scale` add d46b16a fix: remove space new bc8088b Merge pull request #233 from apache/scale 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: en/option/series/scatter.md | 4 ++-- zh/option/series/scatter.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge pull request #233 from apache/scale
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit bc8088b8f4bf4d682e0b4130b8451c9eb7b6b724 Merge: 8d99850 d46b16a Author: Yi Shen AuthorDate: Fri Mar 25 16:03:45 2022 +0800 Merge pull request #233 from apache/scale feat(scatter.scale): add `number` for `scale` en/option/series/scatter.md | 4 ++-- zh/option/series/scatter.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #16704 from apache/fix-toolbox-text-position
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit d3dbf1215a0ae0c5075efffb10b17fe4de37582c Merge: 6c721de ad7adc2 Author: Yi Shen AuthorDate: Fri Mar 25 11:16:04 2022 +0800 Merge pull request #16704 from apache/fix-toolbox-text-position fix(toolbox): fix toolbox title may be outside of the chart src/component/toolbox/ToolboxView.ts | 24 +++- test/toolbox-title.html | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (6c721de -> d3dbf12)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from 6c721de Merge pull request #16542 from susiwen8/fix-16539 add ad7adc2 fix(toolbox): fix toolbox title may be outside of the chart. new d3dbf12 Merge pull request #16704 from apache/fix-toolbox-text-position 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: src/component/toolbox/ToolboxView.ts | 24 +++- test/toolbox-title.html | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (c2f4ac6 -> 6c721de)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from c2f4ac6 Merge pull request #16736 from apache/fix-radius-splitLine new 61ef71c fix(labelLine): update labelLine `ignore` new d5e4469 Merge branch 'master' into fix-16539 new 291bf29 fix(labelLine): use correct state name new 6c721de Merge pull request #16542 from susiwen8/fix-16539 The 8587 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: src/label/labelGuideHelper.ts | 2 +- test/pie-label.html | 59 +++ 2 files changed, 60 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch aggregate-transform updated: refact(dataset): rename seriesLayoutBy to sourceLayout
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new 72e29af refact(dataset): rename seriesLayoutBy to sourceLayout
72e29af is described below
commit 72e29af15d322777b2441bfb730a93f6ebb28849
Author: pissang
AuthorDate: Thu Mar 24 13:57:32 2022 +0800
refact(dataset): rename seriesLayoutBy to sourceLayout
---
src/chart/pie/PieView.ts | 2 +-
src/component/dataset/install.ts | 14 +--
src/component/transform/aggregateTransform.ts | 14 ---
src/data/Source.ts| 57 ---
src/data/helper/SeriesDataSchema.ts | 4 +-
src/data/helper/dataProvider.ts | 44 ++---
src/data/helper/sourceHelper.ts | 12 +++---
src/data/helper/sourceManager.ts | 52
src/data/helper/transform.ts | 18 -
src/util/types.ts | 22 +--
10 files changed, 122 insertions(+), 117 deletions(-)
diff --git a/src/chart/pie/PieView.ts b/src/chart/pie/PieView.ts
index 9118f92..900c104 100644
--- a/src/chart/pie/PieView.ts
+++ b/src/chart/pie/PieView.ts
@@ -95,7 +95,7 @@ class PiePiece extends graphic.Sector {
}
}, seriesModel, idx);
}
-// Expansion
+// Expansion.
else {
if (startAngle != null) {
sector.setShape({ startAngle, endAngle: startAngle });
diff --git a/src/component/dataset/install.ts b/src/component/dataset/install.ts
index 2e5d7be..65c52e7 100644
--- a/src/component/dataset/install.ts
+++ b/src/component/dataset/install.ts
@@ -29,8 +29,8 @@
import ComponentModel from '../../model/Component';
import ComponentView from '../../view/Component';
import {
-SERIES_LAYOUT_BY_COLUMN, ComponentOption, SeriesEncodeOptionMixin,
-OptionSourceData, SeriesLayoutBy, OptionSourceHeader
+SOURCE_LAYOUT_BY_COLUMN, ComponentOption, SeriesEncodeOptionMixin,
+OptionSourceData, SourceLayout, OptionSourceHeader
} from '../../util/types';
import { DataTransformOption, PipedDataTransformOption } from
'../../data/helper/transform';
import GlobalModel from '../../model/Global';
@@ -44,10 +44,16 @@ export interface DatasetOption extends
Pick {
mainType?: 'dataset';
-seriesLayoutBy?: SeriesLayoutBy;
+sourceLayout?: SourceLayout;
sourceHeader?: OptionSourceHeader;
source?: OptionSourceData;
+/**
+ * @deprecated
+ * Use sourceLayout instead
+ */
+seriesLayoutBy?: SourceLayout
+
fromDatasetIndex?: number;
fromDatasetId?: string;
transform?: DataTransformOption | PipedDataTransformOption;
@@ -63,7 +69,7 @@ export class DatasetModel extends Co
static type = 'dataset';
static defaultOption: DatasetOption = {
-seriesLayoutBy: SERIES_LAYOUT_BY_COLUMN
+sourceLayout: SOURCE_LAYOUT_BY_COLUMN
};
private _sourceManager: SourceManager;
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index cd32c77..51b16c6 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -23,6 +23,7 @@ import {
ExternalDimensionDefinition,
ExternalSource
} from '../../data/helper/transform';
+import { warn } from '../../util/log';
import { asc, quantile } from '../../util/number';
import { DimensionLoose, DimensionName, OptionDataValue } from
'../../util/types';
@@ -211,12 +212,12 @@ function prepare(
const dimInfoInUpstream =
upstream.getDimensionInfo(resultDimInfoConfig.from);
if (__DEV__) {
assert(dimInfoInUpstream, 'Can not find dimension by `from`: ' +
resultDimInfoConfig.from);
-each(groupByDims, (gbDim) => {
-assert(
-gbDim.index !== dimInfoInUpstream.index ||
resultDimInfoConfig.method == null,
-`Dimension ${dimInfoInUpstream.name} is the "groupBy"
dimension, must not have any "method".`
-);
-});
+
+if (resultDimInfoConfig.method != null
+&& find(groupByDims, gbDim => gbDim.index ===
dimInfoInUpstream.index)
+) {
+warn(`Dimension ${dimInfoInUpstream.name} is used as "groupBy"
dimension, "method" will be ignored.`);
+}
}
const methodName = (resultDimInfoConfig.method || '').toUpperCase() as
AggregateMethodInternal
@@ -226,6 +227,7 @@ function prepare(
assert(method, `Illegal method ${methodName}.`);
}
+
const name = retrieve2(resultDimInf
[echarts] branch master updated (4f7e2d7 -> ad3a07a)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git.
from 4f7e2d7 Merge pull request #16730 from yuanjiangxia/fix-dataZoom
new 48472ee feat: allow areaStyle.origin to take number as input
new 0e5e896 An example of origin Updated
new ad3a07a Merge pull request #16719 from jiawulin001/eChIssue#16717
The 8581 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:
src/chart/line/LineSeries.ts | 2 +-
src/chart/line/helper.ts | 7 ++-
test/{area-large.html => area-origin.html} | 76 ++
3 files changed, 53 insertions(+), 32 deletions(-)
copy test/{area-large.html => area-origin.html} (69%)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix(dataZoom): fix the dataZoom was unexpectedly displayed at the top when data contains null values.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/master by this push:
new d7786c5 fix(dataZoom): fix the dataZoom was unexpectedly displayed at
the top when data contains null values.
new 4f7e2d7 Merge pull request #16730 from yuanjiangxia/fix-dataZoom
d7786c5 is described below
commit d7786c52c49bccb1b8c78989ef5e4d29348543fa
Author: yuanjiangxia <511217...@qq.com>
AuthorDate: Wed Mar 23 17:53:33 2022 +0800
fix(dataZoom): fix the dataZoom was unexpectedly displayed at the top when
data contains null values.
---
src/data/DataStore.ts | 8 ++--
test/dataZoom-feature.html | 112 -
2 files changed, 116 insertions(+), 4 deletions(-)
diff --git a/src/data/DataStore.ts b/src/data/DataStore.ts
index ddd3c09..4ceb7ba 100644
--- a/src/data/DataStore.ts
+++ b/src/data/DataStore.ts
@@ -290,8 +290,10 @@ class DataStore {
// Parse from previous data offset. len may be changed after appendData
for (let i = offset; i < len; i++) {
const val = (chunk as any)[i] =
ordinalMeta.parseAndCollect(chunk[i]);
-dimRawExtent[0] = Math.min(val, dimRawExtent[0]);
-dimRawExtent[1] = Math.max(val, dimRawExtent[1]);
+if (!isNaN(val)) {
+dimRawExtent[0] = Math.min(val, dimRawExtent[0]);
+dimRawExtent[1] = Math.max(val, dimRawExtent[1]);
+}
}
dim.ordinalMeta = ordinalMeta;
@@ -1308,4 +1310,4 @@ class DataStore {
})();
}
-export default DataStore;
\ No newline at end of file
+export default DataStore;
diff --git a/test/dataZoom-feature.html b/test/dataZoom-feature.html
index 8f2b5b0..6715089 100644
--- a/test/dataZoom-feature.html
+++ b/test/dataZoom-feature.html
@@ -43,7 +43,7 @@ under the License.
-
+
@@ -746,6 +746,116 @@ under the License.
});
+
+require(['echarts'], function (echarts) {
+var option = {
+dataZoom: [{
+id: 'dataZoomX',
+type: 'slider',
+xAxisIndex: 0,
+filterMode: 'filter'
+}],
+legend: {
+data: ['语文'],
+top: '0'
+},
+tooltip: {
+trigger: 'axis',
+formatter: '{b0}<br />',
+axisPointer: {
+animation: true,
+type: 'line',
+lineStyle: {
+type: 'dashed'
+}
+}
+},
+grid: {
+left: 20,
+top: 38,
+right: 20,
+bottom: 65
+},
+xAxis: {
+type: 'category',
+data: [
+'第1周',
+'第2周',
+'第3周',
+'第4周',
+'第5周',
+'第6周',
+'第7周',
+'第8周',
+'第9周',
+'第10周',
+'第11周',
+'第12周',
+'第13周',
+'第14周',
+'第15周',
+'第16周',
+'第17周',
+'第18周',
+'第19周',
+'第20周',
+'第21周',
+'第22周'
+],
+boundaryGap: false
+},
+yAxis: {
+type: 'category',
+boundaryGap: false,
+name: '等级',
+data: ['0', 'D', 'C', 'B', 'A'],
+splitLine: {
+show: true
+}
+},
+series: [{
+labelLine: { show: true },
+symbolSize: 16,
+type: 'line',
+smooth: true,
+name: '语文',
+
[echarts] branch aggregate-transform updated: feat(transform): use val directly in groupBy dimension result
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new aa700ef feat(transform): use val directly in groupBy dimension result
aa700ef is described below
commit aa700eff62bf288b4b8b51fcfa7e6fba600485f2
Author: pissang
AuthorDate: Wed Mar 23 22:26:53 2022 +0800
feat(transform): use val directly in groupBy dimension result
---
src/component/transform/aggregateTransform.ts | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index 93e8d9f..cd32c77 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -252,18 +252,12 @@ function doAggregate(
) {
function doCreate(isGroupByDim: boolean, aggResult: AggregateResult, val:
OptionDataValue, groupByVal?: string) {
-aggResult.set(groupByVal, isGroupByDim
-? groupByVal
-: methods[aggResult.method].init(val, aggResult, groupByVal)
-);
+aggResult.set(groupByVal, isGroupByDim ? val :
methods[aggResult.method].init(val, aggResult, groupByVal));
};
function doUpdate(aggResult: AggregateResult, val: OptionDataValue,
groupByVal?: string) {
const method = methods[aggResult.method];
if (method.add) {
-aggResult.set(
-groupByVal,
-method.add(aggResult.get(groupByVal), val, aggResult,
groupByVal)
-);
+aggResult.set(groupByVal, method.add(aggResult.get(groupByVal),
val, aggResult, groupByVal));
}
};
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch aggregate-transform updated: feat(transform): support multiple groupBy in aggregate
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new 197e3b3 feat(transform): support multiple groupBy in aggregate
197e3b3 is described below
commit 197e3b32127f0385ef60886571a9f24f9a18e6c4
Author: pissang
AuthorDate: Wed Mar 23 20:37:22 2022 +0800
feat(transform): support multiple groupBy in aggregate
---
src/component/transform/aggregateTransform.ts | 113 +-
1 file changed, 55 insertions(+), 58 deletions(-)
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index e4f070d..93e8d9f 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { assert, each, keys, map, retrieve2 } from 'zrender/src/core/util';
+import { assert, each, find, isArray, keys, map, retrieve2 } from
'zrender/src/core/util';
import {
DataTransformOption,
ExternalDataTransform,
@@ -27,6 +27,7 @@ import { asc, quantile } from '../../util/number';
import { DimensionLoose, DimensionName, OptionDataValue } from
'../../util/types';
+const GROUP_KEY_SEPARATER = '$EC$';
/**
* @usage
*
@@ -81,7 +82,7 @@ export interface AggregateTransformOption extends
DataTransformOption {
method: AggregateMethodLoose;
}[];
// Optional
-groupBy: DimensionLoose;
+groupBy: DimensionLoose | DimensionLoose[];
};
}
@@ -108,7 +109,7 @@ class AggregateResult {
*/
readonly dep: AggregateResult;
-readonly groupBy: ExternalDimensionDefinition;
+readonly groupBy: ExternalDimensionDefinition[];
values: AggregateResultValue | AggregateResultValueByGroup;
@@ -118,7 +119,7 @@ class AggregateResult {
indexInUpstream: number,
method: AggregateMethodInternal,
name: DimensionName,
-groupBy: ExternalDimensionDefinition,
+groupBy: ExternalDimensionDefinition[],
dep?: AggregateResult
) {
this.method = method;
@@ -145,13 +146,6 @@ class AggregateResult {
set: (groupByVal: OptionDataValue, value: AggregateResultValue) => void;
get: (groupByVal: OptionDataValue) => AggregateResultValue;
-
-// getValues(): AggregateResultValue[] {
-// const values = this._values;
-// return this.groupBy
-// ? map(keys(values as AggregateResultValueByGroup), key =>
(values as AggregateResultValueByGroup)[key])
-// : [values as AggregateResultValue];
-// }
}
export const aggregateTransform:
ExternalDataTransform = {
@@ -162,15 +156,15 @@ export const aggregateTransform:
ExternalDataTransform
const upstream = params.upstream;
const config = params.config;
-const { aggResults, groupByDim } = prepare(config, upstream);
+const { aggResults, groupByDims } = prepare(config, upstream);
// Calculate
-doAggregate(groupByDim, upstream, aggResults);
+doAggregate(groupByDims, upstream, aggResults);
// Convert to output row format.
let data: OptionDataValue[][];
-if (groupByDim && aggResults.length) {
+if (groupByDims && aggResults.length) {
const groupKeys = keys(aggResults[0].values as any);
data = map(groupKeys, key => []);
@@ -197,16 +191,19 @@ function prepare(
upstream: ExternalSource
): {
aggResults: AggregateResult[];
-groupByDim: ExternalDimensionDefinition
+groupByDims?: ExternalDimensionDefinition[]
} {
const outputConfig = config.output;
const aggResults: AggregateResult[] = [];
-const groupByConfig = config.groupBy;
-let groupByDim: ExternalDimensionDefinition;
+let groupByConfig = config.groupBy;
+let groupByDims: ExternalDimensionDefinition[];
if (groupByConfig != null) {
-groupByDim = upstream.getDimensionInfo(groupByConfig);
-assert(groupByDim, 'Can not find dimension by `groupBy`: ' +
groupByConfig);
+if (!isArray(groupByConfig)) {
+groupByConfig = [groupByConfig];
+}
+groupByDims = map(groupByConfig, g => upstream.getDimensionInfo(g));
+assert(groupByDims, 'Can not find dimension by `groupBy`: ' +
groupByConfig);
}
each(outputConfig, resultDimInfoConfig => {
@@ -214,10 +211,12 @@ function prepare(
const dimInfoInUpstream =
upstream.getDimensionInfo(resultDimInfoConfig.from);
if (__DEV__) {
assert(dimInfoInUpstream, 'Can not find dimension by `from`: ' +
resultDimInfoConfig.from);
-assert(
-groupByDim.index !== dimInfoInUpstream.index ||
[echarts] branch aggregate-transform updated: style: optimize code
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new 6b4b944 style: optimize code
6b4b944 is described below
commit 6b4b94418c2a7d111f4ed30146dd277efa62fad2
Author: pissang
AuthorDate: Wed Mar 23 20:12:22 2022 +0800
style: optimize code
---
src/component/transform/aggregateTransform.ts | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index ac225dd..e4f070d 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -366,17 +366,17 @@ const methods: {
init: (curr) => [curr],
add(prev, curr) {
// FIXME: handle other types
-(prev as any).push(curr);
+(prev as OptionDataValue[]).push(curr);
return prev;
}
},
SUM: {
init: identity,
-add: (prev, curr) => prev as number + (curr as number)
+add: (prev: number, curr: number) => prev + curr
},
COUNT: {
init: () => 1,
-add: (prev) => (prev as number)++
+add: (prev: number) => prev++
},
FIRST: {
init: identity,
@@ -384,16 +384,16 @@ const methods: {
},
MIN: {
init: identity,
-add: (prev, curr) => Math.min(prev as number, curr as number)
+add: (prev: number, curr: number) => Math.min(prev, curr)
},
MAX: {
init: identity,
-add: (prev, curr) => Math.max(prev as number, curr as number)
+add: (prev: number, curr: number) => Math.max(prev, curr)
},
AVERAGE: {
-init: (curr, aggResult, groupByVal) => (curr as number) /
(aggResult.dep.get(groupByVal) as number),
-add: (prev, curr, aggResult, groupByVal) =>
-(prev as number) + (curr as number) /
(aggResult.dep.get(groupByVal) as number),
+init: (curr: number, aggResult, groupByVal) => curr /
(aggResult.dep.get(groupByVal) as number),
+add: (prev: number, curr: number, aggResult, groupByVal) =>
+prev + curr / (aggResult.dep.get(groupByVal) as number),
dep: 'COUNT'
},
Q1: {
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch aggregate-transform updated: fix wrong import
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new 4b11232 fix wrong import
4b11232 is described below
commit 4b11232466d324c981bea804c59608994e8288bb
Author: pissang
AuthorDate: Wed Mar 23 20:08:05 2022 +0800
fix wrong import
---
src/component/transform/aggregateTransform.ts | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index 5b810fb..ac225dd 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -16,8 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-import { validate } from '@babel/types';
import { assert, each, keys, map, retrieve2 } from 'zrender/src/core/util';
import {
DataTransformOption,
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch aggregate-transform updated: feat(transform): refact aggregate transform
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch aggregate-transform
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/aggregate-transform by this
push:
new 63c1da2 feat(transform): refact aggregate transform
63c1da2 is described below
commit 63c1da2b2d7914977fa40d3b5de7ec5a94a9ab76
Author: pissang
AuthorDate: Wed Mar 23 20:04:26 2022 +0800
feat(transform): refact aggregate transform
---
src/component/transform/aggregateTransform.ts | 627 +-
1 file changed, 222 insertions(+), 405 deletions(-)
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index 5bbf131..5b810fb 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -17,7 +17,8 @@
* under the License.
*/
-import { assert, hasOwn } from 'zrender/src/core/util';
+import { validate } from '@babel/types';
+import { assert, each, keys, map, retrieve2 } from 'zrender/src/core/util';
import {
DataTransformOption,
ExternalDataTransform,
@@ -27,6 +28,7 @@ import {
import { asc, quantile } from '../../util/number';
import { DimensionLoose, DimensionName, OptionDataValue } from
'../../util/types';
+
/**
* @usage
*
@@ -85,115 +87,74 @@ export interface AggregateTransformOption extends
DataTransformOption {
};
}
-const METHOD_INTERNAL = {
-'SUM': true,
-'COUNT': true,
-'FIRST': true,
-'AVERAGE': true,
-'Q1': true,
-'Q2': true,
-'Q3': true,
-'MIN': true,
-'MAX': true
-} as const;
-const METHOD_NEEDS_COLLECT = {
-AVERAGE: ['COUNT']
-} as const;
-const METHOD_NEEDS_GATHER_VALUES = {
-Q1: true,
-Q2: true,
-Q3: true
-} as const;
-const METHOD_ALIAS = {
-MEDIAN: 'Q2'
-} as const;
-
+type AggregateMethodInternal =
+'SUM' | 'COUNT' | 'FIRST' | 'AVERAGE' | 'Q1' | 'Q2' | 'Q3' | 'MEDIAN' |
'MIN' | 'MAX' | 'VALUES';
type AggregateMethodLoose =
AggregateMethodInternal
| 'sum' | 'count' | 'first' | 'average' | 'Q1' | 'Q2' | 'Q3' | 'median' |
'min' | 'max';
-type AggregateMethodInternal = keyof typeof METHOD_INTERNAL;
-
-class ResultDimInfoInternal {
+type AggregateResultValue = OptionDataValue | OptionDataValue[];
+type AggregateResultValueByGroup = Record;
+class AggregateResult {
readonly method: AggregateMethodInternal;
readonly name: DimensionName;
readonly index: number;
-readonly indexInUpstream: number;
+/**
+ * Index in the upstream
+ */
+readonly fromIndex: number;
-readonly collectionInfoList = [] as {
-method: AggregateMethodInternal;
-indexInLine: number;
-}[];
+/**
+ * Deps applied before this method
+ */
+readonly dep: AggregateResult;
-// FIXME: refactor
-readonly gatheredValuesByGroup: { [groupVal: string]: number[] } = {};
-readonly gatheredValuesNoGroup = [] as number[];
-readonly needGatherValues: boolean = false;
+readonly groupBy: ExternalDimensionDefinition;
-__collectionResult: TravelResult;
-private _collectionInfoMap = {} as {
-// number is the index of `list`
-[method in AggregateMethodInternal]: number
-};
+values: AggregateResultValue | AggregateResultValueByGroup;
constructor(
index: number,
indexInUpstream: number,
method: AggregateMethodInternal,
name: DimensionName,
-needGatherValues: boolean
+groupBy: ExternalDimensionDefinition,
+dep?: AggregateResult
) {
this.method = method;
this.name = name;
this.index = index;
-this.indexInUpstream = indexInUpstream;
-this.needGatherValues = needGatherValues;
-}
+this.fromIndex = indexInUpstream;
+this.dep = dep;
+this.groupBy = groupBy;
-addCollectionInfo(item:
ResultDimInfoInternal['collectionInfoList'][number]) {
-this._collectionInfoMap[item.method] = this.collectionInfoList.length;
-this.collectionInfoList.push(item);
-}
+let valuesByGroup: AggregateResultValueByGroup = {};
+if (groupBy) {
+valuesByGroup = this.values = {};
+}
-getCollectionInfo(method: AggregateMethodInternal) {
-return this.collectionInfoList[this._collectionInfoMap[method]];
-}
+this.set = groupBy
+? (groupByVal, value) => valuesByGroup[groupByVal as string] =
value
+: (groupByVal, value) => this.values = value;
+
+this.get = groupBy
+? (groupByVal) => valuesByGroup[groupByVal as string]
+: () => this.values as AggregateResultValue;
-// FIXME: temp implementation. Need refactor.
-gatherValue(groupByDimInfo: ExternalDimensionDefinition, groupVal:
OptionDataValue, value: OptionDataValue) {
-// FIXME: conve
[echarts] 01/01: feat(transform): refact aggregate transform
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch fix-bar-race
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 3628b51446b76be9512a46bd41fe2d36cd4cdc17
Author: pissang
AuthorDate: Wed Mar 23 20:04:26 2022 +0800
feat(transform): refact aggregate transform
---
src/component/transform/aggregateTransform.ts | 627 +-
1 file changed, 222 insertions(+), 405 deletions(-)
diff --git a/src/component/transform/aggregateTransform.ts
b/src/component/transform/aggregateTransform.ts
index 5bbf131..5b810fb 100644
--- a/src/component/transform/aggregateTransform.ts
+++ b/src/component/transform/aggregateTransform.ts
@@ -17,7 +17,8 @@
* under the License.
*/
-import { assert, hasOwn } from 'zrender/src/core/util';
+import { validate } from '@babel/types';
+import { assert, each, keys, map, retrieve2 } from 'zrender/src/core/util';
import {
DataTransformOption,
ExternalDataTransform,
@@ -27,6 +28,7 @@ import {
import { asc, quantile } from '../../util/number';
import { DimensionLoose, DimensionName, OptionDataValue } from
'../../util/types';
+
/**
* @usage
*
@@ -85,115 +87,74 @@ export interface AggregateTransformOption extends
DataTransformOption {
};
}
-const METHOD_INTERNAL = {
-'SUM': true,
-'COUNT': true,
-'FIRST': true,
-'AVERAGE': true,
-'Q1': true,
-'Q2': true,
-'Q3': true,
-'MIN': true,
-'MAX': true
-} as const;
-const METHOD_NEEDS_COLLECT = {
-AVERAGE: ['COUNT']
-} as const;
-const METHOD_NEEDS_GATHER_VALUES = {
-Q1: true,
-Q2: true,
-Q3: true
-} as const;
-const METHOD_ALIAS = {
-MEDIAN: 'Q2'
-} as const;
-
+type AggregateMethodInternal =
+'SUM' | 'COUNT' | 'FIRST' | 'AVERAGE' | 'Q1' | 'Q2' | 'Q3' | 'MEDIAN' |
'MIN' | 'MAX' | 'VALUES';
type AggregateMethodLoose =
AggregateMethodInternal
| 'sum' | 'count' | 'first' | 'average' | 'Q1' | 'Q2' | 'Q3' | 'median' |
'min' | 'max';
-type AggregateMethodInternal = keyof typeof METHOD_INTERNAL;
-
-class ResultDimInfoInternal {
+type AggregateResultValue = OptionDataValue | OptionDataValue[];
+type AggregateResultValueByGroup = Record;
+class AggregateResult {
readonly method: AggregateMethodInternal;
readonly name: DimensionName;
readonly index: number;
-readonly indexInUpstream: number;
+/**
+ * Index in the upstream
+ */
+readonly fromIndex: number;
-readonly collectionInfoList = [] as {
-method: AggregateMethodInternal;
-indexInLine: number;
-}[];
+/**
+ * Deps applied before this method
+ */
+readonly dep: AggregateResult;
-// FIXME: refactor
-readonly gatheredValuesByGroup: { [groupVal: string]: number[] } = {};
-readonly gatheredValuesNoGroup = [] as number[];
-readonly needGatherValues: boolean = false;
+readonly groupBy: ExternalDimensionDefinition;
-__collectionResult: TravelResult;
-private _collectionInfoMap = {} as {
-// number is the index of `list`
-[method in AggregateMethodInternal]: number
-};
+values: AggregateResultValue | AggregateResultValueByGroup;
constructor(
index: number,
indexInUpstream: number,
method: AggregateMethodInternal,
name: DimensionName,
-needGatherValues: boolean
+groupBy: ExternalDimensionDefinition,
+dep?: AggregateResult
) {
this.method = method;
this.name = name;
this.index = index;
-this.indexInUpstream = indexInUpstream;
-this.needGatherValues = needGatherValues;
-}
+this.fromIndex = indexInUpstream;
+this.dep = dep;
+this.groupBy = groupBy;
-addCollectionInfo(item:
ResultDimInfoInternal['collectionInfoList'][number]) {
-this._collectionInfoMap[item.method] = this.collectionInfoList.length;
-this.collectionInfoList.push(item);
-}
+let valuesByGroup: AggregateResultValueByGroup = {};
+if (groupBy) {
+valuesByGroup = this.values = {};
+}
-getCollectionInfo(method: AggregateMethodInternal) {
-return this.collectionInfoList[this._collectionInfoMap[method]];
-}
+this.set = groupBy
+? (groupByVal, value) => valuesByGroup[groupByVal as string] =
value
+: (groupByVal, value) => this.values = value;
+
+this.get = groupBy
+? (groupByVal) => valuesByGroup[groupByVal as string]
+: () => this.values as AggregateResultValue;
-// FIXME: temp implementation. Need refactor.
-gatherValue(groupByDimInfo: ExternalDimensionDefinition, groupVal:
OptionDataValue, value: OptionDataValue) {
-// FIXME: convert to number compulsorily temporarily.
-value = +value;
-if (groupByDimInfo) {
-if (groupVal != null) {
-const groupValSt
[echarts] branch fix-bar-race created (now 3628b51)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch fix-bar-race in repository https://gitbox.apache.org/repos/asf/echarts.git. at 3628b51 feat(transform): refact aggregate transform This branch includes the following new commits: new 3628b51 feat(transform): refact aggregate transform 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. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: fix: Update ch/visual-map-piecewise.md
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git The following commit(s) were added to refs/heads/master by this push: new e6489f0 fix: Update ch/visual-map-piecewise.md new 0c2a981 Merge pull request #231 from jiawulin001/eChIssue#16706 e6489f0 is described below commit e6489f0517b1a0854e97af26f7925e0bb1abef76 Author: jiawulin001 AuthorDate: Mon Mar 21 12:22:05 2022 +0800 fix: Update ch/visual-map-piecewise.md --- zh/option/component/visual-map-piecewise.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh/option/component/visual-map-piecewise.md b/zh/option/component/visual-map-piecewise.md index 88de702..871d19c 100644 --- a/zh/option/component/visual-map-piecewise.md +++ b/zh/option/component/visual-map-piecewise.md @@ -204,7 +204,7 @@ series.data 的 `dataMin` 和 `dataMax`）。 -两端文字主体之间的距离，单位为px。参见 [visualMap-piecewise.text](~visualMap-piecewise.text) +每项的色块与文本标签之间的距离，单位为px。参见 [visualMap-piecewise.showLabel](~visualMap-piecewise.showLabel) ## showLabel(boolean) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (e5d1f48 -> 57b0d88)
This is an automated email from the ASF dual-hosted git repository. shenyi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git. from e5d1f48 Merge pull request #16691 from apache/fix-dataview add 0ce725b fix(toolbox): toolbox doesn't enter emphasis state when hovering on the icon. new 57b0d88 Merge pull request #16702 from apache/fix-toolbox 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: src/component/toolbox/ToolboxView.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
