[echarts-www] branch master updated: chore: fix the release time
This is an automated email from the ASF dual-hosted git repository. zakwu 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 41596614 chore: fix the release time 41596614 is described below commit 4159661408e8910e5923442c0019fb14fd4779ef Author: zakwu <123537...@qq.com> AuthorDate: Thu Mar 23 16:15:33 2023 +0800 chore: fix the release time --- js/download.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/download.js b/js/download.js index 1247a99e..38aefdc1 100644 --- a/js/download.js +++ b/js/download.js @@ -1,7 +1,7 @@ // $.getJSON("https://api.github.com/repos/apache/echarts/releases";).done(function (param) { // `-MM-dd` should be correct. `hh:mm:ss` doesn't matter. var param = [{ -publishedAt: '2022-12-09T00:00:00Z', +publishedAt: '2023-03-23T00:00:00Z', prerelease: false, name: '5.4.2' }]; - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix/merge-release-to-master created (now c89565a14)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch fix/merge-release-to-master in repository https://gitbox.apache.org/repos/asf/echarts.git at c89565a14 Merge remote-tracking branch 'origin/release' into fix/merge-release-to-master This branch includes the following new commits: new c89565a14 Merge remote-tracking branch 'origin/release' into fix/merge-release-to-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. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge remote-tracking branch 'origin/release' into fix/merge-release-to-master
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch fix/merge-release-to-master in repository https://gitbox.apache.org/repos/asf/echarts.git commit c89565a149de39bd6900a451358786e75803a302 Merge: fdda0254e cfb3a8a54 Author: zakwu <123537...@qq.com> AuthorDate: Thu Mar 23 16:03:18 2023 +0800 Merge remote-tracking branch 'origin/release' into fix/merge-release-to-master 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 + i18n/langTR-obj.js | 173 +++ i18n/langTR.js | 169 +++ i18n/langVI-obj.js | 198 ++ i18n/langVI.js | 194 + i18n/langZH-obj.js | 1 + i18n/langZH.js | 1 + package-lock.json | 18 +- package.json| 4 +- src/chart/sunburst/SunburstPiece.ts | 2 +- src/core/echarts.ts | 4 +- 28 files changed, 1464 insertions(+), 474 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: chore: release 5.4.2
This is an automated email from the ASF dual-hosted git repository. zakwu 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 96c64570 chore: release 5.4.2 96c64570 is described below commit 96c64570b4cb0585c44822b66081d31499cc1278 Author: zakwu <123537...@qq.com> AuthorDate: Thu Mar 23 15:41:13 2023 +0800 chore: release 5.4.2 --- js/download.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/download.js b/js/download.js index 0f44d6a4..1247a99e 100644 --- a/js/download.js +++ b/js/download.js @@ -3,7 +3,7 @@ var param = [{ publishedAt: '2022-12-09T00:00:00Z', prerelease: false, -name: '5.4.1' +name: '5.4.2' }]; var table = document.getElementById('download-table'); - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-website] branch asf-site updated: chore: change version to 5.4.2
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/echarts-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 98a25de3 chore: change version to 5.4.2 98a25de3 is described below commit 98a25de3e7922d91ecff1b0318f044df28114212 Author: wufeng AuthorDate: Thu Mar 23 15:16:18 2023 +0800 chore: change version to 5.4.2 --- en/js/download.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/js/download.js b/en/js/download.js index f35b8daf..28def929 100644 --- a/en/js/download.js +++ b/en/js/download.js @@ -1 +1 @@ -var param=[{publishedAt:"2022-12-09T00:00:00Z",prerelease:!1,name:"5.4.1"}],table=document.getElementById("download-table");function isIncubatingVersion(e){return e.split(".")[0]<5||"5.0.0"===e}for(var time,line,version,versionEl,date,isIncubating,main,mirror,source,bin,i=0;inew Date("2018-05-21")&&(line=document.createElement("tr"),version=param[i].name,(versionEl=document.createElement("td")).innerHT [...] \ No newline at end of file +var param=[{publishedAt:"2022-12-09T00:00:00Z",prerelease:!1,name:"5.4.2"}],table=document.getElementById("download-table");function isIncubatingVersion(e){return e.split(".")[0]<5||"5.0.0"===e}for(var time,line,version,versionEl,date,isIncubating,main,mirror,source,bin,i=0;inew Date("2018-05-21")&&(line=document.createElement("tr"),version=param[i].name,(versionEl=document.createElement("td")).innerHT [...] \ 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
svn commit: r60778 - in /release/echarts: 5.4.2/ 5.4.2/RELEASE_NOTE.txt 5.4.2/apache-echarts-5.4.2-src.zip 5.4.2/apache-echarts-5.4.2-src.zip.asc 5.4.2/apache-echarts-5.4.2-src.zip.sha512 KEYS
Author: zakwu Date: Thu Mar 23 06:32:04 2023 New Revision: 60778 Log: release Added: release/echarts/5.4.2/ release/echarts/5.4.2/RELEASE_NOTE.txt release/echarts/5.4.2/apache-echarts-5.4.2-src.zip (with props) release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.asc release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.sha512 Modified: release/echarts/KEYS Added: release/echarts/5.4.2/RELEASE_NOTE.txt == --- release/echarts/5.4.2/RELEASE_NOTE.txt (added) +++ release/echarts/5.4.2/RELEASE_NOTE.txt Thu Mar 23 06:32:04 2023 @@ -0,0 +1,15 @@ +## 5.4.2 + ++ [Feature] [bar] Support `borderRadius` for polar bar and its background. [#17995](https://github.com/apache/echarts/issues/17995) ([Ovilia](https://github.com/Ovilia)) ++ [Feature] [i18n] Add Turkish(tr_TR) translation. [#18012](https://github.com/apache/echarts/issues/18012) ([partitect](https://github.com/partitect)) ++ [Feature] [i18n] Add Vietnamese(vi_VN) translation. [#18279](https://github.com/apache/echarts/issues/18279) ([nghiepdev](https://github.com/nghiepdev)) ++ [Fix] [bar] Polar bar animation should start from `r0` rather than `0`. [#17997](https://github.com/apache/echarts/issues/17997) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [marker] Fix abnormal range of `markArea` in bar series. [#18229](https://github.com/apache/echarts/issues/18229) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [line] Fix labels don't show in line series when `ssr` is enabled. [#18032](https://github.com/apache/echarts/issues/18032) ([plainheart](https://github.com/plainheart)) ++ [Fix] [svg] Fix defined CSS doesn't work due to unexpected encoding for style tag. [#982](https://github.com/ecomfe/zrender/pull/982) ([plainheart](https://github.com/plainheart)) ++ [Fix] [sunburst] Fix labels might upside down in `radial` layout. [#18240](https://github.com/apache/echarts/issues/18240) ([susiwen8](https://github.com/susiwen8)) ++ [Fix] [dataset] Fix chart can't render when using object array and object item contains a property named `length`. [#18276](https://github.com/apache/echarts/issues/18276) ([susiwen8](https://github.com/susiwen8)) ++ [Fix] [tooltip] Fix tooltip still disappears after leaving the tooltip even if `alwaysShowContent` was enabled. [#18221](https://github.com/apache/echarts/issues/18221) ([jianghaoran116](https://github.com/jianghaoran116)) ++ [Fix] [text] Charsets like Cyrillic should break word the same as Latin. [#973](https://github.com/ecomfe/zrender/issues/973) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [type] Add missing `treePathInfo` property into sunburst formatter callback and add missing `data` option into `SunburstSeriesOption`. [#18310](https://github.com/apache/echarts/issues/18310) ([plainheart](https://github.com/plainheart)) ++ [Fix] [type] Add missing callback function type for the `symbol` option of tree series. [#18070](https://github.com/apache/echarts/issues/18070) ([ChepteaCatalin](https://github.com/ChepteaCatalin)) \ No newline at end of file Added: release/echarts/5.4.2/apache-echarts-5.4.2-src.zip == Binary file - no diff available. Propchange: release/echarts/5.4.2/apache-echarts-5.4.2-src.zip -- svn:mime-type = application/octet-stream Added: release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.asc == --- release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.asc (added) +++ release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.asc Thu Mar 23 06:32:04 2023 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- + +iHUEABYKAB0WIQScixZnd9sVrRzA/79xVVm5IX1OWgUCZBE+UwAKCRBxVVm5IX1O +Wq7VAP9EP8hOfwIz8VJzwgQ4mtETeD7xnAifgcjDmA5gnDWTmgD/S2bEulUFhE50 +qZG/4/MhAEYxeogHBHO7k6YMbllINgA= +=XjHO +-END PGP SIGNATURE- Added: release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.sha512 == --- release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.sha512 (added) +++ release/echarts/5.4.2/apache-echarts-5.4.2-src.zip.sha512 Thu Mar 23 06:32:04 2023 @@ -0,0 +1 @@ +82fd86f1564781741aaec8cd4acb0b86afe72bbc31c7aac5aff25257e60072e047d789aeb8caef399c22ef215cd088a64aa67894a3c8f050617c0e3a8d236672 apache-echarts-5.4.2-rc.1-src.zip Modified: release/echarts/KEYS == --- release/echarts/KEYS (original) +++ release/echarts/KEYS Thu Mar 23 06:32:04 2023 @@ -339,3 +339,23 @@ r5ECGwwACgkQJZ0/SMJTSzxTzQD+MTFHjt7z78fd PRobcbkBAIwAkq+ddEycxZTdzaELpE08h/BLcScqbOl/ME1PTZ0H =3Tm4 -END PGP PUBLIC KEY BLOCK- +pub ed25519 2023-03-15 [SC] [ææè³ï¼2025-03-14] + 9C8B166777DB15AD1CC0FFBF715559B9217D4E5A +uid [
[echarts] tag 5.4.2 created (now cfb3a8a54)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to tag 5.4.2 in repository https://gitbox.apache.org/repos/asf/echarts.git at cfb3a8a54 (commit) 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
svn commit: r60607 - in /dev/echarts: 5.4.2-rc.1/ 5.4.2-rc.1/RELEASE_NOTE.txt 5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip 5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.asc 5.4.2-rc.1/apache-echarts-5.
Author: zakwu Date: Wed Mar 15 06:38:36 2023 New Revision: 60607 Log: prerelease Added: dev/echarts/5.4.2-rc.1/ dev/echarts/5.4.2-rc.1/RELEASE_NOTE.txt dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip (with props) dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.asc dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.sha512 Modified: dev/echarts/KEYS Added: dev/echarts/5.4.2-rc.1/RELEASE_NOTE.txt == --- dev/echarts/5.4.2-rc.1/RELEASE_NOTE.txt (added) +++ dev/echarts/5.4.2-rc.1/RELEASE_NOTE.txt Wed Mar 15 06:38:36 2023 @@ -0,0 +1,15 @@ +## 5.4.2 + ++ [Feature] [bar] Support `borderRadius` for polar bar and its background. [#17995](https://github.com/apache/echarts/issues/17995) ([Ovilia](https://github.com/Ovilia)) ++ [Feature] [i18n] Add Turkish(tr_TR) translation. [#18012](https://github.com/apache/echarts/issues/18012) ([partitect](https://github.com/partitect)) ++ [Feature] [i18n] Add Vietnamese(vi_VN) translation. [#18279](https://github.com/apache/echarts/issues/18279) ([nghiepdev](https://github.com/nghiepdev)) ++ [Fix] [bar] Polar bar animation should start from `r0` rather than `0`. [#17997](https://github.com/apache/echarts/issues/17997) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [marker] Fix abnormal range of `markArea` in bar series. [#18229](https://github.com/apache/echarts/issues/18229) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [line] Fix labels don't show in line series when `ssr` is enabled. [#18032](https://github.com/apache/echarts/issues/18032) ([plainheart](https://github.com/plainheart)) ++ [Fix] [svg] Fix defined CSS doesn't work due to unexpected encoding for style tag. [#982](https://github.com/ecomfe/zrender/pull/982) ([plainheart](https://github.com/plainheart)) ++ [Fix] [sunburst] Fix labels might upside down in `radial` layout. [#18240](https://github.com/apache/echarts/issues/18240) ([susiwen8](https://github.com/susiwen8)) ++ [Fix] [dataset] Fix chart can't render when using object array and object item contains a property named `length`. [#18276](https://github.com/apache/echarts/issues/18276) ([susiwen8](https://github.com/susiwen8)) ++ [Fix] [tooltip] Fix tooltip still disappears after leaving the tooltip even if `alwaysShowContent` was enabled. [#18221](https://github.com/apache/echarts/issues/18221) ([jianghaoran116](https://github.com/jianghaoran116)) ++ [Fix] [text] Charsets like Cyrillic should break word the same as Latin. [#973](https://github.com/ecomfe/zrender/issues/973) ([Ovilia](https://github.com/Ovilia)) ++ [Fix] [type] Add missing `treePathInfo` property into sunburst formatter callback and add missing `data` option into `SunburstSeriesOption`. [#18310](https://github.com/apache/echarts/issues/18310) ([plainheart](https://github.com/plainheart)) ++ [Fix] [type] Add missing callback function type for the `symbol` option of tree series. [#18070](https://github.com/apache/echarts/issues/18070) ([ChepteaCatalin](https://github.com/ChepteaCatalin)) \ No newline at end of file Added: dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip == Binary file - no diff available. Propchange: dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip -- svn:mime-type = application/octet-stream Added: dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.asc == --- dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.asc (added) +++ dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.asc Wed Mar 15 06:38:36 2023 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- + +iHUEABYKAB0WIQScixZnd9sVrRzA/79xVVm5IX1OWgUCZBE+UwAKCRBxVVm5IX1O +Wq7VAP9EP8hOfwIz8VJzwgQ4mtETeD7xnAifgcjDmA5gnDWTmgD/S2bEulUFhE50 +qZG/4/MhAEYxeogHBHO7k6YMbllINgA= +=XjHO +-END PGP SIGNATURE- Added: dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.sha512 == --- dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.sha512 (added) +++ dev/echarts/5.4.2-rc.1/apache-echarts-5.4.2-rc.1-src.zip.sha512 Wed Mar 15 06:38:36 2023 @@ -0,0 +1 @@ +82fd86f1564781741aaec8cd4acb0b86afe72bbc31c7aac5aff25257e60072e047d789aeb8caef399c22ef215cd088a64aa67894a3c8f050617c0e3a8d236672 apache-echarts-5.4.2-rc.1-src.zip Modified: dev/echarts/KEYS == --- dev/echarts/KEYS (original) +++ dev/echarts/KEYS Wed Mar 15 06:38:36 2023 @@ -339,3 +339,23 @@ r5ECGwwACgkQJZ0/SMJTSzxTzQD+MTFHjt7z78fd PRobcbkBAIwAkq+ddEycxZTdzaELpE08h/BLcScqbOl/ME1PTZ0H =3Tm4 -END PGP PUBLIC KEY BLOCK- +pub ed25519 2023-03-15 [SC] [ææè
[echarts] tag 5.4.2-rc.1 created (now cfb3a8a54)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to tag 5.4.2-rc.1 in repository https://gitbox.apache.org/repos/asf/echarts.git at cfb3a8a54 (commit) 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] tag 5.4.2-rc.1 created (now cfb3a8a54)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to tag 5.4.2-rc.1 in repository https://gitbox.apache.org/repos/asf/echarts.git at cfb3a8a54 (commit) 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] tag 5.4.2-rc1 created (now cfb3a8a54)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to tag 5.4.2-rc1 in repository https://gitbox.apache.org/repos/asf/echarts.git at cfb3a8a54 (commit) 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 release-dev updated (d843dca04 -> d7674f415)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git from d843dca04 reset the npm registry add d7674f415 add language files No new revisions were added by this update. Summary of changes: src/i18n/langTR.ts => i18n/langTR-obj.js | 65 +++- src/i18n/langTR.ts => i18n/langTR.js | 61 +- src/i18n/langVI.ts => i18n/langVI-obj.js | 65 +++- src/i18n/langVI.ts => i18n/langVI.js | 61 +- 4 files changed, 184 insertions(+), 68 deletions(-) copy src/i18n/langTR.ts => i18n/langTR-obj.js (73%) copy src/i18n/langTR.ts => i18n/langTR.js (73%) copy src/i18n/langVI.ts => i18n/langVI-obj.js (71%) copy src/i18n/langVI.ts => i18n/langVI.js (71%) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated: Update changelog.md
This is an automated email from the ASF dual-hosted git repository. zakwu 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 8ed1ba7b Update changelog.md 8ed1ba7b is described below commit 8ed1ba7b3387818442b31aa9b90831b5e419f153 Author: zakwu <123537...@qq.com> AuthorDate: Mon Mar 13 16:43:35 2023 +0800 Update changelog.md --- en/changelog.md | 16 1 file changed, 16 insertions(+) diff --git a/en/changelog.md b/en/changelog.md index 31d88c8a..5894d143 100644 --- a/en/changelog.md +++ b/en/changelog.md @@ -1,3 +1,19 @@ +## v5.4.2 + + ++ fix(type): fix `treePathInfo` is missing in the type of sunburst formatter callback [#18310](https://github.com/apache/echarts/issues/18310) ([plainheart](https://github.com/plainheart)) ++ feat(i18n): add Vietnamese(vi_VN) translation [#18279](https://github.com/apache/echarts/issues/18279) ([nghiepdev](https://github.com/nghiepdev)) ++ fix(dataset): object source contains `length` breaks render [#18276](https://github.com/apache/echarts/issues/18276) ([susiwen8](https://github.com/susiwen8)) ++ fix(sunburst): `radial` rotation label might upside down [#18240](https://github.com/apache/echarts/issues/18240) ([susiwen8](https://github.com/susiwen8)) ++ fix(markArea): markArea range in bar series #18130 [#18229](https://github.com/apache/echarts/issues/18229) ([Ovilia](https://github.com/Ovilia)) ++ fix(tooltip): fix `alwaysShowContent` doesn't work after leaving the tooltip [#18221](https://github.com/apache/echarts/issues/18221) ([jianghaoran116](https://github.com/jianghaoran116)) ++ fix(type): add missing callback function type for series-tree.symbol [#18070](https://github.com/apache/echarts/issues/18070) ([ChepteaCatalin](https://github.com/ChepteaCatalin)) ++ fix(ssr): fix label doesn't show in line series when `ssr` is enabled [#18032](https://github.com/apache/echarts/issues/18032) ([plainheart](https://github.com/plainheart)) ++ feat(i18n): add Turkish(tr_TR) translation [#18012](https://github.com/apache/echarts/issues/18012) ([partitect](https://github.com/partitect)) ++ fix(polar): polar bar animation should start from r0 rather than 0 [#17997](https://github.com/apache/echarts/issues/17997) ([Ovilia](https://github.com/Ovilia)) ++ fix(polar): support borderRadius for polar bars #17980 [#17995](https://github.com/apache/echarts/issues/17995) ([Ovilia](https://github.com/Ovilia)) ++ fix: Charsets like Cyrillic should break work the same as Latin [#973](https://github.com/ecomfe/zrender/issues/973) ([Ovilia](https://github.com/Ovilia)) + ## v5.4.1 2022-12-09 - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch release-dev updated (35d93939f -> d843dca04)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git from 35d93939f reset the npm registry add d843dca04 reset the npm registry No new revisions were added by this update. Summary of changes: dist/echarts.common.js | 2 +- dist/echarts.common.js.map | 2 +- dist/echarts.common.min.js | 2 +- dist/echarts.esm.js| 2 +- dist/echarts.esm.js.map| 2 +- dist/echarts.esm.min.js| 2 +- dist/echarts.js| 2 +- dist/echarts.js.map| 2 +- dist/echarts.min.js| 2 +- dist/echarts.simple.js | 2 +- dist/echarts.simple.js.map | 2 +- dist/echarts.simple.min.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/core/echarts.ts| 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: reset the npm registry
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git commit 35d93939fe78bb9f3c94dfe992159fcd70cded70 Author: zakwu <123537...@qq.com> AuthorDate: Mon Mar 13 12:46:12 2023 +0800 reset the npm registry --- 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 + i18n/langZH-obj.js | 1 + i18n/langZH.js | 1 + package-lock.json | 18 +-- package.json | 4 +- src/core/echarts.ts| 4 +- 23 files changed, 729 insertions(+), 473 deletions(-) diff --git a/dist/echarts.common.js b/dist/echarts.common.js index e55eef732..4a5506157 100644 --- a/dist/echarts.common.js +++ b/dist/echarts.common.js @@ -7270,7 +7270,7 @@ function registerPainter(name, Ctor) { painterCtors[name] = Ctor; } -var version = '5.4.1'; +var version = '5.4.3'; var zrender = /*#__PURE__*/Object.freeze({ __proto__: null, @@ -9354,16 +9354,19 @@ } } } -function isLatin(ch) { +function isAlphabeticLetter(ch) { var code = ch.charCodeAt(0); -return code >= 0x21 && code <= 0x17F; +return code >= 0x20 && code <= 0x24F +|| code >= 0x370 && code <= 0x10FF +|| code >= 0x1200 && code <= 0x13FF +|| code >= 0x1E00 && code <= 0x206F; } var breakCharMap = reduce(',&?/;] '.split(''), function (obj, ch) { obj[ch] = true; return obj; }, {}); function isWordBreakChar(ch) { -if (isLatin(ch)) { +if (isAlphabeticLetter(ch)) { if (breakCharMap[ch]) { return true; } @@ -16121,23 +16124,23 @@ */ /* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ /** * Language: English. @@ -20243,11 +20246,7 @@ if (obj) { -var dimensions_1 = []; -each(obj, function (value, key) { - dimensions_1.push(key); -}); -return dimensions_1; +return keys(obj); } } // Consider dimensions defined like ['A', 'price', 'B', 'price', 'C', 'price'], // which is reasonable. But dimension name is duplicated. @@ -21828,7 +21827,7 @@ /** @class
[echarts] branch release-dev created (now 35d93939f)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git at 35d93939f reset the npm registry This branch includes the following new commits: new 35d93939f reset the npm registry 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] branch release-dev updated (9f23c8fea -> 9b7de084b)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git from 9f23c8fea prepare for release v5.4.3 add 9b7de084b reset the npm registry No new revisions were added by this update. Summary of changes: package-lock.json | 826 -- 1 file changed, 241 insertions(+), 585 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch release-dev updated (c7030540d -> 9f23c8fea)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git from c7030540d prepare for release v5.4.3 add 9f23c8fea prepare for release v5.4.3 No new revisions were added by this update. Summary of changes: package-lock.json | 48640 ++-- package.json | 219 +- 2 files changed, 24277 insertions(+), 24582 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch release-dev created (now c7030540d)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git at c7030540d prepare for release v5.4.3 This branch includes the following new commits: new c7030540d prepare for release v5.4.3 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-www] branch add-shenshuntian-as-committer created (now 1945ce7)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch add-shenshuntian-as-committer in repository https://gitbox.apache.org/repos/asf/echarts-www.git. at 1945ce7 add shen shuntian to committers page This branch includes the following new commits: new 1945ce7 add shen shuntian to committers page 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-www] 01/01: add shen shuntian to committers page
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch add-shenshuntian-as-committer in repository https://gitbox.apache.org/repos/asf/echarts-www.git commit 1945ce7f0077cd15bdf0185ab0c523954d38d5b6 Author: zakwu <123537...@qq.com> AuthorDate: Wed Jul 21 16:03:05 2021 +0800 add shen shuntian to committers page --- _jade/en/committers.jade | 6 ++ _jade/zh/committers.jade | 6 ++ images/people/shenshuntian.jpg | Bin 0 -> 11932 bytes 3 files changed, 12 insertions(+) diff --git a/_jade/en/committers.jade b/_jade/en/committers.jade index 8ddb02b..54424c1 100644 --- a/_jade/en/committers.jade +++ b/_jade/en/committers.jade @@ -173,6 +173,12 @@ block content img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/tedliu.jpg?_v_=#{cdnPayVersion}') h5.about-name Ted Liu .about-desc Beijing, China +.col-md-3.col-sm-4.col-xs-6 +.about-person + img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/shenshuntian.jpg?_v_=#{cdnPayVersion}') +h5.about-name Tim Shen +.about-desc Tencent +.about-desc Shenzhen, China h4.group.contributor Contributors .row diff --git a/_jade/zh/committers.jade b/_jade/zh/committers.jade index 9ea9e45..3bddf80 100644 --- a/_jade/zh/committers.jade +++ b/_jade/zh/committers.jade @@ -172,6 +172,12 @@ block content img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/tedliu.jpg?_v_=#{cdnPayVersion}') h5.about-name Ted Liu .about-desc 中国 · 北京 +.col-md-3.col-sm-4.col-xs-6 +.about-person + img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/shenshuntian.jpg?_v_=#{cdnPayVersion}') +h5.about-name 沈顺天 +.about-desc 腾讯 +.about-desc 中国 · 深圳 h4.group.contributor Contributors .row diff --git a/images/people/shenshuntian.jpg b/images/people/shenshuntian.jpg new file mode 100644 index 000..fd4ca52 Binary files /dev/null and b/images/people/shenshuntian.jpg differ - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-14285 created (now 9e647d3)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch fix-14285 in repository https://gitbox.apache.org/repos/asf/echarts.git. at 9e647d3 fix(dataZoom):fix dataZoom setting no effect This branch includes the following new commits: new 9e647d3 fix(dataZoom):fix dataZoom setting no effect 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: fix(dataZoom):fix dataZoom setting no effect
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch fix-14285 in repository https://gitbox.apache.org/repos/asf/echarts.git commit 9e647d3c5115819d39515b21ef1de4d8413df836 Author: zakwu <123537...@qq.com> AuthorDate: Wed Mar 3 17:06:14 2021 +0800 fix(dataZoom):fix dataZoom setting no effect --- src/component/dataZoom/SliderZoomView.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/component/dataZoom/SliderZoomView.ts b/src/component/dataZoom/SliderZoomView.ts index cfcb8ac..def6bd6 100644 --- a/src/component/dataZoom/SliderZoomView.ts +++ b/src/component/dataZoom/SliderZoomView.ts @@ -42,6 +42,7 @@ import { createSymbol, symbolBuildProxies } from '../../util/symbol'; import { deprecateLog } from '../../util/log'; import { PointLike } from 'zrender/src/core/Point'; import Displayable from 'zrender/src/graphic/Displayable'; +import {createTextStyle} from "../../label/labelStyle"; const Rect = graphic.Rect; @@ -599,13 +600,13 @@ class SliderZoomView extends DataZoomView { handleLabels[handleIndex] = new graphic.Text({ silent: true, invisible: true, -style: { +style: createTextStyle(textStyleModel, { x: 0, y: 0, text: '', verticalAlign: 'middle', align: 'center', fill: textStyleModel.getTextColor(), font: textStyleModel.getFont() -}, +}), z2: 10 })); - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch fix-autoCurveness created (now 69c4fea)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch fix-autoCurveness in repository https://gitbox.apache.org/repos/asf/echarts-doc.git. at 69c4fea add(graph):fix auto curveness doc This branch includes the following new commits: new 69c4fea add(graph):fix auto curveness doc 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] 01/01: add(graph):fix auto curveness doc
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch fix-autoCurveness in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 69c4fea992de0a15809e5cf34ed015dc7d0aec69 Author: zakwu <123537...@qq.com> AuthorDate: Sat Jan 30 09:53:31 2021 +0800 add(graph):fix auto curveness doc --- en/option/series/graph.md | 6 -- zh/option/series/graph.md | 8 +--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/en/option/series/graph.md b/en/option/series/graph.md index b01b58e..9e0d658 100644 --- a/en/option/series/graph.md +++ b/en/option/series/graph.md @@ -309,9 +309,11 @@ Select state of nodes in this category. {{ use: graph-node-state() }} -## autoCurveness(number|Array) = 20 +## autoCurveness(boolean|number|Array) = false -For the situation where there are multiple links between nodes, the curveness of each link is automatically calculated. +For the situation where there are multiple links between nodes, the curveness of each link is automatically calculated, not enabled by default. + +When set `true` to enable automatic curvature calculation, the default edge curvenness array length is `20`, if the number of edges between two nodes is more than `20`, please use `number` or `Array` to set the edge curvenness array. When set to `number`, it indicates the length of the edge curvenness array between two nodes, and the calculation result is given by the internal algorithm. diff --git a/zh/option/series/graph.md b/zh/option/series/graph.md index 818f429..99d24b0 100644 --- a/zh/option/series/graph.md +++ b/zh/option/series/graph.md @@ -315,13 +315,15 @@ edgeSymbol: ['circle', 'arrow'] {{ use: graph-node-state() }} -## autoCurveness(number|Array) = 20 +## autoCurveness(boolean|number|Array) = false -针对节点之间存在多边的情况,自动计算各边曲率。 +针对节点之间存在多边的情况,自动计算各边曲率,默认不开启。 + +设置为 `true` 时,开启自动曲率计算,默认边曲率数组长度为 `20`,如果两点间边数大于 `20`,请使用 `number` 或 `Array` 设置边曲率数组。 设置为 `number` 时,表示两点间边曲率数组的长度,由内部算法给出计算结果。 -设置为 `Array` 时,表示直接指定曲率数组,多边曲率会从数组中直接按顺序选取。 +设置为 `Array` 时,表示直接指定边曲率数组,多边曲率会从数组中直接按顺序选取。 **注意:** 如果设置 [lineStyle.curveness](~series-graph.lineStyle.curveness) 则此属性失效。 - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch feat-12338 created (now 3b0df70)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch feat-12338 in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. at 3b0df70 feat(tooltip): add formatter cache to tooltip This branch includes the following new commits: new 3b0df70 feat(tooltip): add formatter cache to 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. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] 01/01: feat(tooltip): add formatter cache to tooltip
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch feat-12338 in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit 3b0df70d95ecf9cf00cc3db027882e9ba9b401b6 Author: zakwu <123537...@qq.com> AuthorDate: Tue Sep 15 17:07:04 2020 +0800 feat(tooltip): add formatter cache to tooltip --- src/component/tooltip/TooltipModel.ts | 6 +- src/component/tooltip/TooltipView.ts | 30 +++- test/tooltip-formatter-cache.html | 128 ++ 3 files changed, 162 insertions(+), 2 deletions(-) diff --git a/src/component/tooltip/TooltipModel.ts b/src/component/tooltip/TooltipModel.ts index a7bd3e3..7aac3b8 100644 --- a/src/component/tooltip/TooltipModel.ts +++ b/src/component/tooltip/TooltipModel.ts @@ -66,6 +66,10 @@ export interface TooltipOption extends CommonTooltipOption void } class TooltipModel extends ComponentModel { @@ -173,4 +177,4 @@ class TooltipModel extends ComponentModel { ComponentModel.registerClass(TooltipModel); -export default TooltipModel; \ No newline at end of file +export default TooltipModel; diff --git a/src/component/tooltip/TooltipView.ts b/src/component/tooltip/TooltipView.ts index d877177..6440aa7 100644 --- a/src/component/tooltip/TooltipView.ts +++ b/src/component/tooltip/TooltipView.ts @@ -154,6 +154,8 @@ class TooltipView extends ComponentView { private _lastDataByCoordSys: DataByCoordSys[]; +private _tooltipFormatterCache: {[propName: string]: any} + init(ecModel: GlobalModel, api: ExtensionAPI) { if (env.node) { return; @@ -714,6 +716,17 @@ class TooltipView extends ComponentView { }); } +private _getTooltipCache(key: string): any { +return this._tooltipFormatterCache && this._tooltipFormatterCache[key]; +} + +private _setTooltipCache(key: string, value: any) { +if (!key) return; + +this._tooltipFormatterCache = this._tooltipFormatterCache || {}; +this._tooltipFormatterCache[key] = value; +} + private _showTooltipContent( // Use Model insteadof TooltipModel because this model may be from series or other options. // Instead of top level tooltip. @@ -749,6 +762,18 @@ class TooltipView extends ComponentView { html = formatUtil.formatTpl(formatter, params, true); } else if (zrUtil.isFunction(formatter)) { +// formatter cache +let formatterCache = null as any; +let key: string; +const useFormatterCache = tooltipModel.get('useFormatterCache'); +const hitFormatterCache = tooltipModel.get('hitFormatterCache'); + +if(useFormatterCache && params) { +const p = zrUtil.isArray(params) ? params[0] : params; +key = [p.seriesId, p.componentIndex, p.seriesName, p.name, p.dataIndex].join('-'); +formatterCache = this._getTooltipCache(key); +} + const callback = bind(function (cbTicket: string, html: string) { if (cbTicket === this._ticket) { tooltipContent.setContent(html, markupStyleCreator, tooltipModel, nearPoint.color, positionExpr); @@ -758,7 +783,10 @@ class TooltipView extends ComponentView { } }, this); this._ticket = asyncTicket; -html = formatter(params, asyncTicket, callback); + +html = formatterCache || formatter(params, asyncTicket, callback); +formatterCache && zrUtil.isFunction(hitFormatterCache) && hitFormatterCache(key, formatterCache); +key && this._setTooltipCache(key, html); } tooltipContent.setContent(html, markupStyleCreator, tooltipModel, nearPoint.color, positionExpr); diff --git a/test/tooltip-formatter-cache.html b/test/tooltip-formatter-cache.html new file mode 100644 index 000..b36f416 --- /dev/null +++ b/test/tooltip-formatter-cache.html @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +require(['echarts'/*, 'map/js/china' */], function (echarts) { +var labelRight = { +position: 'right' +}; +var option = { +title: { +text: 'toolsTip formatter trigger once test #12338', +subtext: 'From ExcelHome', +sublink: '<a rel="nofollow" href="http://e.weibo.com/1341556070/AjwF2AgQm">http://e.weibo.com/1341556070/AjwF2AgQm</a>' +}, +tooltip: { +trigger: 'axis', +axisPointer: {// 坐标轴指示器log,坐标轴触发有效 +type: 'shadow'// 默认为直线,可选为:'line' | 'shadow' +
[incubator-echarts] branch fix-10537 created (now 423d6ec)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch fix-10537 in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. at 423d6ec fix(tooltipView): radar.tooltip.trigger.axis no effect, fix 10537 This branch includes the following new commits: new 423d6ec fix(tooltipView): radar.tooltip.trigger.axis no effect, fix 10537 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
[incubator-echarts] 01/01: fix(tooltipView): radar.tooltip.trigger.axis no effect, fix 10537
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch fix-10537 in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit 423d6ec20482c6a95121db2b1aaba4537570b188 Author: zakwu <123537...@qq.com> AuthorDate: Tue Sep 15 11:17:27 2020 +0800 fix(tooltipView): radar.tooltip.trigger.axis no effect, fix 10537 --- src/component/tooltip/TooltipView.ts | 3 +- test/radar.html | 91 ++-- 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/src/component/tooltip/TooltipView.ts b/src/component/tooltip/TooltipView.ts index d877177..50386d1 100644 --- a/src/component/tooltip/TooltipView.ts +++ b/src/component/tooltip/TooltipView.ts @@ -628,8 +628,9 @@ class TooltipView extends ComponentView { this._tooltipModel ]); +// fix 10537 const tooltipTrigger = tooltipModel.get('trigger'); -if (tooltipTrigger != null && tooltipTrigger !== 'item') { +if (!tooltipTrigger || tooltipTrigger === 'none') { return; } diff --git a/test/radar.html b/test/radar.html index c071474..6d687a8 100644 --- a/test/radar.html +++ b/test/radar.html @@ -26,12 +26,17 @@ under the License. -html, body, #main { +html, body { width: 100%; height: 100%; } +#main, #main1 { +width: 100%; +height: 800px; +} + require([ @@ -47,7 +52,8 @@ under the License. aria: { show: true }, -tooltip: {}, +tooltip: { +}, legend: { data: ['预算分配(Allocated Budget)', '实际开销(Actual Spending)含有 "-" 数据', '第一个元素是 null'] }, @@ -109,5 +115,84 @@ under the License. }); + + +require([ +'echarts' +// 'echarts/chart/radar', +// 'echarts/component/legend', +// 'echarts/component/tooltip' +], function (echarts) { + +var chart = echarts.init(document.getElementById('main1')); + +chart.setOption({ +aria: { +show: true +}, +tooltip: { +// fix 10537 +trigger: 'axis' +}, +legend: { +data: ['预算分配(Allocated Budget)', '实际开销(Actual Spending)含有 "-" 数据', '第一个元素是 null'] +}, +radar: { +radius: [50, '70%'], +name: { +formatter:'【{value}】', +color:'#72ACD1' +}, +triggerEvent: true, +// shape: 'circle', +indicator: [ +{ text: '销售(sales)', max: 100}, +{ text: '管理(Administration)', max: 16000}, +{ text: '信息技术(Information Techology)', max: 3}, +{ text: '客服(Customer Support)', max: 38000}, +{ text: '研发(Development)', max: 52000}, +{ text: '市场(Marketing)', max: 25000} +] +}, +series: [{ +name: '预算 vs 开销(Budget vs spending)', +type: 'radar', +label: { +normal: { +show: true +} +}, +// areaStyle: {normal: {}}, +data : [ +{ +value : [0, 1, 28000, 35000, 5, 19000], +name : '预算分配(Allocated Budget)' +}, +{ +value : [50, 14000, 28000, 31000, '-', 21000], +name : '实际开销(Actual Spending)含有 "-" 数据' +}, +{ +value: ['-', 8000, 2, 2, 4, 1], +
[incubator-echarts] 01/01: fix(tree):delete the edge when all the children nodes are deleted
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch fix-12706 in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit 8b78e46f8f4827ffb428fc1ad9155d32fb549d51 Author: zakwu <123537...@qq.com> AuthorDate: Tue Sep 15 10:52:27 2020 +0800 fix(tree):delete the edge when all the children nodes are deleted --- src/chart/tree/TreeView.ts | 27 ++--- src/data/Tree.ts | 4 +- test/tree-basic.html | 238 - 3 files changed, 234 insertions(+), 35 deletions(-) diff --git a/src/chart/tree/TreeView.ts b/src/chart/tree/TreeView.ts index fe65c25..c91fbd6 100644 --- a/src/chart/tree/TreeView.ts +++ b/src/chart/tree/TreeView.ts @@ -529,6 +529,7 @@ function drawEdge( const edgeForkPosition = seriesModel.get('edgeForkPosition'); const lineStyle = itemModel.getModel('lineStyle').getLineStyle(); let edge = symbolEl.__edge; + if (edgeShape === 'curve') { if (node.parentNode && node.parentNode !== virtualRoot) { if (!edge) { @@ -576,7 +577,6 @@ function drawEdge( } } } - if (edge) { edge.useStyle(zrUtil.defaults({ strokeNoScale: true, fill: null @@ -619,13 +619,22 @@ function removeNode( const sourceSymbolEl = data.getItemGraphicEl(source.dataIndex) as TreeSymbol; const sourceEdge = sourceSymbolEl.__edge; +// count the deleted child node, #12706 +const symbolElEcData = getECData(symbolEl); +if (source.isExpand === true && source.children) { +source.children.forEach(t => { +if (t.dataIndex === symbolElEcData.dataIndex) { +source.removeNodeCnt += 1 +} +}); +} + // 1. when expand the sub tree, delete the children node should delete the edge of // the source at the same time. because the polyline edge shape is only owned by the source. -// 2.when the node is the only children of the source, delete the node should delete the edge of +// 2.when delete all children of the source, should delete the edge of // the source at the same time. the same reason as above. const edge = symbolEl.__edge -|| ((source.isExpand === false || source.children.length === 1) ? sourceEdge : undefined); - +|| ((source.removeNodeCnt === source.children.length || source.isExpand === false) ? sourceEdge : undefined); const edgeShape = seriesModel.get('edgeShape'); const layoutOpt = seriesModel.get('layout'); const orient = seriesModel.get('orient'); @@ -641,9 +650,6 @@ function removeNode( sourceLayout, sourceLayout ), -style: { -opacity: 0 -} }, seriesModel, function () { group.remove(edge); }); @@ -654,13 +660,12 @@ function removeNode( parentPoint: [sourceLayout.x, sourceLayout.y], childPoints: [[sourceLayout.x, sourceLayout.y]] }, -style: { -opacity: 0 -} }, seriesModel, function () { group.remove(edge); }); } +// clean removeNodeCnt +source.removeNodeCnt = 0; } } @@ -736,4 +741,4 @@ function getEdgeShape( ChartView.registerClass(TreeView); -export default TreeView; \ No newline at end of file +export default TreeView; diff --git a/src/data/Tree.ts b/src/data/Tree.ts index a42591a..af30607 100644 --- a/src/data/Tree.ts +++ b/src/data/Tree.ts @@ -67,6 +67,8 @@ export class TreeNode { isExpand: boolean = false; +removeNodeCnt: number = 0; + readonly hostTree: Tree; // TODO: TYPE TreeNode use generic? constructor(name: string, hostTree: Tree) { @@ -482,4 +484,4 @@ function addChild(child: TreeNode, node: TreeNode) { child.parentNode = node; } -export default Tree; \ No newline at end of file +export default Tree; diff --git a/test/tree-basic.html b/test/tree-basic.html index bb8a4b7..53e2baf 100644 --- a/test/tree-basic.html +++ b/test/tree-basic.html @@ -28,29 +28,30 @@ under the License. -html, body, #main { +html, body, .main { width: 100%; padding: 0; margin: 0; height: 100%; } - + + require([ 'echarts' // 'echarts/chart/tree', // 'echarts/component/tooltip' -], function (echarts) { -var chart = echarts.init(document.getElementById('main'),
[incubator-echarts] branch fix-12706 created (now 8b78e46)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch fix-12706 in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. at 8b78e46 fix(tree):delete the edge when all the children nodes are deleted This branch includes the following new commits: new 8b78e46 fix(tree):delete the edge when all the children nodes are deleted 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
[incubator-echarts] branch next updated (578c92e -> 99ab1d7)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. discard 578c92e fix(tree):delete the edge when all the children nodes are deleted This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/next (99ab1d7) \ O -- O -- O (578c92e) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/chart/tree/TreeView.ts | 27 +++-- src/data/Tree.ts | 4 +- test/tree-basic.html | 238 + 3 files changed, 35 insertions(+), 234 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next updated: fix(tree):delete the edge when all the children nodes are deleted
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git The following commit(s) were added to refs/heads/next by this push: new 578c92e fix(tree):delete the edge when all the children nodes are deleted 578c92e is described below commit 578c92e85f2a3d9679f1706f8fdb17572b9da34c Author: zakwu <123537...@qq.com> AuthorDate: Tue Sep 15 10:24:16 2020 +0800 fix(tree):delete the edge when all the children nodes are deleted --- src/chart/tree/TreeView.ts | 27 ++--- src/data/Tree.ts | 4 +- test/tree-basic.html | 238 - 3 files changed, 234 insertions(+), 35 deletions(-) diff --git a/src/chart/tree/TreeView.ts b/src/chart/tree/TreeView.ts index fe65c25..c91fbd6 100644 --- a/src/chart/tree/TreeView.ts +++ b/src/chart/tree/TreeView.ts @@ -529,6 +529,7 @@ function drawEdge( const edgeForkPosition = seriesModel.get('edgeForkPosition'); const lineStyle = itemModel.getModel('lineStyle').getLineStyle(); let edge = symbolEl.__edge; + if (edgeShape === 'curve') { if (node.parentNode && node.parentNode !== virtualRoot) { if (!edge) { @@ -576,7 +577,6 @@ function drawEdge( } } } - if (edge) { edge.useStyle(zrUtil.defaults({ strokeNoScale: true, fill: null @@ -619,13 +619,22 @@ function removeNode( const sourceSymbolEl = data.getItemGraphicEl(source.dataIndex) as TreeSymbol; const sourceEdge = sourceSymbolEl.__edge; +// count the deleted child node, #12706 +const symbolElEcData = getECData(symbolEl); +if (source.isExpand === true && source.children) { +source.children.forEach(t => { +if (t.dataIndex === symbolElEcData.dataIndex) { +source.removeNodeCnt += 1 +} +}); +} + // 1. when expand the sub tree, delete the children node should delete the edge of // the source at the same time. because the polyline edge shape is only owned by the source. -// 2.when the node is the only children of the source, delete the node should delete the edge of +// 2.when delete all children of the source, should delete the edge of // the source at the same time. the same reason as above. const edge = symbolEl.__edge -|| ((source.isExpand === false || source.children.length === 1) ? sourceEdge : undefined); - +|| ((source.removeNodeCnt === source.children.length || source.isExpand === false) ? sourceEdge : undefined); const edgeShape = seriesModel.get('edgeShape'); const layoutOpt = seriesModel.get('layout'); const orient = seriesModel.get('orient'); @@ -641,9 +650,6 @@ function removeNode( sourceLayout, sourceLayout ), -style: { -opacity: 0 -} }, seriesModel, function () { group.remove(edge); }); @@ -654,13 +660,12 @@ function removeNode( parentPoint: [sourceLayout.x, sourceLayout.y], childPoints: [[sourceLayout.x, sourceLayout.y]] }, -style: { -opacity: 0 -} }, seriesModel, function () { group.remove(edge); }); } +// clean removeNodeCnt +source.removeNodeCnt = 0; } } @@ -736,4 +741,4 @@ function getEdgeShape( ChartView.registerClass(TreeView); -export default TreeView; \ No newline at end of file +export default TreeView; diff --git a/src/data/Tree.ts b/src/data/Tree.ts index a42591a..af30607 100644 --- a/src/data/Tree.ts +++ b/src/data/Tree.ts @@ -67,6 +67,8 @@ export class TreeNode { isExpand: boolean = false; +removeNodeCnt: number = 0; + readonly hostTree: Tree; // TODO: TYPE TreeNode use generic? constructor(name: string, hostTree: Tree) { @@ -482,4 +484,4 @@ function addChild(child: TreeNode, node: TreeNode) { child.parentNode = node; } -export default Tree; \ No newline at end of file +export default Tree; diff --git a/test/tree-basic.html b/test/tree-basic.html index bb8a4b7..53e2baf 100644 --- a/test/tree-basic.html +++ b/test/tree-basic.html @@ -28,29 +28,30 @@ under the License. -html, body, #main { +html, body, .main { width: 100%; padding: 0; margin: 0; height: 100%; } - + + require([ 'echarts' // 'echarts/chart/tree', // 'echarts/component/tooltip' -
[incubator-echarts] branch next-i18n updated (aa2d448 -> 4d5783a)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from aa2d448 feat(i18n): change build-i18n for package add 4d5783a feat(i18n): fix neither en or zh undefined No new revisions were added by this update. Summary of changes: src/echarts.ts | 20 test/lang.html | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next-i18n updated (4289f0d -> aa2d448)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 4289f0d feat(i18n): fix some review suggestion add aa2d448 feat(i18n): change build-i18n for package No new revisions were added by this update. Summary of changes: build/build-i18n.js| 4 ++-- src/i18n/langEN.json => i18n/langEN-obj.js | 22 +- src/i18n/langEN.json => i18n/langEN.js | 22 +- src/i18n/langES.json => i18n/langES-obj.js | 22 +- src/i18n/langES.json => i18n/langES.js | 22 +- src/i18n/langFI.json => i18n/langFI-obj.js | 22 +- src/i18n/langFI.json => i18n/langFI.js | 22 +- src/i18n/langTH.json => i18n/langTH-obj.js | 22 +- src/i18n/langTH.json => i18n/langTH.js | 22 +- src/i18n/langZH.json => i18n/langZH-obj.js | 22 +- src/i18n/langZH.json => i18n/langZH.js | 22 +- test/lang.html | 6 +++--- 12 files changed, 215 insertions(+), 15 deletions(-) copy src/i18n/langEN.json => i18n/langEN-obj.js (87%) copy src/i18n/langEN.json => i18n/langEN.js (85%) copy src/i18n/langES.json => i18n/langES-obj.js (73%) copy src/i18n/langES.json => i18n/langES.js (70%) copy src/i18n/langFI.json => i18n/langFI-obj.js (72%) copy src/i18n/langFI.json => i18n/langFI.js (70%) copy src/i18n/langTH.json => i18n/langTH-obj.js (78%) copy src/i18n/langTH.json => i18n/langTH.js (76%) copy src/i18n/langZH.json => i18n/langZH-obj.js (87%) copy src/i18n/langZH.json => i18n/langZH.js (85%) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next-i18n updated (7630eb8 -> 4289f0d)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 7630eb8 feat(i18n): get default lang by use browser lang and html.lang add 4289f0d feat(i18n): fix some review suggestion No new revisions were added by this update. Summary of changes: build/build-i18n.js | 3 +-- package.json| 2 +- src/echarts.ts | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next-i18n updated (4d08c80 -> 7630eb8)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 4d08c80 feat(i18n): get default lang by use browser lang and html.lang add 7630eb8 feat(i18n): get default lang by use browser lang and html.lang No new revisions were added by this update. Summary of changes: src/echarts.ts | 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
[incubator-echarts] branch next-i18n updated (d8f9abe -> 4d08c80)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from d8f9abe feat(i18n): the locale change to type of Model add 4d08c80 feat(i18n): get default lang by use browser lang and html.lang No new revisions were added by this update. Summary of changes: src/echarts.ts | 6 +- test/lang.html | 6 ++ 2 files changed, 7 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next-i18n updated (b59e1f7 -> d8f9abe)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from b59e1f7 feat(i18n): draft commit for discuss add d8f9abe feat(i18n): the locale change to type of Model No new revisions were added by this update. Summary of changes: .eslintignore| 3 ++- src/component/legend/LegendModel.ts | 4 ++-- src/component/toolbox/feature/Brush.ts | 2 +- src/component/toolbox/feature/DataView.ts| 4 ++-- src/component/toolbox/feature/DataZoom.ts| 2 +- src/component/toolbox/feature/MagicType.ts | 6 +++--- src/component/toolbox/feature/Restore.ts | 2 +- src/component/toolbox/feature/SaveAsImage.ts | 4 ++-- src/model/Global.ts | 22 ++ src/visual/aria.ts | 4 ++-- 10 files changed, 22 insertions(+), 31 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next-i18n updated (25181b1 -> b59e1f7)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. from 25181b1 feat(i18n): code review add b59e1f7 feat(i18n): draft commit for discuss No new revisions were added by this update. Summary of changes: build/build-i18n.js| 4 ++-- src/echarts.ts | 6 ++ {i18n => src/i18n}/langEN.json | 0 {i18n => src/i18n}/langES.json | 0 {i18n => src/i18n}/langFI.json | 0 {i18n => src/i18n}/langTH.json | 0 {i18n => src/i18n}/langZH.json | 0 src/model/Global.ts| 15 +++ src/visual/aria.ts | 5 +++-- test/lang.html | 6 +++--- 10 files changed, 17 insertions(+), 19 deletions(-) rename {i18n => src/i18n}/langEN.json (100%) rename {i18n => src/i18n}/langES.json (100%) rename {i18n => src/i18n}/langFI.json (100%) rename {i18n => src/i18n}/langTH.json (100%) rename {i18n => src/i18n}/langZH.json (100%) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next-i18n updated: feat(i18n): code review
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git The following commit(s) were added to refs/heads/next-i18n by this push: new 25181b1 feat(i18n): code review 25181b1 is described below commit 25181b1d4d6f95dae84e948a97590e1f0c3ec8f1 Author: zakwu <123537...@qq.com> AuthorDate: Wed Jul 29 10:05:32 2020 +0800 feat(i18n): code review --- test/lang.html | 12 1 file changed, 12 insertions(+) diff --git a/test/lang.html b/test/lang.html index 35a7bd0..0d27cc6 100644 --- a/test/lang.html +++ b/test/lang.html @@ -42,6 +42,7 @@ under the License. + window.option = { @@ -104,6 +105,17 @@ under the License. }); + +// register neither zh or en lang +require(['echarts', 'i18n/langES-obj'], function (echarts, {lang}) { +echarts.registerLocale('ES', lang); +var chart = echarts.init(document.getElementById('main3'), null, { +locale: 'ES' +}); +chart.setOption(window.option); +}); + + - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[incubator-echarts] branch next-i18n updated: feat(i18n): code review
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git The following commit(s) were added to refs/heads/next-i18n by this push: new 45c92c6 feat(i18n): code review 45c92c6 is described below commit 45c92c695a5377bcb046fb422afd50e910513f68 Author: zakwu <123537...@qq.com> AuthorDate: Wed Jul 29 09:59:06 2020 +0800 feat(i18n): code review --- i18n/langES.json | 51 + i18n/langES.ts | 68 -- i18n/langFI.json | 51 + i18n/langFI.ts | 68 -- i18n/langTH.json | 51 + i18n/langTH.ts | 68 -- test/lang.html | 99 +++- 7 files changed, 186 insertions(+), 270 deletions(-) diff --git a/i18n/langES.json b/i18n/langES.json new file mode 100644 index 000..055e7d2 --- /dev/null +++ b/i18n/langES.json @@ -0,0 +1,51 @@ +{ +"legend": { +"selector": { +"all": "Todas", +"inverse": "Inversa" +} +}, +"toolbox": { +"brush": { +"title": { +"rect": "Selección de cuadro", +"polygon": "Selección de lazo", +"lineX": "Seleccionar horizontalmente", +"lineY": "Seleccionar verticalmente", +"keep": "Mantener selección", +"clear": "Despejar selecciones" +} +}, +"dataView": { +"title": "Ver datos", +"lang": [ +"Ver datos", +"Cerrar", +"Actualizar" +] +}, +"dataZoom": { +"title": { +"zoom": "Zoom", +"back": "Restablecer zoom" +} +}, +"magicType": { +"title": { +"line": "Cambiar a gráfico de líneas", +"bar": "Cambiar a gráfico de barras", +"stack": "Pila", +"tiled": "Teja" +} +}, +"restore": { +"title": "Restaurar" +}, +"saveAsImage": { +"title": "Guardar como imagen", +"lang": [ +"Clic derecho para guardar imagen" +] +} +} +} diff --git a/i18n/langES.ts b/i18n/langES.ts deleted file mode 100644 index 2fba545..000 --- a/i18n/langES.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -/** - * Language: Spanish - */ - -export default { -legend: { -selector: { -all: 'Todas', -inverse: 'Inversa' -} -}, -toolbox: { -brush: { -title: { -rect: 'Selección de cuadro', -polygon: 'Selección de lazo', -lineX: 'Seleccionar horizontalmente', -lineY: 'Seleccionar verticalmente', -keep: 'Mantener selección', -clear: 'Despejar selecciones' -} -}, -dataView: { -title: 'Ver datos', -lang: ['Ver datos', 'Cerrar', 'Actualizar'] -}, -dataZoom: { -title: { -zoom: 'Zoom', -back: 'Restablecer zoom' -} -}, -magicType: { -title: { -
[incubator-echarts] branch next-i18n updated: feat(i18n): change i18n with build, and change the init api
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git The following commit(s) were added to refs/heads/next-i18n by this push: new 256ff11 feat(i18n): change i18n with build, and change the init api 256ff11 is described below commit 256ff11f60a7dbf786c9c7b91ac23dd867496f85 Author: zakwu <123537...@qq.com> AuthorDate: Tue Jul 28 11:50:22 2020 +0800 feat(i18n): change i18n with build, and change the init api --- build/build-i18n.js | 69 + build/build.js | 3 ++ i18n/langEN.js | 144 i18n/langEN.json| 109 +++ i18n/langZH.js | 141 -- i18n/langZH.json| 109 +++ package.json| 3 +- src/echarts.ts | 20 +--- src/model/Global.ts | 5 +- test/lang.html | 47 +++-- 10 files changed, 351 insertions(+), 299 deletions(-) diff --git a/build/build-i18n.js b/build/build-i18n.js new file mode 100644 index 000..7a768ea --- /dev/null +++ b/build/build-i18n.js @@ -0,0 +1,69 @@ +const fs = require('fs'); + +const outFilePath = './i18n'; +const umdWrapperHead = ` +(function(root, factory) { +if (typeof define === 'function' && define.amd) { +// AMD. Register as an anonymous module. +define(['exports'], factory); +} else if ( +typeof exports === 'object' && +typeof exports.nodeName !== 'string' +) { +// CommonJS +factory(exports); +} else { +// Browser globals +factory({}); +} +})(this, function(exports) { +var lang =`; + +const umdWrapperHeadWithEcharts = ` +(function(root, factory) { +if (typeof define === 'function' && define.amd) { +// AMD. Register as an anonymous module. +define(['exports', 'echarts'], factory); +} else if ( +typeof exports === 'object' && +typeof exports.nodeName !== 'string' +) { +// CommonJS +factory(exports, require('echarts')); +} else { +// Browser globals +factory({}, root.echarts); +} +})(this, function(exports, echarts) { +var lang =`; + +const umdWrapperTail = ` +});`; + +async function buildI18nWrap() { +const targetDir = './i18n'; +const files = fs.readdirSync(targetDir); +files.forEach(t => { +if(!t.startsWith('lang') || !t.endsWith('json')) return; +const fileName = t.substring(0, t.length - 5); +console.log(fileName + ' is building...'); +const type = t.substr(-7, 2); +const echartsRegister = ` +echarts.registerLocale('${type}', lang); +`; +const pureExports = ` +exports.lang = lang; +`; +const code = fs.readFileSync(targetDir + '/' + t, 'utf-8'); +fs.writeFileSync(outFilePath + '/' + fileName + '.js', umdWrapperHeadWithEcharts + code + echartsRegister + umdWrapperTail, 'utf-8'); +fs.writeFileSync(outFilePath + '/' + fileName + '-obj.js', umdWrapperHead + code + pureExports + umdWrapperTail, 'utf-8'); +fs.writeFileSync(outFilePath + '/' + fileName + '.ts', 'export default ' + code, 'utf-8'); +console.log(fileName + ' done'); +}) +} + +buildI18nWrap(); + +module.exports = { +buildI18n: buildI18nWrap +}; diff --git a/build/build.js b/build/build.js index f88d256..436d9dc 100755 --- a/build/build.js +++ b/build/build.js @@ -30,6 +30,7 @@ const ecLangPlugin = require('./ec-lang-rollup-plugin'); const prePublish = require('./pre-publish'); const recheckDEV = require('./remove-dev').recheckDEV; const assert = require('assert'); +const {buildI18n} = require('./build-i18n') async function run() { @@ -274,6 +275,8 @@ function getPath(relativePath) { * ] */ async function build(configs) { +// buildI18n JSON before build when build +buildI18n(); // ensureZRenderCode.prepare(); diff --git a/i18n/langEN.js b/i18n/langEN.js deleted file mode 100644 index ebba3a1..000 --- a/i18n/langEN.js +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not u
[incubator-echarts] 01/01: feat(i18n): draft commit for discuss
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a commit to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git commit 950275dd5f931cfaedc6b2458192ebe0e29c42b9 Author: zakwu <123537...@qq.com> AuthorDate: Mon Jul 27 16:56:20 2020 +0800 feat(i18n): draft commit for discuss --- i18n/langEN.js | 144 +++ {src => i18n}/langES.ts | 0 {src => i18n}/langFI.ts | 0 {src => i18n}/langTH.ts | 0 i18n/langZH.js | 141 ++ src/component/legend/LegendModel.ts | 34 --- src/component/toolbox/ToolboxModel.ts| 7 +- src/component/toolbox/feature/Brush.ts | 41 src/component/toolbox/feature/DataView.ts| 44 src/component/toolbox/feature/DataZoom.ts| 28 +++--- src/component/toolbox/feature/MagicType.ts | 44 src/component/toolbox/feature/Restore.ts | 21 ++-- src/component/toolbox/feature/SaveAsImage.ts | 34 --- src/component/toolbox/featureManager.ts | 3 +- src/echarts.ts | 19 +++- src/lang.ts | 126 --- src/langEN.ts| 126 --- src/model/Global.ts | 27 - src/util/types.ts| 1 + src/visual/aria.ts | 4 +- test/lang.html | 104 +++ 21 files changed, 574 insertions(+), 374 deletions(-) diff --git a/i18n/langEN.js b/i18n/langEN.js new file mode 100644 index 000..ebba3a1 --- /dev/null +++ b/i18n/langEN.js @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Language: English. + */ + +(function(root, factory) { +if (typeof define === 'function' && define.amd) { +// AMD. Register as an anonymous module. +define(['exports', 'echarts'], factory); +} else if ( +typeof exports === 'object' && +typeof exports.nodeName !== 'string' +) { +// CommonJS +factory(exports, require('echarts')); +} else { +// Browser globals +factory({}, root.echarts); +} +})(this, function(exports, echarts) { +let lang = { +legend: { +selector: { +all: 'All', +inverse: 'Inv' +} +}, +toolbox: { +brush: { +title: { +rect: 'Box Select', +polygon: 'Lasso Select', +lineX: 'Horizontally Select', +lineY: 'Vertically Select', +keep: 'Keep Selections', +clear: 'Clear Selections' +} +}, +dataView: { +title: 'Data View', +lang: ['Data View', 'Close', 'Refresh'] +}, +dataZoom: { +title: { +zoom: 'Zoom', +back: 'Zoom Reset' +} +}, +magicType: { +title: { +line: 'Switch to Line Chart', +bar: 'Switch to Bar Chart', +stack: 'Stack', +tiled: 'Tile' +} +}, +restore: { +title: 'Restore' +}, +saveAsImage: { +title: 'Save as Image', +lang: ['Right Click to Save Image'] +} +}, +series: { +typeNames: { +pie: 'Pie chart', +bar: 'Bar chart', +
[incubator-echarts] branch next-i18n created (now 950275d)
This is an automated email from the ASF dual-hosted git repository. zakwu pushed a change to branch next-i18n in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git. at 950275d feat(i18n): draft commit for discuss This branch includes the following new commits: new 950275d feat(i18n): draft commit for discuss 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