(echarts) branch feat/axis-label-tooltip updated (550a87098 -> 33b9fddea)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch feat/axis-label-tooltip in repository https://gitbox.apache.org/repos/asf/echarts.git from 550a87098 feat(axis): allow getting tickLabel and tickIndex in the formatter of axis tooltip. 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 add 81cf1548a fix(i18n): language code for Ukrainian is UK, not UA add 053f84c78 Merge pull request #17800 from striezel-stash/i18n-ukrainian-language-code add 52673918f fix(i18n): language code for Ukrainian is UK, not UA add 3c11bf932 Merge pull request #17812 from striezel-stash/i18n-ukrainian-language-code add ff67cdc01 fix(dataStack): zero is neither positive nor negative stack, close #17801 add 7f029b4cb Merge pull request #17809 from MainHou/fix-17801 add dd7ce3549 fix(graph): draggable only work on force layout add 0a5d50ad1 Merge pull request #17792 from kongmoumou/kongmoumou/fix-graph-draggable add 3dd13423f fix(type): add overflow property to AxisLabelBaseOption interface. close #17363 add 817b84dcf Merge pull request #17808 from breizh24/fix-17363 add d3d142ad5 chore(nightly-build): fix potential npm publish error due to time conflict. add f21524924 Merge pull request #17857 from apache/nightly-build add 9cb806a5a chore: fix various typos add 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 add 273f3ede3 Merge pull request #17861 from apache/fix/hashmap add 3b20b8252 fix(tooltip): fix tooltip arrow may cover the content when border is wide. add 84a9de8db Merge pull request #17875 from apache/fix/tooltip-arrow add 0f86a100b fix(heatmap): fix heatmap label may overlap when the dataZoom is enabled add c8d5a0780 Merge pull request #17876 from apache/fix-heatmap add 0f149dc89 chore: start a local server for testing when run dev #17868 (#17882) add 63dd98acf style: fix code style flaw and remove unnecessary default parameter. (#17098) add 7fe9b7351 Merge pull request #17887 from apache/fix/code-style-17098 add 12636cd73 chore: export `ECElementEvent` for Typescript add 3d69d6c5b Merge pull request #17892 from keita-determined/chore/export-ECElementEvent add 1ed2b93c3 chore: fix some typos add 7bddbe583 Merge pull request #17896 from striezel-stash/fix-some-typos add 9a9a3ce78 chore(deps): bump socket.io-parser from 3.3.2 to 3.3.3 add e59f0b106 Merge pull request #17898 from apache/dependabot/npm_and_yarn/socket.io-parser-3.3.3 add 729c39951 chore: fix various typos add c65acfb9f Merge pull request #17904 from striezel-stash/fix-various-typos add d86c0e26a fix: fix the error caused by markArea x/y add 32382f189 fix(marker): fix magic marker statistic type is not respected in `coord` array. add f0f2f7dca test(marker): add test case for `markArea` add 77fc76742 Merge branch 'master' of https://github.com/apache/echarts into issue#10074 add 34a8fcab5 Merge pull request #17217 from jiawulin001/issue#10074 add e780ba5e7 fix(lines): add mis
(echarts-examples) branch gh-pages updated: update option keywords
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 d829f999 update option keywords
d829f999 is described below
commit d829f999f3e897327ec3201270eb8b935b9b96db
Author: plainheart
AuthorDate: Wed Apr 24 12:53:50 2024 +0800
update option keywords
---
src/data/option-keywords.js | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/data/option-keywords.js b/src/data/option-keywords.js
index 8b595350..8244ff47 100644
--- a/src/data/option-keywords.js
+++ b/src/data/option-keywords.js
@@ -1,5 +1,3 @@
-
-// THIS FILE IS GENERATED, DON'T MODIFY */
-
-/* eslint-disable */
-export const keywords =
[{"name":"color","count":1967},{"name":"shadowColor","count":1893},{"name":"shadowBlur","count":1893},{"name":"shadowOffsetX","count":1893},{"name":"shadowOffsetY","count":1893},{"name":"borderColor","count":1559},{"name":"borderWidth","count":1558},{"name":"width","count":1523},{"name":"borderType","count":1487},{"name":"borderDashOffset","count":1475},{"name":"height","count":1209},{"name":"backgroundColor","count":1199},{"name":"fontSize","count":1186},{"name":
[...]
\ No newline at end of file
+// THIS FILE IS GENERATED, DON'T MODIFY
+/* eslint-disable */
+export const keywords =
[{"name":"color","count":1967},{"name":"shadowColor","count":1893},{"name":"shadowBlur","count":1893},{"name":"shadowOffsetX","count":1893},{"name":"shadowOffsetY","count":1893},{"name":"borderColor","count":1559},{"name":"borderWidth","count":1558},{"name":"width","count":1523},{"name":"borderType","count":1487},{"name":"borderDashOffset","count":1475},{"name":"height","count":1209},{"name":"backgroundColor","count":1199},{"name":"fontSize","count":1186},{"name":
[...]
\ 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: tweak extractOptionKeys tool
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 a5d803b3 tweak extractOptionKeys tool
a5d803b3 is described below
commit a5d803b3b5f65d3849c6deeafd832f3527c74719
Author: plainheart
AuthorDate: Wed Apr 24 12:50:16 2024 +0800
tweak extractOptionKeys tool
---
tool/extractOptionKeys.js | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tool/extractOptionKeys.js b/tool/extractOptionKeys.js
index 1a4d6da5..7d37effb 100644
--- a/tool/extractOptionKeys.js
+++ b/tool/extractOptionKeys.js
@@ -3,4 +3,7 @@ const path = require('node:path');
const { extractOptionKeys } = require('./schemaHelper');
const schema = JSON.parse(fs.readFileSync(path.resolve(__dirname,
'../public/zh/documents/option.json'), 'utf-8'));
-console.log(JSON.stringify(extractOptionKeys(schema)));
\ No newline at end of file
+
+const header = `// THIS FILE IS GENERATED, DON'T MODIFY\n/* eslint-disable */`;
+
+fs.writeFileSync(`./option-keywords.js`, `${header}\nexport const keywords =
${JSON.stringify(extractOptionKeys(schema))};`);
\ 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-examples) branch gh-pages updated: remove unused code
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 b239a62f remove unused code
b239a62f is described below
commit b239a62f5e452637a8edaa5dc0bcc640dccb1953
Author: plainheart
AuthorDate: Wed Apr 24 12:31:19 2024 +0800
remove unused code
---
src/editor/sandbox/setup.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/editor/sandbox/setup.js b/src/editor/sandbox/setup.js
index 4b762b04..e2a0ffa7 100644
--- a/src/editor/sandbox/setup.js
+++ b/src/editor/sandbox/setup.js
@@ -47,7 +47,6 @@ function setup(isShared) {
sendMessage({
evt: 'optionUpdated',
option: JSON.stringify(chart.getOption(), (key, val) => {
- typeof val == '';
if (echarts.util.isFunction(val) || typeof val === 'bigint') {
return val.toString();
}
-
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: support serialize BigInt
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 b46ae992 support serialize BigInt
b46ae992 is described below
commit b46ae992c166f34b100050e2ddc8dabe7c0b40c2
Author: plainheart
AuthorDate: Wed Apr 24 12:25:28 2024 +0800
support serialize BigInt
---
src/editor/sandbox/setup.js | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/editor/sandbox/setup.js b/src/editor/sandbox/setup.js
index 95f368cc..4b762b04 100644
--- a/src/editor/sandbox/setup.js
+++ b/src/editor/sandbox/setup.js
@@ -46,9 +46,13 @@ function setup(isShared) {
const endTime = performance.now();
sendMessage({
evt: 'optionUpdated',
-option: JSON.stringify(chart.getOption(), (key, val) =>
- echarts.util.isFunction(val) ? val + '' : val
-),
+option: JSON.stringify(chart.getOption(), (key, val) => {
+ typeof val == '';
+ if (echarts.util.isFunction(val) || typeof val === 'bigint') {
+return val.toString();
+ }
+ return val;
+}),
updateTime: endTime - startTime
});
return res;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch master updated: tweak `minMargin` doc
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 8d677518 tweak `minMargin` doc
8d677518 is described below
commit 8d677518d0da64e657d387fb4451a1f13f63de7e
Author: plainheart
AuthorDate: Wed Apr 24 11:50:39 2024 +0800
tweak `minMargin` doc
---
en/option/component/geo-common.md | 3 ++-
en/option/partial/label.md| 2 ++
en/option/series/bar.md | 3 ++-
en/option/series/effectScatter.md | 6 --
en/option/series/funnel.md| 16 ++--
en/option/series/graph.md | 6 --
en/option/series/heatmap.md | 6 --
en/option/series/line.md | 9 ++---
en/option/series/lines.md | 16 ++--
en/option/series/map.md | 6 --
en/option/series/pictorialBar.md | 6 --
en/option/series/pie.md | 16 ++--
en/option/series/radar.md | 6 --
en/option/series/sankey.md| 6 --
en/option/series/scatter.md | 6 --
en/option/series/sunburst.md | 6 --
en/option/series/themeRiver.md| 3 ++-
en/option/series/tree.md | 6 --
en/option/series/treemap.md | 3 ++-
zh/option/component/geo-common.md | 3 ++-
zh/option/partial/label.md| 2 ++
zh/option/series/bar.md | 3 ++-
zh/option/series/effectScatter.md | 6 --
zh/option/series/funnel.md| 16 ++--
zh/option/series/graph.md | 6 --
zh/option/series/heatmap.md | 6 --
zh/option/series/line.md | 9 ++---
zh/option/series/lines.md | 16 ++--
zh/option/series/map.md | 6 --
zh/option/series/pictorialBar.md | 6 --
zh/option/series/pie.md | 16 ++--
zh/option/series/radar.md | 6 --
zh/option/series/sankey.md| 6 --
zh/option/series/scatter.md | 6 --
zh/option/series/sunburst.md | 6 --
zh/option/series/themeRiver.md| 3 ++-
zh/option/series/tree.md | 6 --
zh/option/series/treemap.md | 3 ++-
38 files changed, 196 insertions(+), 66 deletions(-)
diff --git a/en/option/component/geo-common.md
b/en/option/component/geo-common.md
index 7d7470af..12b8ac06 100644
--- a/en/option/component/geo-common.md
+++ b/en/option/component/geo-common.md
@@ -240,7 +240,8 @@ Selected mode decides whether multiple selecting is
supported. By default, `fals
{{ use: partial-label(
prefix = "#" + ${prefix},
-formatter = true
+formatter = true,
+minMargin = ${labelMinMargin}
) }}
#${prefix} itemStyle(Object)
diff --git a/en/option/partial/label.md b/en/option/partial/label.md
index dcf28163..402381dc 100644
--- a/en/option/partial/label.md
+++ b/en/option/partial/label.md
@@ -51,6 +51,7 @@ See: [label rotation](${galleryEditorPath}bar-label-rotation).
Whether to move text slightly. For example: `[30, 40]` means move `30`
horizontally and move `40` vertically.
+{{ if: ${minMargin} }}
#${prefix} minMargin(number)
{{ use: partial-version(
@@ -58,6 +59,7 @@ Whether to move text slightly. For example: `[30, 40]` means
move `30` horizonta
) }}
Minimal margin between labels. Used when label has
[layout](~series.labelLayout).
+{{ /if }}
{{ if: ${formatter} }}
#${prefix} formatter(string|Function)
diff --git a/en/option/series/bar.md b/en/option/series/bar.md
index d94b3b7a..eaafee4b 100644
--- a/en/option/series/bar.md
+++ b/en/option/series/bar.md
@@ -319,7 +319,8 @@ Label style configurations of single data.
prefix = "#" + ${prefix},
defaultPosition = "'inside'",
noPosition = true,
-formatter = ${topLevel}
+formatter = ${topLevel},
+minMargin = ${state} === 'normal'
) }}
##${prefix} position(string|Array) = 'inside'
diff --git a/en/option/series/effectScatter.md
b/en/option/series/effectScatter.md
index 13acd462..3e30aa6a 100644
--- a/en/option/series/effectScatter.md
+++ b/en/option/series/effectScatter.md
@@ -103,7 +103,8 @@ The brush type for ripples. options: `'stroke'` and
`'fill'`.
{{ use: partial-label(
prefix = "##",
defaultPosition = "'inside'",
-formatter = true
+formatter = true,
+minMargin = true
) }}
## labelLine(Object)
@@ -218,7 +219,8 @@ Configurations of select state. Available when
[selectedMode](~series-effectScat
{{ use: partial-label(
prefix = "###",
-defaultPosition = "inside"
+defaultPosition = "inside",
+minMargin = true
) }}
### labelLine(Object)
diff --git a/en/option/series/funnel.md b/en/option/series/funnel.md
index 8275c99c..2b8faa37 100644
--- a/en/option/series/funnel.md
+++ b/en/option/series/funnel.md
@@ -87,7 +87,8 @@ Horizontal align. Defaults t
(echarts-doc) branch master updated: add missing `minMargin` option for `label`, resolves apache/echarts#19861
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 1894b7f2 add missing `minMargin` option for `label`, resolves
apache/echarts#19861
1894b7f2 is described below
commit 1894b7f26f8dcec8dcbafcd76f6f6f28decf70ee
Author: plainheart
AuthorDate: Wed Apr 24 08:36:58 2024 +0800
add missing `minMargin` option for `label`, resolves apache/echarts#19861
---
en/option/partial/label.md | 8
zh/option/partial/label.md | 8
2 files changed, 16 insertions(+)
diff --git a/en/option/partial/label.md b/en/option/partial/label.md
index f943fb60..dcf28163 100644
--- a/en/option/partial/label.md
+++ b/en/option/partial/label.md
@@ -51,6 +51,14 @@ See: [label
rotation](${galleryEditorPath}bar-label-rotation).
Whether to move text slightly. For example: `[30, 40]` means move `30`
horizontally and move `40` vertically.
+#${prefix} minMargin(number)
+
+{{ use: partial-version(
+version = "5.0.0"
+) }}
+
+Minimal margin between labels. Used when label has
[layout](~series.labelLayout).
+
{{ if: ${formatter} }}
#${prefix} formatter(string|Function)
diff --git a/zh/option/partial/label.md b/zh/option/partial/label.md
index 9e4fe2fe..63d28915 100644
--- a/zh/option/partial/label.md
+++ b/zh/option/partial/label.md
@@ -51,6 +51,14 @@ ${name}图形上的文本标签，可用于说明图形的一些数据信息，
是否对文字进行偏移。默认不偏移。例如：`[30, 40]` 表示文字在横向上偏移 `30`，纵向上偏移 `40`。
+#${prefix} minMargin(number)
+
+{{ use: partial-version(
+version = "5.0.0"
+) }}
+
+用于控制标签之间的最小距离，当启用 [labelLayout](~series.labelLayout) 时可能会用到。
+
{{ if: ${formatter} }}
#${prefix} formatter(string|Function)
-
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 #109 from apache/dependabot/npm_and_yarn/tar-6.2.1
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git commit cb0e2a54dff26fb13abb8eecdc94c50311e82b9c Merge: 295cf01 4364010 Author: Zhongxiang Wang AuthorDate: Fri Apr 19 21:28:08 2024 +0800 Merge pull request #109 from apache/dependabot/npm_and_yarn/tar-6.2.1 build(deps): bump tar from 6.1.12 to 6.2.1 package-lock.json | 29 + 1 file changed, 21 insertions(+), 8 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 (295cf01 -> cb0e2a5)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git from 295cf01 change staticfile CDN domain add 4364010 build(deps): bump tar from 6.1.12 to 6.2.1 new cb0e2a5 Merge pull request #109 from apache/dependabot/npm_and_yarn/tar-6.2.1 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 | 29 + 1 file changed, 21 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-bot) branch master updated (9c4d23e -> 58f770e)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-bot.git from 9c4d23e chore: update deps add 6e95083 chore(deps): bump express from 4.18.2 to 4.19.2 new 58f770e Merge pull request #27 from apache/dependabot/npm_and_yarn/express-4.19.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: package-lock.json | 76 +++ 1 file changed, 38 insertions(+), 38 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-bot) 01/01: Merge pull request #27 from apache/dependabot/npm_and_yarn/express-4.19.2
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-bot.git commit 58f770e9ea0e8ef754f31d7cf0a73b68d2b68061 Merge: 9c4d23e 6e95083 Author: Zhongxiang Wang AuthorDate: Fri Apr 19 09:31:23 2024 +0800 Merge pull request #27 from apache/dependabot/npm_and_yarn/express-4.19.2 chore(deps): bump express from 4.18.2 to 4.19.2 package-lock.json | 76 +++ 1 file changed, 38 insertions(+), 38 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: fix(example): disable `legendHoverLink` for the graph example, resolves apache/echarts#19782
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 b031024d fix(example): disable `legendHoverLink` for the graph
example, resolves apache/echarts#19782
b031024d is described below
commit b031024da8246f8c261f9c7fd290c3f88eb780cc
Author: Zhongxiang Wang
AuthorDate: Sun Apr 7 09:52:23 2024 +0800
fix(example): disable `legendHoverLink` for the graph example, resolves
apache/echarts#19782
---
public/examples/ts/graph.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/public/examples/ts/graph.ts b/public/examples/ts/graph.ts
index 267aa462..41f5ea36 100644
--- a/public/examples/ts/graph.ts
+++ b/public/examples/ts/graph.ts
@@ -43,6 +43,7 @@ $.getJSON(ROOT_PATH + '/data/asset/data/les-miserables.json',
function (graph) {
{
name: 'Les Miserables',
type: 'graph',
+legendHoverLink: false,
layout: 'none',
data: graph.nodes,
links: graph.links,
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: change staticfile CDN domain
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 add3a5c2 change staticfile CDN domain
add3a5c2 is described below
commit add3a5c217184fb87730b0f5f05c745296a2cd54
Author: plainheart
AuthorDate: Sun Mar 17 00:29:12 2024 +0800
change staticfile CDN domain
---
config/common.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/common.js b/config/common.js
index 1f748345..44836016 100644
--- a/config/common.js
+++ b/config/common.js
@@ -23,7 +23,7 @@ module.exports = {
},
cdnThirdPartyCN: {
-jquery: 'https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js',
+jquery: 'https://cdn.staticfile.net/jquery/3.7.1/jquery.min.js',
bootstrapCSS:
'https://lib.baomitu.com/twitter-bootstrap/3.3.7/css/bootstrap.min.css',
bootstrapJS:
'https://lib.baomitu.com/twitter-bootstrap/3.3.7/js/bootstrap.min.js',
lodash: 'https://lib.baomitu.com/lodash.js/3.10.1/lodash.min.js',
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: change staticfile CDN domain
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 295cf01 change staticfile CDN domain
295cf01 is described below
commit 295cf01fab2ab4bcb36682d39660810a79f2dbe8
Author: plainheart
AuthorDate: Sun Mar 17 00:24:40 2024 +0800
change staticfile CDN domain
---
layouts/default.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/layouts/default.vue b/layouts/default.vue
index ee8f289..efe8283 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -63,7 +63,7 @@ export default {
script: [
{
src: isCN
-? 'https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js'
+? 'https://cdn.staticfile.net/jquery/3.7.1/jquery.min.js'
: 'https://fastly.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js'
},
{
-
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: change staticfile CDN domain
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 b38ec03c change staticfile CDN domain
b38ec03c is described below
commit b38ec03cd27afb660eaa7d333d087af24b1a1303
Author: plainheart
AuthorDate: Sun Mar 17 00:21:39 2024 +0800
change staticfile CDN domain
---
public/zh/editor.html | 2 +-
public/zh/index.html| 2 +-
public/zh/view.html | 2 +-
src/common/config.js| 6 +++---
src/editor/sandbox/index.js | 3 ++-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/public/zh/editor.html b/public/zh/editor.html
index 194c4571..c1f2e694 100644
--- a/public/zh/editor.html
+++ b/public/zh/editor.html
@@ -27,7 +27,7 @@
href="https://lib.baomitu.com/element-ui/2.15.14/theme-chalk/index.min.css;
/>
https://lib.baomitu.com/vue/2.6.14/vue.min.js"</a>;>
-https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js"</a>;>
+https://cdn.staticfile.net/jquery/3.7.1/jquery.min.js"</a>;>
https://lib.baomitu.com/twitter-bootstrap/3.4.1/js/bootstrap.min.js"</a>;>
https://lib.baomitu.com/element-ui/2.15.14/index.min.js"</a>;>
diff --git a/public/zh/index.html b/public/zh/index.html
index b69b6938..711a7f4b 100644
--- a/public/zh/index.html
+++ b/public/zh/index.html
@@ -27,7 +27,7 @@
href="https://lib.baomitu.com/element-ui/2.15.14/theme-chalk/index.min.css;
/>
https://lib.baomitu.com/vue/2.6.14/vue.min.js"</a>;>
-https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js"</a>;>
+https://cdn.staticfile.net/jquery/3.7.1/jquery.min.js"</a>;>
https://lib.baomitu.com/twitter-bootstrap/3.4.1/js/bootstrap.min.js"</a>;>
https://lib.baomitu.com/element-ui/2.15.14/index.min.js"</a>;>
diff --git a/public/zh/view.html b/public/zh/view.html
index 7c1f4233..66226516 100644
--- a/public/zh/view.html
+++ b/public/zh/view.html
@@ -27,7 +27,7 @@
href="https://lib.baomitu.com/element-ui/2.15.14/theme-chalk/index.min.css;
/>
https://lib.baomitu.com/vue/2.6.14/vue.min.js"</a>;>
-https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js"</a>;>
+https://cdn.staticfile.net/jquery/3.7.1/jquery.min.js"</a>;>
https://lib.baomitu.com/twitter-bootstrap/3.4.1/js/bootstrap.min.js"</a>;>
https://lib.baomitu.com/element-ui/2.15.14/index.min.js"</a>;>
diff --git a/src/common/config.js b/src/common/config.js
index 5abdc9b9..4cecae9c 100644
--- a/src/common/config.js
+++ b/src/common/config.js
@@ -158,13 +158,13 @@ const SCRIPT_URLS_CN = {
echartsStatJS:
`${CDN_ROOT_CN_NPM}echarts-stat/latest/files/dist/ecStat.min.js`,
echartsGLJS: `${CDN_ROOT_CN_NPM}echarts-gl/2/files/dist/echarts-gl.min.js`,
datGUIMinJS: `${CDN_ROOT_CN}dat-gui/0.6.5/dat.gui.min.js`,
- monacoDir: `https://cdn.staticfile.org/monaco-editor/0.27.0/min/vs`,
+ monacoDir: `https://cdn.staticfile.net/monaco-editor/0.27.0/min/vs`,
aceDir: `${CDN_ROOT_CN_NPM}ace-builds/1.4.12/files/src-min-noconflict`,
prettierDir: `${CDN_ROOT_CN}prettier/2.3.2`,
highlightjsDir: `${CDN_ROOT_CN_NPM}@highlightjs/cdn-assets/11.8.0/files`,
seedrandomJS: `${CDN_ROOT_CN}seedrandom/3.0.5/seedrandom.min.js`,
- jQueryJS: `https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js`,
- acornJS: `https://cdn.staticfile.org/acorn/8.7.1/acorn.min.js`,
+ jQueryJS: `https://cdn.staticfile.net/jquery/3.7.1/jquery.min.js`,
+ acornJS: `https://cdn.staticfile.net/acorn/8.7.1/acorn.min.js`,
bmapLibJS: SCRIPT_URLS.bmapLibJS,
echartsBMapJS: SCRIPT_URLS.echartsBMapJS
diff --git a/src/editor/sandbox/index.js b/src/editor/sandbox/index.js
index 890036e5..d3613e90 100644
--- a/src/editor/sandbox/index.js
+++ b/src/editor/sandbox/index.js
@@ -87,7 +87,8 @@ export function createSandbox(
'unpkg.zhimg.com',
'npm.elemecdn.com',
'registry.npmmirror.com',
-'cdn.staticfile.org'
+'cdn.staticfile.org',
+'cdn.staticfile.net'
];
store.isPR && domains.push(`echarts-pr-${store.prNumber}.surge.sh`);
return domains;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch master updated: tweak tool
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 d7d43bf6 tweak tool
d7d43bf6 is described below
commit d7d43bf6284f2416555771c1beea1ac8522f3ead
Author: plainheart
AuthorDate: Sat Mar 16 23:59:01 2024 +0800
tweak tool
---
tool/extractOptionKeys.js | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tool/extractOptionKeys.js b/tool/extractOptionKeys.js
index 3be88821..1a4d6da5 100644
--- a/tool/extractOptionKeys.js
+++ b/tool/extractOptionKeys.js
@@ -1,7 +1,6 @@
-const fs = require('fs');
+const fs = require('node:fs');
+const path = require('node:path');
const { extractOptionKeys } = require('./schemaHelper');
-
-
-const schema = JSON.parse(fs.readFileSync(__dirname +
'/../public/zh/documents/option.json', 'utf-8'));
+const schema = JSON.parse(fs.readFileSync(path.resolve(__dirname,
'../public/zh/documents/option.json'), 'utf-8'));
console.log(JSON.stringify(extractOptionKeys(schema)));
\ 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-examples) branch gh-pages updated: update option keywords
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 e470df23 update option keywords
e470df23 is described below
commit e470df23774c6efe515a182d572d58ea3f6e212e
Author: plainheart
AuthorDate: Sat Mar 16 23:54:50 2024 +0800
update option keywords
---
src/data/option-keywords.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/data/option-keywords.js b/src/data/option-keywords.js
index d12d1be5..8b595350 100644
--- a/src/data/option-keywords.js
+++ b/src/data/option-keywords.js
@@ -2,4 +2,4 @@
// THIS FILE IS GENERATED, DON'T MODIFY */
/* eslint-disable */
-export const keywords =
[{"name":"color","count":1967},{"name":"shadowColor","count":1893},{"name":"shadowBlur","count":1893},{"name":"shadowOffsetX","count":1893},{"name":"shadowOffsetY","count":1893},{"name":"borderColor","count":1559},{"name":"borderWidth","count":1558},{"name":"width","count":1523},{"name":"borderType","count":1487},{"name":"borderDashOffset","count":1475},{"name":"height","count":1209},{"name":"backgroundColor","count":1199},{"name":"fontSize","count":1186},{"name":
[...]
\ No newline at end of file
+export const keywords =
[{"name":"color","count":1967},{"name":"shadowColor","count":1893},{"name":"shadowBlur","count":1893},{"name":"shadowOffsetX","count":1893},{"name":"shadowOffsetY","count":1893},{"name":"borderColor","count":1559},{"name":"borderWidth","count":1558},{"name":"width","count":1523},{"name":"borderType","count":1487},{"name":"borderDashOffset","count":1475},{"name":"height","count":1209},{"name":"backgroundColor","count":1199},{"name":"fontSize","count":1186},{"name":
[...]
\ 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: fix doc
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 7c9fa555 fix doc
7c9fa555 is described below
commit 7c9fa55537f20b0681de78c6dca6b3a2746cc14c
Author: plainheart
AuthorDate: Sat Mar 16 23:33:12 2024 +0800
fix doc
---
en/option/partial/zr-graphic.md | 13 +
zh/option/partial/zr-graphic.md | 17 +++--
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/en/option/partial/zr-graphic.md b/en/option/partial/zr-graphic.md
index 2bd83569..9fd82555 100644
--- a/en/option/partial/zr-graphic.md
+++ b/en/option/partial/zr-graphic.md
@@ -1594,19 +1594,24 @@ Color of stroke.
Width of stroke.
-###${prefix} lineDash(null | false | number[] | 'solid' | 'dashed' | 'dotted')
= null
+###${prefix} lineDash(string|number|Array) = 'solid'
-Sets the line dash pattern used when stroking lines. See
[MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash)
for more information.
+Sets the line dash pattern used when stroking lines. Possible values are:
+
++ `'solid'`
++ `'dashed'`
++ `'dotted'`
++ `number` / `number` array. See
[MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash)
for more information.
###${prefix} lineDashOffset(number) = 0
Sets the line dash offset used when stroking lines. See
[MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineDashOffset)
for more information.
-###${prefix} lineCap('butt' | 'round' | 'square') = 'butt'
+###${prefix} lineCap(string) = 'butt'
Line cap style. See
[MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineCap)
for more information.
-###${prefix} lineJoin('bevel' | 'round' | 'miter') = 'miter'
+###${prefix} lineJoin(string) = 'miter'
Line join style. See
[MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin)
for more information.
diff --git a/zh/option/partial/zr-graphic.md b/zh/option/partial/zr-graphic.md
index 7b4546b8..2f8bb796 100644
--- a/zh/option/partial/zr-graphic.md
+++ b/zh/option/partial/zr-graphic.md
@@ -1574,19 +1574,24 @@ Position of `textContent`.
线条宽度。
-###${prefix} lineDash(null | false | number[] | 'solid' | 'dashed' | 'dotted')
= null
+###${prefix} lineDash(string|number|Array) = 'solid'
-在填充线时使用虚线模式。详见
[MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/setLineDash)。
+线条样式。可选：
+
++ `'solid'`
++ `'dashed'`
++ `'dotted'`
++ `number` 或 `number` 数组。详见
[MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/setLineDash)。
###${prefix} lineDashOffset(number) = 0
-在填充线时使用虚线的偏移量。详细见
[MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineDashOffset)。
+用于设置虚线的偏移量。详见
[MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineDashOffset)。
-###${prefix} lineCap('butt' | 'round' | 'square') = 'butt'
+###${prefix} lineCap(string) = 'butt'
-如何绘制每一条线段末端的属性。详见
[MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineCap)。
+用于指定线段末端的绘制方式。详见
[MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineCap)。
-###${prefix} lineJoin('bevel' | 'round' | 'miter') = 'miter'
+###${prefix} lineJoin(string) = 'miter'
设置线条转折点的样式。详见
[MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineJoin)。
-
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: update option keywords
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 b5d6de0e update option keywords
b5d6de0e is described below
commit b5d6de0e037e8a5d4e83f4a8a0bc43c2c6feda70
Author: plainheart
AuthorDate: Sat Mar 16 22:57:49 2024 +0800
update option keywords
---
src/data/option-keywords.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/data/option-keywords.js b/src/data/option-keywords.js
index 21734324..d12d1be5 100644
--- a/src/data/option-keywords.js
+++ b/src/data/option-keywords.js
@@ -2,4 +2,4 @@
// THIS FILE IS GENERATED, DON'T MODIFY */
/* eslint-disable */
-export const keywords =
[{"name":"color","count":1835},{"name":"shadowColor","count":1770},{"name":"shadowBlur","count":1770},{"name":"shadowOffsetX","count":1770},{"name":"shadowOffsetY","count":1770},{"name":"borderColor","count":1451},{"name":"borderWidth","count":1450},{"name":"width","count":1411},{"name":"borderType","count":1385},{"name":"borderDashOffset","count":1373},{"name":"height","count":1120},{"name":"backgroundColor","count":},{"name":"fontSize","count":1098},{"name":
[...]
\ No newline at end of file
+export const keywords =
[{"name":"color","count":1967},{"name":"shadowColor","count":1893},{"name":"shadowBlur","count":1893},{"name":"shadowOffsetX","count":1893},{"name":"shadowOffsetY","count":1893},{"name":"borderColor","count":1559},{"name":"borderWidth","count":1558},{"name":"width","count":1523},{"name":"borderType","count":1487},{"name":"borderDashOffset","count":1475},{"name":"height","count":1209},{"name":"backgroundColor","count":1199},{"name":"fontSize","count":1186},{"name":
[...]
\ 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-www) branch master updated: fix link
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 4f62f8b2 fix link
4f62f8b2 is described below
commit 4f62f8b2f513f9a8f286b75161d5407cad7baa94
Author: plainheart
AuthorDate: Sat Mar 16 18:03:39 2024 +0800
fix link
---
config/common.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/common.js b/config/common.js
index a8ebd20b..1f748345 100644
--- a/config/common.js
+++ b/config/common.js
@@ -417,7 +417,7 @@ module.exports = {
image: 'gmap.jpg',
name: '谷歌地图',
nameEn: 'Google Maps',
-website: 'https://github.com/plainheart/echarts-extension-amap',
+website: 'https://github.com/plainheart/echarts-extension-gmap',
authors: [{
name: 'plainheart',
website: 'https://github.com/plainheart'
-
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: update gl example chart list
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 52edf086 update gl example chart list
52edf086 is described below
commit 52edf0864ee8d1b59cfeeb29b5623031c1318556
Author: plainheart
AuthorDate: Sat Mar 16 17:57:59 2024 +0800
update gl example chart list
---
src/data/chart-list-data-gl.js | 4 ++--
tool/build-example.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/data/chart-list-data-gl.js b/src/data/chart-list-data-gl.js
index 0a8cfb52..64cd00c6 100644
--- a/src/data/chart-list-data-gl.js
+++ b/src/data/chart-list-data-gl.js
@@ -42,7 +42,7 @@ export default [
"id": "bar3d-myth",
"ts": false,
"tags": [],
-"title": "星云",
+"title": "Bar3D - Myth",
"titleCN": "星云",
"difficulty": 10
},
@@ -504,7 +504,7 @@ export default [
"ts": false,
"tags": [],
"theme": "dark",
-"title": "三维散点图正交投影",
+"title": "Scatter3D - Orthographic",
"titleCN": "三维散点图正交投影",
"difficulty": 10
},
diff --git a/tool/build-example.js b/tool/build-example.js
index 1190095a..4f8e978a 100644
--- a/tool/build-example.js
+++ b/tool/build-example.js
@@ -1,7 +1,6 @@
const fs = require('fs');
const globby = require('globby');
const path = require('path');
-const puppeteer = require('puppeteer');
const matter = require('gray-matter');
const argparse = require('argparse');
const minimatch = require('minimatch');
@@ -387,6 +386,7 @@ export default ${JSON.stringify(exampleList, null, 2)}`;
});
server && server.listen(PORT);
+const puppeteer = require('puppeteer');
const browser = await puppeteer.launch({
headless: false,
args: [
-
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: tweak example title
This is an automated email from the ASF dual-hosted git repository. wangzx 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 987264bb tweak example title 987264bb is described below commit 987264bb6fc497609352f014e6ca2ec86b272092 Author: plainheart AuthorDate: Sat Mar 16 02:20:15 2024 +0800 tweak example title --- public/examples/ts/gl/bar3d-myth.js | 2 +- public/examples/ts/gl/scatter3d-orthographic.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/examples/ts/gl/bar3d-myth.js b/public/examples/ts/gl/bar3d-myth.js index 137bf794..1e48e2b6 100644 --- a/public/examples/ts/gl/bar3d-myth.js +++ b/public/examples/ts/gl/bar3d-myth.js @@ -1,5 +1,5 @@ /* -title: 星云 +title: Bar3D - Myth category: bar3D titleCN: 星云 */ diff --git a/public/examples/ts/gl/scatter3d-orthographic.js b/public/examples/ts/gl/scatter3d-orthographic.js index f72d2cdd..00c83537 100644 --- a/public/examples/ts/gl/scatter3d-orthographic.js +++ b/public/examples/ts/gl/scatter3d-orthographic.js @@ -1,5 +1,5 @@ /* -title: 三维散点图正交投影 +title: Scatter3D - Orthographic category: scatter3D theme: dark titleCN: 三维散点图正交投影 - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: fix
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 c3cddd68 fix
c3cddd68 is described below
commit c3cddd68bfb096c672a2d6a05d3434d0acc3889d
Author: plainheart
AuthorDate: Sat Mar 16 02:09:39 2024 +0800
fix
---
_jade/en/nav-mixin.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_jade/en/nav-mixin.jade b/_jade/en/nav-mixin.jade
index 95a1a9e3..6900c82c 100644
--- a/_jade/en/nav-mixin.jade
+++ b/_jade/en/nav-mixin.jade
@@ -7,7 +7,7 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
span.icon-bar
span.icon-bar
a(class='navbar-brand' href="#{hostParam}/en/index.html")
-img(class="navbar-logo",
src="#{cdnPayRootParam}/en/images/logo.png", alt="echarts logo")
+img(class="navbar-logo",
src="#{cdnPayRootParam}/en/images/logo.png?_v_=#{cdnPayVersionParam}",
alt="echarts logo")
div(class="collapse navbar-collapse", id="navbar-collapse")
ul(class='nav navbar-nav navbar-left')
li#nav-index
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: update contributors for some extensions
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 84fd3e46 update contributors for some extensions
84fd3e46 is described below
commit 84fd3e4663a68733b2a7d72a80a29ba0cac0c725
Author: plainheart
AuthorDate: Fri Mar 15 18:39:51 2024 +0800
update contributors for some extensions
---
config/common.js | 9 +
1 file changed, 9 insertions(+)
diff --git a/config/common.js b/config/common.js
index 1650ff1b..a8ebd20b 100644
--- a/config/common.js
+++ b/config/common.js
@@ -368,6 +368,9 @@ module.exports = {
authors: [{
name: 'pissang',
website: 'https://github.com/pissang'
+}, {
+name: 'Ovilia',
+website: 'https://github.com/Ovilia'
}],
desc: '字符云可以将文字根据不同的权重布局为大小、颜色各异的图，支持使用图片作为遮罩。',
descEN: 'Cloud charts can layout text into different sizes and
colors. You can also use images as masks.'
@@ -379,6 +382,9 @@ module.exports = {
authors: [{
name: 'Ovilia',
website: 'https://github.com/Ovilia'
+}, {
+name: 'pissang',
+website: 'https://github.com/pissang'
}],
desc: '水球图是一种适合于展现单个百分比数据的图表，支持多条水波和动画。',
descEN: 'The liquid-fill chart is a chart suitable for presenting
a single percentage of data, supporting multiple water waves and animations.'
@@ -389,6 +395,9 @@ module.exports = {
authors: [{
name: 'pissang',
website: 'https://github.com/pissang'
+}, {
+name: 'plainheart',
+website: 'https://github.com/plainheart'
}],
desc: '百度地图扩展，可以在百度地图上展现点图、线图、热力图及饼图等。',
descEN: 'With Baidu map extension, you can display scatter charts,
lines charts, heatmaps, pie charts and so on.',
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: tweak extension page
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 9c138af4 tweak extension page
9c138af4 is described below
commit 9c138af4324e951e7d5ff12f89c4d761f66c3449
Author: plainheart
AuthorDate: Fri Mar 15 18:15:06 2024 +0800
tweak extension page
---
_jade/en/download-extension.jade | 41 +---
config/common.js | 67 ++-
images/extensions/gmap.jpg | Bin 0 -> 44981 bytes
3 files changed, 68 insertions(+), 40 deletions(-)
diff --git a/_jade/en/download-extension.jade b/_jade/en/download-extension.jade
index e92d18ab..35a25141 100644
--- a/_jade/en/download-extension.jade
+++ b/_jade/en/download-extension.jade
@@ -1,24 +1,29 @@
extends ../layouts/basic
mixin extension(ext)
-.col-md-3.col-sm-6.extension
-if ext.website
-- var website = ext.website
-else
-- var website = '#'
-.extension-content
-a.extension-head(href="#{website}", target="_blank")
-if ext.image
-
img.extension-img(src="#{cdnPayRoot}/#{ecWWWLang}/images/extensions/#{ext.image}?_v_=#{cdnPayVersion}")
-else
-
img.extension-img(src="#{cdnPayRoot}/#{ecWWWLang}/images/extensions/default-extension.png?_v_=#{cdnPayVersion}")
-.extension-info
-a.extension-name(href="#{website}", target="_blank")
#{ext.name}
-.extension-author
-span Contributors:
-each author in ext.authors
-a.extension-author-name(href="#{author.website}",
target="_blank") #{author.name}
-.extension-desc #{ext.descEN}
+if !ext.onlyZH
+.col-md-3.col-sm-6.extension
+if ext.website
+- var website = ext.website
+else
+- var website = '#'
+if ext.nameEn
+- var extName = ext.nameEn
+else
+- var extName = ext.name
+.extension-content
+a.extension-head(href="#{website}", target="_blank")
+if ext.image
+
img.extension-img(src="#{cdnPayRoot}/#{ecWWWLang}/images/extensions/#{ext.image}?_v_=#{cdnPayVersion}")
+else
+
img.extension-img(src="#{cdnPayRoot}/#{ecWWWLang}/images/extensions/default-extension.png?_v_=#{cdnPayVersion}")
+.extension-info
+a.extension-name(href="#{website}", target="_blank")
#{extName}
+.extension-author
+span Contributors:
+each author in ext.authors
+a.extension-author-name(href="#{author.website}",
target="_blank") #{author.name}
+.extension-desc #{ext.descEN}
block variablesLang
include ./_variablesLang.jade
diff --git a/config/common.js b/config/common.js
index 1583f352..1650ff1b 100644
--- a/config/common.js
+++ b/config/common.js
@@ -355,7 +355,7 @@ module.exports = {
name: 'ECharts GL',
website: 'https://github.com/ecomfe/echarts-gl',
authors: [{
-name: '沈毅',
+name: 'pissang',
website: 'https://github.com/pissang'
}],
desc: '3D 图表、地理可视化、WebGL 加速渲染',
@@ -363,9 +363,10 @@ module.exports = {
}, {
image: 'word-cloud.jpg',
name: '字符云',
+nameEn: 'Wordcloud',
website: 'https://github.com/ecomfe/echarts-wordcloud',
authors: [{
-name: '沈毅',
+name: 'pissang',
website: 'https://github.com/pissang'
}],
desc: '字符云可以将文字根据不同的权重布局为大小、颜色各异的图，支持使用图片作为遮罩。',
@@ -373,9 +374,10 @@ module.exports = {
}, {
image: 'liquidfill.jpg',
name: '水球图',
+nameEn: 'Liquidfill',
website: 'https://github.com/ecomfe/echarts-liquidfill',
authors: [{
-name: '羡辙',
+name: 'Ovilia',
website: 'https://github.com/Ovilia'
}],
desc: '水球图是一种适合于展现单个百分比数据的图表，支持多条水波和动画。',
@@ -385,24 +387,38 @@ module.exports = {
name: '百度地图',
website:
'https://github.com/apache/echarts/tree/master/extension-src/bmap',
authors: [{
-name: '沈毅',
+name: 'pissang',
website: 'https://github.com/pissang'
}],
(echarts-bot) branch master updated: chore: update deps
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 9c4d23e chore: update deps
9c4d23e is described below
commit 9c4d23efd6fd5633e9b81cd239df9325dd887830
Author: plainheart
AuthorDate: Wed Mar 13 18:51:22 2024 +0800
chore: update deps
---
package-lock.json | 14 +++---
package.json | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 110c730..72481a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"license": "Apache-2.0",
"dependencies": {
"@plainheart/google-translate-api": "^1.2.0",
-"bing-translate-api": "^4.0.0",
+"bing-translate-api": "^4.0.1",
"franc-min": "5.0.0",
"probot": "^12.3.3"
},
@@ -2584,9 +2584,9 @@
}
},
"node_modules/bing-translate-api": {
- "version": "4.0.0",
- "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.0.tgz;,
- "integrity":
"sha512-nikKZQwhO+UCHPWIbMMvK1Idpsv/tXAcE4rLVlM1VcDc7e5Z58N7IhtQNkCTZ2M4Gj45j1u2nhK1R+9L6tppAw==",
+ "version": "4.0.1",
+ "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.1.tgz;,
+ "integrity":
"sha512-6bpKYz/HgsivakyhsIYLcLOf8nsJlpZ3btPtPAtM6I6IKQZ29AJAT3/0XpgOt1RlXT9axhQgU92s0ZeSJfu3RQ==",
"dependencies": {
"got": "^11.8.6"
}
@@ -11348,9 +11348,9 @@
"dev": true
},
"bing-translate-api": {
- "version": "4.0.0",
- "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.0.tgz;,
- "integrity":
"sha512-nikKZQwhO+UCHPWIbMMvK1Idpsv/tXAcE4rLVlM1VcDc7e5Z58N7IhtQNkCTZ2M4Gj45j1u2nhK1R+9L6tppAw==",
+ "version": "4.0.1",
+ "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.1.tgz;,
+ "integrity":
"sha512-6bpKYz/HgsivakyhsIYLcLOf8nsJlpZ3btPtPAtM6I6IKQZ29AJAT3/0XpgOt1RlXT9axhQgU92s0ZeSJfu3RQ==",
"requires": {
"got": "^11.8.6"
}
diff --git a/package.json b/package.json
index 8cc89e7..723ff5b 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
},
"dependencies": {
"@plainheart/google-translate-api": "^1.2.0",
-"bing-translate-api": "^4.0.0",
+"bing-translate-api": "^4.0.1",
"franc-min": "5.0.0",
"probot": "^12.3.3"
},
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch update-workflow-deps updated (492a3f2e9 -> f9f324956)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch update-workflow-deps in repository https://gitbox.apache.org/repos/asf/echarts.git from 492a3f2e9 chore: update workflow deps add f9f324956 chore: update workflow deps No new revisions were added by this update. Summary of changes: .github/workflows/pr-preview.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) branch update-workflow-deps updated (cdf0c72fe -> 492a3f2e9)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch update-workflow-deps in repository https://gitbox.apache.org/repos/asf/echarts.git from cdf0c72fe chore: update workflow deps add 492a3f2e9 chore: update workflow deps No new revisions were added by this update. Summary of changes: .github/workflows/ci.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) 01/01: chore: update workflow deps
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch update-workflow-deps
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit cdf0c72fe142a53a06b34a7f69f25b5d501495c3
Author: plainheart
AuthorDate: Sat Mar 9 17:19:18 2024 +0800
chore: update workflow deps
---
.github/workflows/ci.yml | 4 ++--
.github/workflows/source-release.yml | 10 +-
.github/workflows/stale.yml | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a15bd634..c94954fd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
- name: Cache node modules
id: cache-dep
-uses: actions/cache@v3
+uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
@@ -76,7 +76,7 @@ jobs:
- name: Cache node modules
id: cache-dep
-uses: actions/cache@v3
+uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
diff --git a/.github/workflows/source-release.yml
b/.github/workflows/source-release.yml
index 571913117..17ae23830 100644
--- a/.github/workflows/source-release.yml
+++ b/.github/workflows/source-release.yml
@@ -26,7 +26,7 @@ jobs:
echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Cache node modules
-uses: actions/cache@v3
+uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
@@ -44,7 +44,7 @@ jobs:
--out tmp/materials
- name: Archive materials
-uses: actions/upload-artifact@v3
+uses: actions/upload-artifact@v4
with:
name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
path: |
@@ -72,7 +72,7 @@ jobs:
# Get RELEASE_NOTE.txt and pack it into zip.
- name: Download materials
-uses: actions/download-artifact@v3
+uses: actions/download-artifact@v4
with:
name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
@@ -80,7 +80,7 @@ jobs:
# Archive before run others to avoid packing unknown files.
- name: Archive source release
-uses: actions/upload-artifact@v3
+uses: actions/upload-artifact@v4
with:
name: apache-echarts-${{env.RELEASE_VERSION}}-src
path: |
@@ -123,7 +123,7 @@ jobs:
echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Download source release
-uses: actions/download-artifact@v3
+uses: actions/download-artifact@v4
with:
name: apache-echarts-${{env.RELEASE_VERSION}}-src
path: tmp/echarts
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 5cf94e3b0..ff4018930 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -14,7 +14,7 @@ jobs:
if: ${{ github.repository_owner == 'apache' }}
steps:
- name: Close Stale Issues
-uses: actions/stale@v6
+uses: actions/stale@v9
with:
days-before-stale: 730
days-before-close: 7
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch update-workflow-deps created (now cdf0c72fe)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch update-workflow-deps in repository https://gitbox.apache.org/repos/asf/echarts.git at cdf0c72fe chore: update workflow deps This branch includes the following new commits: new cdf0c72fe chore: update workflow deps 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 test-dts created (now 7d2531398)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch test-dts in repository https://gitbox.apache.org/repos/asf/echarts.git at 7d2531398 chore: update deps & install and test typescript versions >=3.5 This branch includes the following new commits: new 7d2531398 chore: update deps & install and test typescript versions >=3.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. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: chore: update deps & install and test typescript versions >=3.5
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch test-dts
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 7d253139892b5ce6d81425c06d5accaedef9b0a7
Author: plainheart
AuthorDate: Sat Mar 9 16:57:38 2024 +0800
chore: update deps & install and test typescript versions >=3.5
---
build/testDts.js | 27 +-
package-lock.json | 1915 ++---
package.json |4 +-
3 files changed, 1109 insertions(+), 837 deletions(-)
diff --git a/build/testDts.js b/build/testDts.js
index 813fd0837..75dd4099b 100644
--- a/build/testDts.js
+++ b/build/testDts.js
@@ -19,11 +19,7 @@
*/
const { TypeScriptVersion } = require('@definitelytyped/typescript-versions');
-const {
-cleanTypeScriptInstalls,
-installAllTypeScriptVersions,
-typeScriptPath
-} = require('@definitelytyped/utils');
+const { typeScriptPath, install } = require('@definitelytyped/utils');
const { runTsCompile } = require('./pre-publish');
const globby = require('globby');
const semver = require('semver');
@@ -31,8 +27,10 @@ const semver = require('semver');
const MIN_VERSION = '3.5.0';
async function installTs() {
-// await cleanTypeScriptInstalls();
-await installAllTypeScriptVersions();
+const tsVersions = getTypeScriptVersions();
+for (const version of tsVersions) {
+await install(version);
+}
}
async function runTests() {
@@ -52,11 +50,8 @@ async function runTests() {
};
const testsList = await globby(__dirname + '/../test/types/*.ts');
-for (let version of TypeScriptVersion.shipped) {
-if (semver.lt(version + '.0', MIN_VERSION)) {
-continue;
-}
-
+const tsVersions = getTypeScriptVersions();
+for (const version of tsVersions) {
console.log(`Testing ts version ${version}`);
const ts = require(typeScriptPath(version));
await runTsCompile(ts, compilerOptions, testsList);
@@ -65,6 +60,12 @@ async function runTests() {
}
}
+function getTypeScriptVersions() {
+return TypeScriptVersion.unsupported
+.concat(TypeScriptVersion.shipped)
+.filter(version => semver.gte(version + '.0', MIN_VERSION));
+}
+
async function main() {
await installTs();
await runTests();
@@ -72,4 +73,4 @@ async function main() {
module.exports = main;
-main();
\ No newline at end of file
+main();
diff --git a/package-lock.json b/package-lock.json
index d2f4c2e9c..32bc9715d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,8 +16,8 @@
"@babel/code-frame": "7.10.4",
"@babel/core": "7.3.4",
"@babel/types": "7.10.5",
-"@definitelytyped/typescript-versions": "0.0.64",
-"@definitelytyped/utils": "0.0.64",
+"@definitelytyped/typescript-versions": "^0.1.1",
+"@definitelytyped/utils": "0.0.188",
"@lang/rollup-plugin-dts": "2.0.2",
"@microsoft/api-extractor": "7.31.2",
"@rollup/plugin-commonjs": "^17.0.0",
@@ -686,56 +686,199 @@
}
},
"node_modules/@definitelytyped/header-parser": {
- "version": "0.0.59",
- "resolved":
"https://registry.npmjs.org/@definitelytyped/header-parser/-/header-parser-0.0.59.tgz;,
- "integrity":
"sha512-Y0Hoi+I0tD1xRNYUlt9dpZ2sykPoNAsS/nVtyaGJDYhVg0Q3U4U8afAOFlK3Fro2MfdM+1Kxc7DeaabaUeFmYw==",
+ "version": "0.2.8",
+ "resolved":
"https://registry.npmjs.org/@definitelytyped/header-parser/-/header-parser-0.2.8.tgz;,
+ "integrity":
"sha512-EbwPQxkjJ2dG5F+kZy/D5eMvFeM3FBJ+A8oXy6eOr+8aoRBzS94PiSyfHStZHJzruHDG/Lo2v9+0nSGsPJiOdw==",
"dev": true,
"dependencies": {
-"@definitelytyped/typescript-versions": "^0.0.59",
-"@types/parsimmon": "^1.10.1",
-"parsimmon": "^1.13.0"
+"@definitelytyped/typescript-versions": "0.1.1",
+"@definitelytyped/utils": "0.1.5",
+"semver": "^7.5.4"
+ },
+ "engines": {
+"node": ">=18.18.0"
}
},
-
"node_modules/@definitelytyped/header-parser/node_modules/@definitelytyped/typescript-versions":
{
- "version": "0.0.59",
- "resolved":
"https://registry.npmjs.org/@definitelytyped/typescript-versions/-/typescript-versions-0.0.59.tgz;,
- "integrity":
"sha512-R3DNeeNDK4l55OD28cNsvtmzz6K71O7XMf6Xd/BR45mfqn2wZUovghGMV3iCs9B3z2OsdhXqRnjX2Hhnj8NKJA=="
(echarts) 01/01: chore: ignore some unused dirs and files from npm
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch npmignore in repository https://gitbox.apache.org/repos/asf/echarts.git commit 1e027061b43d31ac04f2ea5f8c0edd7f7d639279 Author: plainheart AuthorDate: Sat Mar 9 15:26:13 2024 +0800 chore: ignore some unused dirs and files from npm --- .npmignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.npmignore b/.npmignore index 552a7d0f5..d9f68099b 100644 --- a/.npmignore +++ b/.npmignore @@ -8,6 +8,9 @@ /benchmark /src /ssr/client/src +/extension-src +/build +/tsconfig.json .DS_Store Thumbs.db Desktop.ini - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch npmignore created (now 1e027061b)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch npmignore in repository https://gitbox.apache.org/repos/asf/echarts.git at 1e027061b chore: ignore some unused dirs and files from npm This branch includes the following new commits: new 1e027061b chore: ignore some unused dirs and files from npm 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 value type of `toolbox.feature.*.title`
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 7f02e607 fix value type of `toolbox.feature.*.title`
7f02e607 is described below
commit 7f02e607fd4f10767cbd36542d2e406cf2a11f82
Author: plainheart
AuthorDate: Thu Mar 7 18:21:04 2024 +0800
fix value type of `toolbox.feature.*.title`
---
en/option/component/toolbox.md | 2 +-
zh/option/component/toolbox.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/en/option/component/toolbox.md b/en/option/component/toolbox.md
index a8cc76a9..d46cefe4 100644
--- a/en/option/component/toolbox.md
+++ b/en/option/component/toolbox.md
@@ -64,7 +64,7 @@ Whether to show the tool.
title(string) = '${title}'
- icon(*)
+ icon(string)
{{ use: partial-icon-image-path() }}
diff --git a/zh/option/component/toolbox.md b/zh/option/component/toolbox.md
index 8b06c1c1..c618fc7f 100644
--- a/zh/option/component/toolbox.md
+++ b/zh/option/component/toolbox.md
@@ -62,7 +62,7 @@ ${name} icon 样式设置。由于 icon 的文本信息只在 icon hover 时候
是否显示该工具。
- title(boolean) = '${title}'
+ title(string) = '${title}'
icon(string)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-bot) branch master updated: sync from glitch
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 6c44e9a sync from glitch
6c44e9a is described below
commit 6c44e9a6244cf4744f0376e1e6599ace393d697f
Author: plainheart
AuthorDate: Thu Mar 7 09:37:24 2024 +0800
sync from glitch
---
src/translator.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/translator.js b/src/translator.js
index 62eafc8..5271827 100644
--- a/src/translator.js
+++ b/src/translator.js
@@ -10,6 +10,8 @@ async function translateByGoogle(rawContent) {
{
to: 'en',
// tld: 'cn',
+// not use website & dictExt endpoint
+endpoints: ['api'],
randomEndpoint: true
}
);
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-bot) branch master updated: feat: enable new bing translator MET mode
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bot.git
The following commit(s) were added to refs/heads/master by this push:
new d8d109b feat: enable new bing translator MET mode
d8d109b is described below
commit d8d109b2512ce215c6bf8da5a2528cabae4833f5
Author: plainheart
AuthorDate: Thu Mar 7 09:29:27 2024 +0800
feat: enable new bing translator MET mode
---
src/translator.js | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/translator.js b/src/translator.js
index 67384db..62eafc8 100644
--- a/src/translator.js
+++ b/src/translator.js
@@ -1,5 +1,5 @@
const googleTranslate = require('@plainheart/google-translate-api');
-const { translate: bingTranslate } = require('bing-translate-api');
+const { translate: bingTranslate, MET: { translate: bingTranslateMET } } =
require('bing-translate-api');
const franc = require('franc-min');
const logger = require('./logger');
@@ -41,6 +41,21 @@ async function translateByBing(rawContent) {
}
}
+async function translateByBingMET(rawContent) {
+try {
+const [res] = await bingTranslateMET(rawContent);
+return {
+translated: res.translations[0].text,
+lang: res.detectedLanguage.language,
+translator: 'bingMET'
+};
+}
+catch (e) {
+logger.error('failed to translate by bing MET');
+logger.error(e);
+}
+}
+
/**
* To translate the raw sentence to English
* @param {string} rawContent sentence to be translated
@@ -50,7 +65,7 @@ async function translate(rawContent) {
if (!rawContent || !(rawContent = rawContent.trim())) {
return;
}
-const translators = [translateByGoogle, translateByBing];
+const translators = [translateByGoogle, translateByBing,
translateByBingMET];
const randomIdx = ~~(Math.random() * translators.length);
let res = await translators[randomIdx](rawContent);
if (!res) {
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: fix
This is an automated email from the ASF dual-hosted git repository. wangzx 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 de073fe9 fix de073fe9 is described below commit de073fe9c4e9cebdd1971e74fb9a288a8d214303 Author: plainheart AuthorDate: Wed Feb 28 17:04:45 2024 +0800 fix --- _jade/components/builder.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_jade/components/builder.jade b/_jade/components/builder.jade index 870d0c41..d9b0b42c 100644 --- a/_jade/components/builder.jade +++ b/_jade/components/builder.jade @@ -128,7 +128,7 @@ block extra_js if isCN - var pkgVersionListAPI = 'https://registry.npmmirror.com/-/v1/search?text=echarts=1'; - var npmVersionFetcher = 'json.objects[0].package.versions.sort((v1, v2) => compareVersions(v2, v1, \'>\'))'; -- var npmTagFetcher = 'json.objects[0].package.dist-tags'; +- var npmTagFetcher = 'json.objects[0].package[\'dist-tags\']'; - var extraBuilderParam = '=1'; else - var pkgVersionListAPI = 'https://data.jsdelivr.com/v1/package/npm/echarts'; - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: fix
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 11b2a8b2 fix
11b2a8b2 is described below
commit 11b2a8b226d747b55144cd5c00c635f2d08a259c
Author: plainheart
AuthorDate: Wed Feb 28 17:00:34 2024 +0800
fix
---
_jade/components/builder.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_jade/components/builder.jade b/_jade/components/builder.jade
index 3e929aeb..870d0c41 100644
--- a/_jade/components/builder.jade
+++ b/_jade/components/builder.jade
@@ -142,7 +142,7 @@ block extra_js
script.
var $versionsDom = document.querySelector('#versions');
-fetch('#{pkgVersionListAPI}').then(res => res.json()).then(json => {
+fetch('!{pkgVersionListAPI}').then(res => res.json()).then(json => {
var versions = !{npmVersionFetcher};
versions.filter(version => compareVersions(version, '3.8.0', '>')
>= 0).forEach(version => {
const $optionDom = document.createElement('option');
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: tweak builder page
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 be85c343 tweak builder page
be85c343 is described below
commit be85c343d37b9c1715c4ae9c2908c50a0b6e3cf7
Author: plainheart
AuthorDate: Wed Feb 28 16:50:19 2024 +0800
tweak builder page
---
_jade/components/builder.jade | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/_jade/components/builder.jade b/_jade/components/builder.jade
index efee5e7e..3e929aeb 100644
--- a/_jade/components/builder.jade
+++ b/_jade/components/builder.jade
@@ -126,14 +126,14 @@ block content
block extra_js
- var isCN = ecWWWLang == 'zh';
if isCN
-- var npmRegistryServer = 'https://registry.npmmirror.com';
-- var npmVersionFetcher = 'Object.keys(json.versions).sort((v1, v2) =>
compareVersions(v2, v1, \'>\'))';
-- var tagPropName = 'dist-tags';
+- var pkgVersionListAPI =
'https://registry.npmmirror.com/-/v1/search?text=echarts=1';
+- var npmVersionFetcher = 'json.objects[0].package.versions.sort((v1,
v2) => compareVersions(v2, v1, \'>\'))';
+- var npmTagFetcher = 'json.objects[0].package.dist-tags';
- var extraBuilderParam = '=1';
else
-- var npmRegistryServer = 'https://data.jsdelivr.com/v1/package/npm';
+- var pkgVersionListAPI =
'https://data.jsdelivr.com/v1/package/npm/echarts';
- var npmVersionFetcher = 'json.versions';
-- var tagPropName = 'tags';
+- var npmTagFetcher = 'json.tags';
if isCN
script(src="https://registry.npmmirror.com/compare-versions/3.6.0/files/index.js;)
@@ -142,7 +142,7 @@ block extra_js
script.
var $versionsDom = document.querySelector('#versions');
-fetch('#{npmRegistryServer}/echarts', { mode: 'cors' }).then(res =>
res.json()).then(json => {
+fetch('#{pkgVersionListAPI}').then(res => res.json()).then(json => {
var versions = !{npmVersionFetcher};
versions.filter(version => compareVersions(version, '3.8.0', '>')
>= 0).forEach(version => {
const $optionDom = document.createElement('option');
@@ -150,7 +150,7 @@ block extra_js
$optionDom.innerHTML = version;
$versionsDom.appendChild($optionDom);
});
-$versionsDom.value = json['#{tagPropName}'].latest;
+$versionsDom.value = !{npmTagFetcher}.latest;
});
function updateCheckbox() {
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: fix title
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git The following commit(s) were added to refs/heads/master by this push: new ef5bdfd fix title ef5bdfd is described below commit ef5bdfd64a3b64761852e16a6fbc29d9d49212c5 Author: plainheart AuthorDate: Wed Feb 28 14:26:39 2024 +0800 fix title --- contents/en/how-to/cross-platform/server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents/en/how-to/cross-platform/server.md b/contents/en/how-to/cross-platform/server.md index 370c9f9..7c20377 100644 --- a/contents/en/how-to/cross-platform/server.md +++ b/contents/en/how-to/cross-platform/server.md @@ -16,7 +16,7 @@ In general, the server-side SVG rendering solution should be preferred, or if SV Server-side rendering also has some limitations, especially some operations related to interaction cannot be supported. Therefore, if you have interaction requirements, you can refer to "Server-Side Rendering with Hydration" below. -## Server-Side SVG Rendering +## Server-Side Rendering ### Server-Side SVG Rendering - 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: Update doap_ECharts.rdf
This is an automated email from the ASF dual-hosted git repository. wangzx 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 f763051db Update doap_ECharts.rdf f763051db is described below commit f763051db0eac6de1689aa9edca6cdbf7c4a56c9 Author: Zhongxiang Wang AuthorDate: Tue Feb 27 21:04:46 2024 +0800 Update doap_ECharts.rdf --- doap_ECharts.rdf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doap_ECharts.rdf b/doap_ECharts.rdf index 573d1cae9..8196bd2d5 100644 --- a/doap_ECharts.rdf +++ b/doap_ECharts.rdf @@ -38,9 +38,9 @@ https://projects.apache.org/category/data-visualization; /> -apache-echarts-5.4.3 -2023-07-18 -5.4.3 +apache-echarts-5.5.0 +2024-02-18 +5.5.0 - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: tweak title style
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 49d00c8 tweak title style
49d00c8 is described below
commit 49d00c83d12fd98fe00f3a5dcdb005c39432158c
Author: plainheart
AuthorDate: Tue Feb 27 20:56:14 2024 +0800
tweak title style
---
contents/en/how-to/cross-platform/server.md | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contents/en/how-to/cross-platform/server.md
b/contents/en/how-to/cross-platform/server.md
index 02f87c0..370c9f9 100644
--- a/contents/en/how-to/cross-platform/server.md
+++ b/contents/en/how-to/cross-platform/server.md
@@ -1,4 +1,4 @@
-# Server Side Rendering
+# Server-Side Rendering
Normally, Apache EChartsTM renders the chart dynamically in the
browser and will re-render after user interactions. However, there are specific
scenarios where we also need to render charts on the server side:
@@ -9,8 +9,8 @@ In these scenarios, ECharts offers both SVG and Canvas
server-side rendering (SS
| Solution | Rendering Result | Pros |
| - | - | - |
-| Server-side SVG Rendering | SVG string | Smaller than Canvas
images;Vector SVG images are not blurred;Support for initial animation |
-| Server-side Canvas Rendering | Image | The image format is available
for a wider range of scenarios, and is optional for scenarios that do not
support SVG |
+| Server-Side SVG Rendering | SVG string | Smaller than Canvas
images;Vector SVG images are not blurred;Support for initial animation |
+| Server-Side Canvas Rendering | Image | The image format is available
for a wider range of scenarios, and is optional for scenarios that do not
support SVG |
In general, the server-side SVG rendering solution should be preferred, or if
SVG is not applicable, the Canvas rendering solution can be considered.
@@ -76,7 +76,7 @@ Or save to a local file
fs.writeFile('bar.svg', svgStr, 'utf-8');
```
- Animations in Server-side Rendering
+ Animations in Server-Side Rendering
As you can see in the example above, even using server-side rendering, ECharts
can still provide animation effects, which are achieved by embedding CSS
animations in the output SVG string. There is no need for additional JavaScript
to play the animation.
@@ -90,7 +90,7 @@ setOption({
});
```
-### Server-side Canvas rendering
+### Server-Side Canvas Rendering
If you want the output to be an image rather than an SVG string, or if you're
still using an older version, we'd recommend using
[node-canvas](https://github.com/Automattic/node-canvas) for server-side
rendering, [node-canvas](https://github.com/Automattic/node-canvas) is Canvas
implementations on Node.js that provide an interface that is almost identical
to the Canvas in the browser.
@@ -154,7 +154,7 @@ If you are using images from remote, we recommend that you
prefetch the image vi
## Client Hydration
-### Lazy-loading Full ECharts
+### Lazy-Loading Full ECharts
With the latest version of ECharts, the server-side rendering solution can do
the following things along with rendering the chart:
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: const -> let
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 059dbde const -> let
059dbde is described below
commit 059dbde261c87d64d60bfe44c3461eccf795353b
Author: plainheart
AuthorDate: Tue Feb 27 20:46:35 2024 +0800
const -> let
---
contents/en/basics/release-note/5-5-0.md| 2 +-
contents/en/how-to/cross-platform/server.md | 8
contents/zh/basics/release-note/5-5-0.md| 2 +-
contents/zh/how-to/cross-platform/server.md | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/contents/en/basics/release-note/5-5-0.md
b/contents/en/basics/release-note/5-5-0.md
index c8f427a..0c0357a 100644
--- a/contents/en/basics/release-note/5-5-0.md
+++ b/contents/en/basics/release-note/5-5-0.md
@@ -37,7 +37,7 @@ If you need to use this solution, the server-side code
remains the same, but you
const echarts = require('echarts');
// In SSR mode the first container parameter is not required
-const chart = echarts.init(null, null, {
+let chart = echarts.init(null, null, {
renderer: 'svg', // must use SVG rendering mode
ssr: true, // enable SSR
width: 400, // need to specify height and width
diff --git a/contents/en/how-to/cross-platform/server.md
b/contents/en/how-to/cross-platform/server.md
index 5a0018a..02f87c0 100644
--- a/contents/en/how-to/cross-platform/server.md
+++ b/contents/en/how-to/cross-platform/server.md
@@ -32,7 +32,7 @@ We introduced a new zero-dependency server-side string based
SVG rendering solut
const echarts = require('echarts');
// In SSR mode the first container parameter is not required
-const chart = echarts.init(null, null, {
+let chart = echarts.init(null, null, {
renderer: 'svg', // must use SVG rendering mode
ssr: true, // enable SSR
width: 400, // need to specify height and width
@@ -47,7 +47,7 @@ chart.setOption({
// Output a string
const svgStr = chart.renderToSVGString();
-// If chart is no longer useful, consider dispose it to release memory.
+// If chart is no longer useful, consider disposing it to release memory.
chart.dispose();
chart = null;
```
@@ -108,7 +108,7 @@ echarts.setCanvasCreator(() => {
const canvas = createCanvas(800, 600);
// ECharts can use the Canvas instance created by node-canvas as a container
directly
-const chart = echarts.init(canvas);
+let chart = echarts.init(canvas);
// setOption as normal
chart.setOption({
@@ -117,7 +117,7 @@ chart.setOption({
const buffer = renderChart().toBuffer('image/png');
-// If chart is no longer useful, consider dispose it to release memory.
+// If chart is no longer useful, consider disposing it to release memory.
chart.dispose();
chart = null;
diff --git a/contents/zh/basics/release-note/5-5-0.md
b/contents/zh/basics/release-note/5-5-0.md
index 142db31..2f603f0 100644
--- a/contents/zh/basics/release-note/5-5-0.md
+++ b/contents/zh/basics/release-note/5-5-0.md
@@ -37,7 +37,7 @@ Apache ECharts 功能强大，相应地，包体积也比较大。我们在之
const echarts = require('echarts');
// 在 SSR 模式下第一个参数不需要再传入 DOM 对象
-const chart = echarts.init(null, null, {
+let chart = echarts.init(null, null, {
renderer: 'svg', // 必须使用 SVG 模式
ssr: true, // 开启 SSR
width: 400, // 需要指明高和宽，如果是根据客户端容器大小动态的，该值需要从客户端得到
diff --git a/contents/zh/how-to/cross-platform/server.md
b/contents/zh/how-to/cross-platform/server.md
index 470788b..cc271b4 100644
--- a/contents/zh/how-to/cross-platform/server.md
+++ b/contents/zh/how-to/cross-platform/server.md
@@ -32,7 +32,7 @@
const echarts = require('echarts');
// 在 SSR 模式下第一个参数不需要再传入 DOM 对象
-const chart = echarts.init(null, null, {
+let chart = echarts.init(null, null, {
renderer: 'svg', // 必须使用 SVG 模式
ssr: true, // 开启 SSR
width: 400, // 需要指明高和宽
@@ -108,7 +108,7 @@ echarts.setCanvasCreator(() => {
const canvas = createCanvas(800, 600);
// ECharts 可以直接使用 node-canvas 创建的 Canvas 实例作为容器
-const chart = echarts.init(canvas);
+let chart = echarts.init(canvas);
// 像正常使用一样 setOption
chart.setOption({
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated: test: update dataset-layout.html (#19373)
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 2e010c78a test: update dataset-layout.html (#19373)
2e010c78a is described below
commit 2e010c78a2571df185a4092675745391474686d3
Author: Vincent
AuthorDate: Tue Feb 27 17:52:55 2024 +0800
test: update dataset-layout.html (#19373)
Fixed an issue where repeated rendering caused stalling
-
Co-authored-by: miracleren
---
test/dataset-layout.html | 28
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/test/dataset-layout.html b/test/dataset-layout.html
index e892e545b..42cf3d44d 100644
--- a/test/dataset-layout.html
+++ b/test/dataset-layout.html
@@ -204,22 +204,26 @@ under the License.
height: 500
});
+var curDimension = 0;
chart && chart.on('updateAxisPointer', function (event) {
var xAxisInfo = event.axesInfo[0];
if (xAxisInfo) {
var dimension = xAxisInfo.value + 1;
-chart.setOption({
-series: {
-id: 'pie',
-label: {
-formatter: '{b}: {@[' + dimension + ']}
({d}%)'
-},
-encode: {
-value: dimension,
-tooltip: dimension
+if (curDimension !== dimension) {
+curDimension = dimension;
+chart.setOption({
+series: {
+id: 'pie',
+label: {
+formatter: '{b}: {@[' + dimension +
']} ({d}%)'
+},
+encode: {
+value: dimension,
+tooltip: dimension
+}
}
-}
-});
+});
+}
}
});
});
@@ -415,4 +419,4 @@ under the License.
-
\ 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-examples) 01/01: Merge pull request #89 from apache/dependabot/npm_and_yarn/ip-1.1.9
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/echarts-examples.git commit fb686eb242dc8c1600d0bb3ec77e6ccd455c4770 Merge: 897f4716 255fe501 Author: Zhongxiang Wang AuthorDate: Mon Feb 26 12:14:10 2024 +0800 Merge pull request #89 from apache/dependabot/npm_and_yarn/ip-1.1.9 chore(deps): bump ip from 1.1.5 to 1.1.9 package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 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 (897f4716 -> fb686eb2)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch gh-pages in repository https://gitbox.apache.org/repos/asf/echarts-examples.git from 897f4716 fix potential compatibility issue & update README.md add 255fe501 chore(deps): bump ip from 1.1.5 to 1.1.9 new fb686eb2 Merge pull request #89 from apache/dependabot/npm_and_yarn/ip-1.1.9 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 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: fix potential compatibility issue & update README.md
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 897f4716 fix potential compatibility issue & update README.md
897f4716 is described below
commit 897f4716dc616f13bfda6cbaddbfdcad49ed3513
Author: plainheart
AuthorDate: Mon Feb 26 12:12:40 2024 +0800
fix potential compatibility issue & update README.md
---
README.md | 6 +++---
tool/build-example.js | 2 +-
tool/compile-example.js | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 4727783e..ef992da1 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
## Install
```shell
-npm install
+npm i --force
```
## Edit examples
@@ -51,7 +51,7 @@ For example:
$.when(
$.getScript(ROOT_PATH + '/data/asset/js/.js'),
$.getScript(
-'https://cdn.jsdelivr.net/npm/d3-contour@2.0.0/dist/d3-contour.jXs'
+'https://cdn.jsdelivr.net/npm/d3-contour@2.0.0/dist/d3-contour.js'
)
).done(function () {
// ...
@@ -131,7 +131,7 @@ npm run build:examplelist
If puppeteer has not been installed:
```shell
-npm i puppeteer
+npm i puppeteer -D
```
If you want to save the log:
diff --git a/tool/build-example.js b/tool/build-example.js
index 656fde4e..1190095a 100644
--- a/tool/build-example.js
+++ b/tool/build-example.js
@@ -247,7 +247,7 @@ async function takeScreenshot(
// ffmpeg.FS("unlink", `${basename}.webm`)
// ffmpeg.FS("unlink", `${basename}.webp`)
shell.exec(
-`ffmpeg -y -i ${fileBase}.webm -s
${OUTPUT_IMAGE_WIDTH}x${OUTPUT_IMAGE_HEIGHT} -f webp ${fileBase}.webp`
+`ffmpeg -y -i "${fileBase}.webm" -s
${OUTPUT_IMAGE_WIDTH}x${OUTPUT_IMAGE_HEIGHT} -f webp "${fileBase}.webp"`
);
try {
fs.unlinkSync(webmFile);
diff --git a/tool/compile-example.js b/tool/compile-example.js
index 54296dd9..a367208e 100644
--- a/tool/compile-example.js
+++ b/tool/compile-example.js
@@ -7,9 +7,9 @@ const exampleDir = path.join(__dirname, '../public/examples');
async function run() {
const hasError =
-shell.exec(`tsc --project ${path.join(exampleDir, 'tsconfig.json')}`)
+shell.exec(`tsc --project "${path.join(exampleDir, 'tsconfig.json')}"`)
.code !== 0;
- shell.exec(`prettier --write ${path.join(exampleDir, 'js')}`);
+ shell.exec(`prettier --write "${path.join(exampleDir, 'js')}"`);
const files = await globby('js/**/*.js', {
cwd: exampleDir,
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: update assets version
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 c6c23c5c update assets version
c6c23c5c is described below
commit c6c23c5c66bb8294b7ebc4a8360e5970d172f025
Author: plainheart
AuthorDate: Mon Feb 26 11:37:54 2024 +0800
update assets version
---
_jade/components/builder.jade | 2 +-
bin/build.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_jade/components/builder.jade b/_jade/components/builder.jade
index ff7f9072..efee5e7e 100644
--- a/_jade/components/builder.jade
+++ b/_jade/components/builder.jade
@@ -204,7 +204,7 @@ block extra_js
//- if (email) {
//- log += '=' + email;
//- }
-_hmt.push(['_trackEvent', 'builder', 'build',
'#{downloadVersion}', log]);
+_hmt.push(['_trackEvent', 'builder', 'build', $versionsDom.value
|| '5', log]);
window.open('#{host}/#{ecWWWLang}/builder/echarts.html?' +
parameters);
});
diff --git a/bin/build.js b/bin/build.js
index e3f684ca..6cc76539 100644
--- a/bin/build.js
+++ b/bin/build.js
@@ -90,7 +90,7 @@ function initEnv() {
// Update home version each build.
config.homeVersion = +new Date();
// Temp: give a fixed version until need to update.
-config.cdnPayVersion = '20200710_1';
+config.cdnPayVersion = '20240226';
config.downloadVersion = '5.0.0';
-
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: fix version tip for pie-half-donut example
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 136a34ab fix version tip for pie-half-donut example
136a34ab is described below
commit 136a34ab23ae4d8dc0a4a858cbb8d9c92c029260
Author: Zhongxiang Wang
AuthorDate: Sat Feb 24 18:32:26 2024 +0800
fix version tip for pie-half-donut example
---
public/examples/ts/pie-half-donut.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/examples/ts/pie-half-donut.ts
b/public/examples/ts/pie-half-donut.ts
index ed881939..11cf8279 100644
--- a/public/examples/ts/pie-half-donut.ts
+++ b/public/examples/ts/pie-half-donut.ts
@@ -4,7 +4,7 @@ category: pie
titleCN: 半环形图
difficulty: 1
*/
-// This example requires ECharts v5.4.0 or later
+// This example requires ECharts v5.5.0 or later
option = {
tooltip: {
trigger: 'item'
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: fix(pie): fix `endAngle` is not applied on the empty circle
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch fix/pie-endAngle-emptyCircle
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit c539b1fe3d3a9561242edb4cd5ba2375e43e7d16
Author: plainheart
AuthorDate: Sat Feb 24 18:26:26 2024 +0800
fix(pie): fix `endAngle` is not applied on the empty circle
---
src/chart/pie/PieView.ts | 5 +++--
src/chart/pie/pieLayout.ts | 16 ++--
test/pie-endAngle.html | 5 -
test/runTest/actions/__meta__.json | 2 +-
test/runTest/actions/pie-endAngle.json | 2 +-
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/chart/pie/PieView.ts b/src/chart/pie/PieView.ts
index cb0e1d635..04a81f1e6 100644
--- a/src/chart/pie/PieView.ts
+++ b/src/chart/pie/PieView.ts
@@ -33,7 +33,7 @@ import { setLabelLineStyle, getLabelLineStatesModels } from
'../../label/labelGu
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
import { getSectorCornerRadius } from '../helper/sectorHelper';
import { saveOldStyle } from '../../animation/basicTransition';
-import { getBasicPieLayout } from './pieLayout';
+import { getBasicPieLayout, getSeriesLayoutData } from './pieLayout';
/**
* Piece of pie including Sector, Label, LabelLine
@@ -260,8 +260,9 @@ class PieView extends ChartView {
}
// when all data are filtered, show lightgray empty circle
if (data.count() === 0 && seriesModel.get('showEmptyCircle')) {
+const layoutData = getSeriesLayoutData(seriesModel);
const sector = new graphic.Sector({
-shape: getBasicPieLayout(seriesModel, api)
+shape: extend(getBasicPieLayout(seriesModel, api), layoutData)
});
sector.useStyle(seriesModel.getModel('emptyCircleStyle').getItemStyle());
this._emptyCircleSector = sector;
diff --git a/src/chart/pie/pieLayout.ts b/src/chart/pie/pieLayout.ts
index 2acdcda39..4ec992ec4 100644
--- a/src/chart/pie/pieLayout.ts
+++ b/src/chart/pie/pieLayout.ts
@@ -25,6 +25,7 @@ import ExtensionAPI from '../../core/ExtensionAPI';
import PieSeriesModel from './PieSeries';
import { SectorShape } from 'zrender/src/graphic/shape/Sector';
import { normalizeArcAngles } from 'zrender/src/core/PathProxy';
+import { makeInner } from '../../util/model';
const PI2 = Math.PI * 2;
const RADIAN = Math.PI / 180;
@@ -127,6 +128,11 @@ export default function pieLayout(
[startAngle, endAngle] = angles;
+const layoutData = getSeriesLayoutData(seriesModel);
+layoutData.startAngle = startAngle;
+layoutData.endAngle = endAngle;
+layoutData.clockwise = clockwise;
+
const angleRange = Math.abs(endAngle - startAngle);
// In the case some sector angle is smaller than minAngle
@@ -224,8 +230,8 @@ export default function pieLayout(
actualEndAngle = actualStartAngle;
}
else {
- actualStartAngle = startAngle + dir * idx * angle
+ halfPadAngle;
- actualEndAngle = startAngle + dir * (idx + 1) *
angle - halfPadAngle;
+actualStartAngle = startAngle + dir * idx * angle
+ halfPadAngle;
+actualEndAngle = startAngle + dir * (idx + 1) *
angle - halfPadAngle;
}
layout.startAngle = actualStartAngle;
@@ -263,3 +269,9 @@ export default function pieLayout(
}
});
}
+
+export const getSeriesLayoutData = makeInner<{
+startAngle: number
+endAngle: number
+clockwise: boolean
+}, PieSeriesModel>();
diff --git a/test/pie-endAngle.html b/test/pie-endAngle.html
index 0d5ed987b..b7e3ace92 100644
--- a/test/pie-endAngle.html
+++ b/test/pie-endAngle.html
@@ -49,6 +49,9 @@ under the License.
function update() {
chart.setOption({
+legend: {
+bottom: '10%'
+},
series: {
type: "pie",
startAngle: config.startAngle,
@@ -87,4 +90,4 @@ under the License.
-
\ No newline at end of file
+
diff --git a/test/runTest/actions/__meta__.json
b/test/runTest/actions/__meta__.json
index 7b2ccc514..bf0a57e02 100644
--- a/test/runTest/actions/__meta__.json
+++ b/test/runTest/actions/__meta__.json
@@ -156,7 +156,7 @@
"pie-animation": 2,
"pie-calculable": 1,
"pie-cornerRadius": 1,
- "pie-endAngle": 1,
+ "pie-endAngle": 2,
"pie-label": 2,
"pie-label-extreme": 2,
"pie-percent": 2,
diff --git a/test/runTest/actions/pie-endAngle.json
b/test/runTest/actions/pie-endAngle.json
index 8252f9f9e..8bf839f13 100644
--- a/test/runTest/actio
(echarts) branch fix/pie-endAngle-emptyCircle created (now c539b1fe3)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/pie-endAngle-emptyCircle in repository https://gitbox.apache.org/repos/asf/echarts.git at c539b1fe3 fix(pie): fix `endAngle` is not applied on the empty circle This branch includes the following new commits: new c539b1fe3 fix(pie): fix `endAngle` is not applied on the empty circle 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-website) branch asf-site updated: update .htaccess
This is an automated email from the ASF dual-hosted git repository. wangzx 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 eee6ab56b update .htaccess eee6ab56b is described below commit eee6ab56bb5e819a9225a6bb48bd46553c9111a5 Author: Zhongxiang Wang AuthorDate: Sat Feb 24 15:14:45 2024 +0800 update .htaccess --- .htaccess | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 2eb1221c5..d29f6b326 100644 --- a/.htaccess +++ b/.htaccess @@ -16,8 +16,10 @@ RedirectMatch 404 /\.asf\.yaml Header set X-Content-Type-Options "nosniff" - -ExpiresActive on +E +# disable expiration as the Apache server will also cache the `Expires` header, +# which causes our expiration strategy not to work. +#ExpiresActive on ExpiresByType text/html "access plus 1 hour" ExpiresByType text/css "access plus 1 hour" - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch master updated: tweak changelog
This is an automated email from the ASF dual-hosted git repository. wangzx 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 bc209f7a tweak changelog bc209f7a is described below commit bc209f7a07eeddc064cc9dc7160012752e57f433 Author: plainheart AuthorDate: Fri Feb 23 10:50:28 2024 +0800 tweak changelog --- en/changelog.md | 2 +- zh/changelog.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/changelog.md b/en/changelog.md index 9b08d9c4..41e3556f 100644 --- a/en/changelog.md +++ b/en/changelog.md @@ -15,7 +15,7 @@ + [Feature] [pictorialBar] support clip for pictorialBar series. [#19197](https://github.com/apache/echarts/issues/19197) ([Ovilia](https://github.com/Ovilia)) + [Feature] [tooltip] add `dataIndex` to `valueFormatter` callback. [#19123](https://github.com/apache/echarts/issues/19123) ([ChepteaCatalin](https://github.com/ChepteaCatalin)) + [Fix] [toolbox] fix toolbox text can't apply the specified or global font style. [#19170](https://github.com/apache/echarts/issues/19170) ([plainheart](https://github.com/plainheart)) -+ [Fix] [label] fix labelLine default style when normal state not show but other state show. [#18800](https://github.com/apache/echarts/issues/18800) ([linghaoSu](https://github.com/linghaoSu)) ++ [Fix] [labelLine] fix labelLine default style when normal state not show but other state show. [#18800](https://github.com/apache/echarts/issues/18800) ([linghaoSu](https://github.com/linghaoSu)) + [Fix] [labelLine] fix `emphasis.labelLine` is not working in pie chart. [#19180](https://github.com/apache/echarts/issues/19180) ([shiersansi](https://github.com/shiersansi)) + [Fix] [marker] fix markArea position when axis is with `alignWithLabel`. [#19516](https://github.com/apache/echarts/issues/19516) ([Ovilia](https://github.com/Ovilia)) + [Fix] [line] fix line may cross in time axis when animation is enabled. [#18960](https://github.com/apache/echarts/issues/18960) ([plainheart](https://github.com/plainheart)) diff --git a/zh/changelog.md b/zh/changelog.md index 9a248a08..89d560e6 100644 --- a/zh/changelog.md +++ b/zh/changelog.md @@ -15,7 +15,7 @@ + [Feature] [pictorialBar] 象形柱图系列新增 `clip` 选项以支持裁剪。[#19197](https://github.com/apache/echarts/issues/19197) ([Ovilia](https://github.com/Ovilia)) + [Feature] [tooltip] tooltip 的 `valueFormatter` 回调新增 `dataIndex` 参数。[#19123](https://github.com/apache/echarts/issues/19123) ([ChepteaCatalin](https://github.com/ChepteaCatalin)) + [Fix] [toolbox] 修复 toolbox 文本没有应用指定或全局字体样式的问题。[#19170](https://github.com/apache/echarts/issues/19170) ([plainheart](https://github.com/plainheart)) -+ [Fix] [label] 修复 labelLine 在 normal 状态下隐藏而在其他状态显示时，其颜色没有继承系列颜色的问题。[#18800](https://github.com/apache/echarts/issues/18800) ([linghaoSu](https://github.com/linghaoSu)) ++ [Fix] [labelLine] 修复 labelLine 在 normal 状态下隐藏而在其他状态显示时，其颜色没有继承系列颜色的问题。[#18800](https://github.com/apache/echarts/issues/18800) ([linghaoSu](https://github.com/linghaoSu)) + [Fix] [labelLine] 修复饼图 `emphasis.labelLine` 配置不生效的问题。[#19180](https://github.com/apache/echarts/issues/19180) ([shiersansi](https://github.com/shiersansi)) + [Fix] [marker] 修复当轴刻度 `axisTick` 启用了 `alignWithLabel` 时 markArea 范围错误的问题。[#19516](https://github.com/apache/echarts/issues/19516) ([Ovilia](https://github.com/Ovilia)) + [Fix] [line] 修复时间轴上的折线在启用动画时可能交叉的问题。[#18960](https://github.com/apache/echarts/issues/18960) ([plainheart](https://github.com/plainheart)) - 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: fix nightly version list
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 18725759 fix nightly version list
18725759 is described below
commit 187257595fd5f9a560e86b14a9a1aadae062285f
Author: plainheart
AuthorDate: Fri Feb 23 10:41:11 2024 +0800
fix nightly version list
---
src/editor/Preview.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/editor/Preview.vue b/src/editor/Preview.vue
index 05e078e3..58fc260d 100644
--- a/src/editor/Preview.vue
+++ b/src/editor/Preview.vue
@@ -644,7 +644,7 @@ export default {
const nextIdx = versions.indexOf(next);
const latestIdx = versions.indexOf(latest);
this.nightlyVersions = versions
- .slice(nextIdx, nextIdx + 10)
+ .slice(nextIdx, Math.min(nextIdx + 10, latestIdx))
.concat(versions.slice(latestIdx, latestIdx + 10));
hasPRVersion && this.nightlyVersions.unshift(prVersion);
-
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: Update .htaccess
This is an automated email from the ASF dual-hosted git repository. wangzx 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 4e0dd61ba Update .htaccess 4e0dd61ba is described below commit 4e0dd61bac09c19ff341c5cb692f7ea38ebc2261 Author: Zhongxiang Wang AuthorDate: Fri Feb 23 10:20:03 2024 +0800 Update .htaccess --- .htaccess | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.htaccess b/.htaccess index fc8585f12..2eb1221c5 100644 --- a/.htaccess +++ b/.htaccess @@ -19,14 +19,19 @@ RedirectMatch 404 /\.asf\.yaml ExpiresActive on -ExpiresByType text/html"access plus 1 hour" -ExpiresByType image/png"access plus 1 hour" -ExpiresByType image/jpg"access plus 1 hour" -ExpiresByType image/jpeg "access plus 1 hour" -ExpiresByType text/css "access plus 1 hour" +ExpiresByType text/html "access plus 1 hour" +ExpiresByType text/css "access plus 1 hour" ExpiresByType application/javascript"access plus 1 hour" -ExpiresByType application/json "access plus 1 hour" -ExpiresDefault "access plus 10 days" +ExpiresByType application/json "access plus 1 hour" +ExpiresByType text/javascript "access plus 1 hour" +ExpiresByType text/json "access plus 1 hour" + +#ExpiresByType image/png "access plus 1 hour" +#ExpiresByType image/jpg "access plus 1 hour" +#ExpiresByType image/jpeg"access plus 1 hour" +#ExpiresByType image/webp"access plus 1 hour" + +ExpiresDefault "access plus 10 days" # no cache for root index redirection - 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: update .htaccess
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 78ed85ec5 update .htaccess
78ed85ec5 is described below
commit 78ed85ec5f673827f1b4f992dcb30c73597fa2c5
Author: Zhongxiang Wang
AuthorDate: Fri Feb 23 10:03:00 2024 +0800
update .htaccess
---
.htaccess | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.htaccess b/.htaccess
index cab07997c..fc8585f12 100644
--- a/.htaccess
+++ b/.htaccess
@@ -42,9 +42,15 @@ RedirectMatch 404 /\.asf\.yaml
+
+webp|apng|avif)$">
+Header setifempty Content-Type "image/%{MATCH_imgExt}e"
+
+
+
RewriteEngine On
-
+
RewriteCond "%{HTTP:Accept-Language}" ^zh [NC]
RewriteRule ^/?(index\.html)?$ "/zh/index.html" [L,R=302]
-
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: update .htaccess
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 6ac45c095 update .htaccess
6ac45c095 is described below
commit 6ac45c09517ae6a7a40cea88e37f12bc5e63f942
Author: Zhongxiang Wang
AuthorDate: Fri Feb 23 09:38:10 2024 +0800
update .htaccess
---
.htaccess | 6 --
1 file changed, 6 deletions(-)
diff --git a/.htaccess b/.htaccess
index 86d63a7eb..cab07997c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -42,12 +42,6 @@ RedirectMatch 404 /\.asf\.yaml
-
-webp|apng|avif)$">
-Header setifempty Content-Type image/%{env:MATCH_IMGEXT}
-
-
-
RewriteEngine On
-
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: try fixing .htaccess
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 f1deb6e05 try fixing .htaccess
f1deb6e05 is described below
commit f1deb6e056d273f25e1b73cb621ff22af800b84c
Author: Zhongxiang Wang
AuthorDate: Fri Feb 23 09:37:22 2024 +0800
try fixing .htaccess
---
.htaccess | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.htaccess b/.htaccess
index a9abb18e7..86d63a7eb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -44,7 +44,7 @@ RedirectMatch 404 /\.asf\.yaml
webp|apng|avif)$">
-Header setifempty Content-Type "image/%{env:MATCH_IMGEXT}"
+Header setifempty Content-Type image/%{env:MATCH_IMGEXT}
-
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: try FilesMatch to add content-type header
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 8474be7ca try FilesMatch to add content-type header
8474be7ca is described below
commit 8474be7ca8f3656b0c9b16c986f5dcb893ff1061
Author: Zhongxiang Wang
AuthorDate: Fri Feb 23 09:29:10 2024 +0800
try FilesMatch to add content-type header
---
.htaccess | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.htaccess b/.htaccess
index 20ebde739..a9abb18e7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,9 +1,5 @@
AddDefaultCharset UTF-8
-AddType image/webp .webp
-AddType image/avif .avif
-AddType image/apng .apng
-
RedirectMatch 404 /\.git
RedirectMatch 404 /\.gitignore
RedirectMatch 404 /\.htaccess
@@ -46,6 +42,12 @@ RedirectMatch 404 /\.asf\.yaml
+
+webp|apng|avif)$">
+Header setifempty Content-Type "image/%{env:MATCH_IMGEXT}"
+
+
+
RewriteEngine On
-
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: try adding MIME type for webp/avif/apng
This is an automated email from the ASF dual-hosted git repository. wangzx 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 0893826f3 try adding MIME type for webp/avif/apng 0893826f3 is described below commit 0893826f3de51b75a842789a9fffa0832570d491 Author: Zhongxiang Wang AuthorDate: Fri Feb 23 08:46:07 2024 +0800 try adding MIME type for webp/avif/apng --- .htaccess | 4 1 file changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index cab07997c..20ebde739 100644 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,9 @@ AddDefaultCharset UTF-8 +AddType image/webp .webp +AddType image/avif .avif +AddType image/apng .apng + RedirectMatch 404 /\.git RedirectMatch 404 /\.gitignore RedirectMatch 404 /\.htaccess - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated (96f2052 -> 5f5bcaa)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git from 96f2052 replace jQuery with fetch add b27294e build(deps): bump ip from 1.1.8 to 1.1.9 new 5f5bcaa Merge pull request #107 from apache/dependabot/npm_and_yarn/ip-1.1.9 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 | 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-handbook) 01/01: Merge pull request #107 from apache/dependabot/npm_and_yarn/ip-1.1.9
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git commit 5f5bcaaa51a33314b0f266b5104dedb8215263cd Merge: 96f2052 b27294e Author: Zhongxiang Wang AuthorDate: Thu Feb 22 12:50:02 2024 +0800 Merge pull request #107 from apache/dependabot/npm_and_yarn/ip-1.1.9 build(deps): bump ip from 1.1.8 to 1.1.9 package-lock.json | 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-handbook) branch master updated: replace jQuery with fetch
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 96f2052 replace jQuery with fetch
96f2052 is described below
commit 96f20522b95892f095a8afa6f3c1fe997b608236
Author: plainheart
AuthorDate: Thu Feb 22 12:40:04 2024 +0800
replace jQuery with fetch
---
contents/en/how-to/cross-platform/server.md | 16 ++--
contents/zh/how-to/cross-platform/server.md | 16 ++--
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/contents/en/how-to/cross-platform/server.md
b/contents/en/how-to/cross-platform/server.md
index c741949..5a0018a 100644
--- a/contents/en/how-to/cross-platform/server.md
+++ b/contents/en/how-to/cross-platform/server.md
@@ -208,9 +208,11 @@ function updateChart(svgStr) {
if (params.ssrType === 'legend') {
// Click the legend element, request the server for secondary
rendering
isSeriesShown[params.seriesName] = !isSeriesShown[params.seriesName];
- $.get('...?series=' + JSON.stringify(isSeriesShown)).then(svgStr => {
-updateChart(svgStr);
- });
+ fetch('...?series=' + JSON.stringify(isSeriesShown))
+.then(res => res.text())
+.then(svgStr => {
+ updateChart(svgStr);
+});
}
}
}
@@ -218,9 +220,11 @@ function updateChart(svgStr) {
}
// Get the SVG string rendered by the server through an AJAX request
-$.get('...').then(svgStr => {
- updateChart(svgStr);
-});
+fetch('...')
+ .then(res => res.text())
+ .then(svgStr => {
+updateChart(svgStr);
+ });
```
diff --git a/contents/zh/how-to/cross-platform/server.md
b/contents/zh/how-to/cross-platform/server.md
index aeed06c..470788b 100644
--- a/contents/zh/how-to/cross-platform/server.md
+++ b/contents/zh/how-to/cross-platform/server.md
@@ -208,9 +208,11 @@ function updateChart(svgStr) {
if (params.ssrType === 'legend') {
// 点击图例元素，请求服务器进行二次渲染
isSeriesShown[params.seriesName] = !isSeriesShown[params.seriesName];
- $.get('...?series=' + JSON.stringify(isSeriesShown)).then(svgStr => {
-updateChart(svgStr);
- });
+ fetch('...?series=' + JSON.stringify(isSeriesShown))
+.then(res => res.text())
+.then(svgStr => {
+ updateChart(svgStr);
+});
}
}
}
@@ -218,9 +220,11 @@ function updateChart(svgStr) {
}
// 通过 AJAX 请求获取服务端渲染的 SVG 字符串
-$.get('...').then(svgStr => {
- updateChart(svgStr);
-});
+fetch('...')
+ .then(res => res.text())
+ .then(svgStr => {
+updateChart(svgStr);
+ });
```
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: fix links
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 9a54a56 fix links
9a54a56 is described below
commit 9a54a569ee1328d50cba58914b4bb3050419a2f6
Author: plainheart
AuthorDate: Thu Feb 22 12:36:43 2024 +0800
fix links
---
contents/en/how-to/cross-platform/server.md | 12 ++--
contents/zh/how-to/cross-platform/server.md | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/contents/en/how-to/cross-platform/server.md
b/contents/en/how-to/cross-platform/server.md
index 565fd3d..c741949 100644
--- a/contents/en/how-to/cross-platform/server.md
+++ b/contents/en/how-to/cross-platform/server.md
@@ -9,8 +9,8 @@ In these scenarios, ECharts offers both SVG and Canvas
server-side rendering (SS
| Solution | Rendering Result | Pros |
| - | - | - |
-| Serverside SVG Rendering | SVG string | Smaller than Canvas
images;Vector SVG images are not blurred;Support for initial animation |
-| Serverside Canvas Rendering | Image | The image format is available
for a wider range of scenarios, and is optional for scenarios that do not
support SVG |
+| Server-side SVG Rendering | SVG string | Smaller than Canvas
images;Vector SVG images are not blurred;Support for initial animation |
+| Server-side Canvas Rendering | Image | The image format is available
for a wider range of scenarios, and is optional for scenarios that do not
support SVG |
In general, the server-side SVG rendering solution should be preferred, or if
SVG is not applicable, the Canvas rendering solution can be considered.
@@ -100,7 +100,7 @@ Here's a simple example
var echarts = require('echarts');
const { createCanvas } = require('canvas');
-// In versions ealier than 5.3.0, you had to register the canvas factory with
setCanvasCreator.
+// In versions earlier than 5.3.0, you had to register the canvas factory with
setCanvasCreator.
// Not necessary since 5.3.0
echarts.setCanvasCreator(() => {
return createCanvas();
@@ -188,7 +188,7 @@ Starting from version v5.5.0, if the chart only needs the
following effects and
```html
-https://cdn.jsdelivr.net/npm/echarts/ssr/client/dist/index.js"</a>;>
+https://cdn.jsdelivr.net/npm/echarts/ssr/client/dist/index.min.js"</a>;>
const ssrClient = window['echarts-ssr-client'];
@@ -238,7 +238,7 @@ The client-side lightweight runtime can be imported in the
following ways:
```html
<!-- Method one: Using CDN -->
-<script
src="<a rel="nofollow" href="https://cdn.jsdelivr.net/npm/echarts/ssr/client/dist/index.js"">https://cdn.jsdelivr.net/npm/echarts/ssr/client/dist/index.js"</a>;>
+https://cdn.jsdelivr.net/npm/echarts/ssr/client/dist/index.min.js"</a>;>
```
@@ -300,7 +300,7 @@ These four rendering methods can be used in combination.
Let's summarize their r
| Rendering Solution | Loading Volume | Loss of Function and Interaction |
Relative Development Workload | Recommended Scenario |
| --- | --- | --- | --- | --- |
| Client-side rendering | Largest | None | Minimum | The first screen load
time is not sensitive, and there is a high demand for complete functionality
and interaction |
-| Client-side rendering ([partial package
importing](basics/import#shrinking-bundle-size) on demand) | Large | Large: the
packages not included cannot use the corresponding functions | Small | The
first screen load time is not sensitive, there is no strict requirement for
code volume but hope to be as small as possible, only use a small part of
ECharts functions, no server resources |
+| Client-side rendering ([partial package
importing](${lang}/basics/import#shrinking-bundle-size) on demand) | Large |
Large: the packages not included cannot use the corresponding functions | Small
| The first screen load time is not sensitive, there is no strict requirement
for code volume but hope to be as small as possible, only use a small part of
ECharts functions, no server resources |
| One-time server-side SVG rendering | Small | Large: unable to dynamically
change data, does not support legend toggle series display, does not support
tooltips and other interactions with high real-time requirements | Medium | The
first screen load time is sensitive, low demand for complete functionality and
interaction |
| One-time server-side Canvas rendering | Large | Largest: the same as above
and does not support initial animation, larger image volume, blurry when
enlarged | Medium | The first screen load time is sensitive, low demand for
complete functionality and interaction, platform restrictions cannot use SVG |
| Server-side SVG rendering plus
(echarts-www) branch master updated: tweak download page
This is an automated email from the ASF dual-hosted git repository. wangzx 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 efdf3e72 tweak download page efdf3e72 is described below commit efdf3e7295ec3aad974144ae0c1a7410d12d2007 Author: plainheart AuthorDate: Thu Feb 22 12:02:59 2024 +0800 tweak download page --- _jade/components/download.jade | 2 +- _jade/en/download.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_jade/components/download.jade b/_jade/components/download.jade index 43654250..c6d3dcea 100644 --- a/_jade/components/download.jade +++ b/_jade/components/download.jade @@ -27,7 +27,7 @@ block content th 从镜像网站下载源码 th 从 GitHub 下载编译产物 -a(href="https://archive.apache.org/dist/echarts/;) 查看历史版本 +a(href="https://archive.apache.org/dist/echarts/?C=N;O=D;) 查看历史版本 .checksum p 注意：如果从镜像网站下载，请检查 https://www.apache.org/dev/release-signing#sha-checksum;>SHA-512 并且检验确认 https://www.apache.org/dev/release-signing#openpgp;>OpenPGP 与 https://www.apache.org;>Apache 主站的签名一致。链接在上面的 Source 旁。这个 https://www.apache.org/dist/echarts/KEYS;>KEYS 文件包含了用于签名发布版的公钥。如果可能的话，建议使用https://www.apache.org/dev/release-signing#web-of-trust;>可信任的网络（web of trust）确认 KEYS 的同一性。 diff --git a/_jade/en/download.jade b/_jade/en/download.jade index 23f3bfbb..938ce405 100644 --- a/_jade/en/download.jade +++ b/_jade/en/download.jade @@ -39,7 +39,7 @@ block content th Download Source from a Mirror th Dist files on GitHub -a(href="https://archive.apache.org/dist/echarts/;) View Archived Versions +a(href="https://archive.apache.org/dist/echarts/?C=N;O=D;) View Archived Versions .checksum p Note: when downloading from a mirror please check the https://www.apache.org/dev/release-signing#sha-checksum;>SHA-512 and verify the https://www.apache.org/dev/release-signing#openpgp;>OpenPGP compatible signature from the main https://www.apache.org;>Apache site. Links are provided above (next to the release download link). This https://www.apache.org/dist/echarts/KEYS;>KEYS file contains the pub [...] - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: tweak download page
This is an automated email from the ASF dual-hosted git repository. wangzx 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 541d6c3a tweak download page 541d6c3a is described below commit 541d6c3ad13fccb6c47d61b6f51ce43300abb20e Author: plainheart AuthorDate: Thu Feb 22 12:00:32 2024 +0800 tweak download page --- _jade/components/download.jade | 2 +- _jade/en/download.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_jade/components/download.jade b/_jade/components/download.jade index cff805f3..43654250 100644 --- a/_jade/components/download.jade +++ b/_jade/components/download.jade @@ -35,7 +35,7 @@ block content h4 使用 GPG 验证 ECharts 发布版本 ol li 从镜像网站下载 apache-echarts-X.Y.Z-src.zip -li 从 https://www.apache.org/dist/echarts/;>Apache 下载 checksum apache-echarts-X.Y.Z-src.zip.asc +li 从 https://www.apache.org/dist/echarts/;>Apache 下载签名文件 apache-echarts-X.Y.Z-src.zip.asc li 下载 https://www.apache.org/dist/echarts/KEYS;>ECharts KEYS li gpg --import KEYS li gpg --verify apache-echarts-X.Y.Z-src.zip.asc diff --git a/_jade/en/download.jade b/_jade/en/download.jade index 10ec0b4f..23f3bfbb 100644 --- a/_jade/en/download.jade +++ b/_jade/en/download.jade @@ -47,7 +47,7 @@ block content h4 To verify ECharts releases using GPG: ol li Download the release apache-echarts-X.Y.Z-src.zip from a mirror site. -li Download the checksum apache-echarts-X.Y.Z-src.zip.asc from https://www.apache.org/dist/echarts/;>Apache. +li Download the signature file apache-echarts-X.Y.Z-src.zip.asc from https://www.apache.org/dist/echarts/;>Apache. li Download the https://www.apache.org/dist/echarts/KEYS;>ECharts KEYS file. li gpg --import KEYS li gpg --verify apache-echarts-X.Y.Z-src.zip.asc - 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 #19628 from apache/release
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit b9f78094bd60e869690434252ba0dcef52157d2f
Merge: 706b74b1c 0f4967b1b
Author: Zhongxiang Wang
AuthorDate: Wed Feb 21 19:29:35 2024 +0800
Merge pull request #19628 from apache/release
chore: merge release into master
KEYS |58 +
build/build.js |33 +-
build/config.js | 7 +-
build/pre-publish.js | 2 +-
dist/echarts.common.js | 19454 ++--
dist/echarts.common.js.map | 2 +-
dist/echarts.common.min.js | 4 +-
dist/echarts.esm.js | 30633 +---
dist/echarts.esm.js.map | 2 +-
dist/echarts.esm.min.js | 4 +-
dist/echarts.esm.min.mjs |45 +
dist/{echarts.esm.js => echarts.esm.mjs} | 30635 +
dist/echarts.esm.mjs.map | 1 +
dist/echarts.js | 30633 +---
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 4 +-
dist/echarts.simple.js | 13720 ---
dist/echarts.simple.js.map | 2 +-
dist/echarts.simple.min.js | 4 +-
dist/extension/bmap.js | 109 +-
dist/extension/bmap.js.map | 2 +-
dist/extension/dataTool.js |61 +-
dist/extension/dataTool.js.map | 2 +-
i18n/langAR-obj.js | 178 +
i18n/langAR.js | 174 +
i18n/langCS-obj.js | 4 +-
i18n/langCS.js | 4 +-
i18n/langDE-obj.js | 4 +-
i18n/langDE.js | 4 +-
i18n/langEN-obj.js | 4 +-
i18n/langEN.js | 4 +-
i18n/langES-obj.js |60 +
i18n/langES.js |60 +
i18n/langFI-obj.js |60 +
i18n/langFI.js |60 +
i18n/langFR-obj.js | 4 +-
i18n/langFR.js | 4 +-
i18n/langHU-obj.js | 4 +-
i18n/langHU.js | 4 +-
i18n/langIT-obj.js | 4 +-
i18n/langIT.js | 4 +-
i18n/langJA-obj.js | 4 +-
i18n/langJA.js | 4 +-
i18n/langKO-obj.js | 4 +-
i18n/langKO.js | 4 +-
i18n/langNL-obj.js | 175 +
i18n/langNL.js | 171 +
i18n/langPL-obj.js | 4 +-
i18n/langPL.js | 4 +-
i18n/langPT-br-obj.js| 4 +-
i18n/langPT-br.js| 4 +-
i18n/langRO-obj.js | 4 +-
i18n/langRO.js | 4 +-
i18n/langRU-obj.js | 4 +-
i18n/langRU.js | 4 +-
i18n/langSI-obj.js | 4 +-
i18n/langSI.js | 4 +-
i18n/langTH-obj.js |60 +
i18n/langTH.js |60 +
i18n/langTR-obj.js | 4 +-
i18n/langTR.js | 4 +-
i18n/langUK-obj.js | 4 +-
i18n/langUK.js | 4 +-
i18n/langVI-obj.js | 4 +-
i18n/langVI.js | 4 +-
i18n/langZH-obj.js | 4 +-
i18n/langZH.js | 4 +-
package-lock.json|19 +-
package.README.md|37 +
package.json | 100 +-
src/component/legend/LegendView.ts |28 +-
src/component/tooltip/TooltipView.ts | 7 +-
src/component/tooltip/seriesFormatTooltip.ts | 5 +-
src/component/tooltip/tooltipMarkup.ts |20 +-
src/core/echarts.ts |30 +-
src/model/mixin/dataFormat.ts| 2 -
src/util/format.ts | 8 +-
src/util/types.ts| 1 -
ssr/client/dist/index.js | 5 +-
ssr/cli
(echarts) branch master updated (706b74b1c -> b9f78094b)
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
from 706b74b1c Merge pull request #19620 from apache/fix/toolbox/saveAsImage
add f996884b0 Merge pull request #19532 from apache/master
add d403486da fix: (1) fix that some old version bundler (like rollup) do
not recognize wildcard that not at the end of the patter string (e.g. "exports:
{"./*.js": "xxx"}"). (2) Add readme to package.json.
add 61af51385 Merge pull request #19543 from apache/module_default_esm_fix
add 1b1284fff Revert "fix(tooltip): fix opacity not work in tooltip marker"
add 2a43d110b Merge pull request #19558 from
apache/revert-18921-fix/tooltip-color
add e14cc9a04 fix(ssr): hovering legend items should not trigger tooltip
add 0392fb309 fix(ssr): call registerSSRDataGetter only with ssr
add 2deb0fd6a Merge pull request #19549 from apache/release-dev
add 3c6d9bb7c chore: release 5.5.0
add 52735fa11 Merge pull request #19564 from apache/release-dev
add fde9fbdbc fix(test): rename `jest.config.js` to `jest.config.cjs` to
fix jest can't run
add 4d3bbaefa Merge pull request #19568 from apache/fix-jest
add b7548af6a chore: add a key
add 3fbfd2bca Merge pull request #19577 from apache/release-dev
add 6cefe2700 fix: (1) Mistake in package.json "exports"."require" (2) Add
entry for dist/** for file extension not specified usage (3) add
dist/echarts.esm.mjs for case that not able to recognize as esm after
dist/package.json with `{"type": "commonjs"}` added.
add e3fa16caf Merge pull request #19593 from apache/module_default_esm_fix2
add b0b463919 chore: relase 5.5.0-rc.2
add b046d782e chore: rebuild and relase 5.5.0-rc.2
add 0f4967b1b Merge pull request #19594 from apache/release-dev
new b9f78094b Merge pull request #19628 from apache/release
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:
KEYS |58 +
build/build.js |33 +-
build/config.js | 7 +-
build/pre-publish.js | 2 +-
dist/echarts.common.js | 19454 ++--
dist/echarts.common.js.map | 2 +-
dist/echarts.common.min.js | 4 +-
dist/echarts.esm.js | 30633 +---
dist/echarts.esm.js.map | 2 +-
dist/echarts.esm.min.js | 4 +-
dist/echarts.esm.min.mjs |45 +
dist/{echarts.esm.js => echarts.esm.mjs} | 30635 +
dist/echarts.esm.mjs.map | 1 +
dist/echarts.js | 30633 +---
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 4 +-
dist/echarts.simple.js | 13720 ---
dist/echarts.simple.js.map | 2 +-
dist/echarts.simple.min.js | 4 +-
dist/extension/bmap.js | 109 +-
dist/extension/bmap.js.map | 2 +-
dist/extension/dataTool.js |61 +-
dist/extension/dataTool.js.map | 2 +-
src/i18n/langAR.ts => i18n/langAR-obj.js |65 +-
src/i18n/langAR.ts => i18n/langAR.js |61 +-
i18n/langCS-obj.js | 4 +-
i18n/langCS.js | 4 +-
i18n/langDE-obj.js | 4 +-
i18n/langDE.js | 4 +-
i18n/langEN-obj.js | 4 +-
i18n/langEN.js | 4 +-
i18n/langES-obj.js |60 +
i18n/langES.js |60 +
i18n/langFI-obj.js |60 +
i18n/langFI.js |60 +
i18n/langFR-obj.js | 4 +-
i18n/langFR.js | 4 +-
i18n/langHU-obj.js | 4 +-
i18n/langHU.js | 4 +-
i18n/langIT-obj.js | 4 +-
i18n/langIT.js | 4 +-
i18n/langJA-obj.js | 4 +-
i18n/langJA.js | 4 +-
i18n/langKO-obj.js | 4 +-
i18n/langKO.js | 4 +-
src/i18n/langNL.ts =>
(echarts-handbook) branch master updated: fix release-note
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 80cf4ed fix release-note
80cf4ed is described below
commit 80cf4ed1536d4f245a24ca2f61ac0a722c69ab51
Author: plainheart
AuthorDate: Wed Feb 21 18:38:53 2024 +0800
fix release-note
---
contents/en/basics/release-note/5-5-0.md | 14 +++---
contents/zh/basics/release-note/5-5-0.md | 14 +++---
pages/_.vue | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/contents/en/basics/release-note/5-5-0.md
b/contents/en/basics/release-note/5-5-0.md
index 4652207..c8f427a 100644
--- a/contents/en/basics/release-note/5-5-0.md
+++ b/contents/en/basics/release-note/5-5-0.md
@@ -18,7 +18,7 @@ We’ve also ensured that this new feature is compatible with a
variety of envir
We’re excited about this new feature and believe it will significantly improve
the developer experience.
-## Server-Side Rendering + Lightweight Client Runtime
+## Server-Side Rendering ＋ Lightweight Client Runtime
Apache ECharts is powerful, but correspondingly, it has a large package size.
We have made various efforts to improve this in previous versions. Developers
can use TreeShaking to load parts of the code as needed, reducing the amount of
code loaded. Starting from Apache ECharts version 5.3, we support a server-side
SVG string rendering solution with zero dependencies, and support the initial
animation of charts. In this way, using the result of server-side rendering as
the first screen re [...]
@@ -69,7 +69,7 @@ The client adds the obtained SVG string to the container and
binds the lightweig
```html
-https://cdn.jsdelivr.net/npm/echarts/ssr/client/dist/index.js"</a>;>
+https://cdn.jsdelivr.net/npm/echarts/ssr/client/dist/index.min.js"</a>;>
const ssrClient = window['echarts-ssr-client'];
@@ -116,13 +116,13 @@ The lightweight client runtime must be used in
conjunction with the server-side
- Dynamically change data (implementation principle: the lightweight runtime
requests the server for secondary rendering)
- Click the legend to toggle whether the series is displayed (implementation
principle: the lightweight runtime requests the server for secondary rendering)
-As you can see, this can satisfy most interactive scenario needs. If more
complex interactions are needed, the client needs to load `echarts.js` to
implement complete functionality. For a complete introduction, please refer to
[Server-side Rendering ECharts
Charts](${handbookPath}how-to/cross-platform/server).
+As you can see, this can satisfy most interactive scenario needs. If more
complex interactions are needed, the client needs to load `echarts.js` to
implement complete functionality. For a complete introduction, please refer to
[Server-side Rendering ECharts Charts](${lang}/how-to/cross-platform/server).
## Data Drilldown Supports Transition Animation
In version 5.5.0, we added the `childGroupId` configuration item, which can
realize the transition animation function of data drilldown.
-In previous versions, we already support using `groupId` to represent the
group to which the current data belongs. The newly added `childGroupId` can be
used to express the group of the current data itself, forming a
"parent-child-grandchild" relationship chain after being used in conjunction
with `groupId`. When the user clicks on the data element in the chart, the
chart will display the drilled down data in the form of transition animation.
+In previous versions, we already support using `groupId` to represent the
group to which the current data belongs. The newly added `childGroupId` can be
used to express the group of the current data itself, forming a
\`parent-child-grandchild\` relationship chain after being used in conjunction
with `groupId`. When the user clicks on the data element in the chart, the
chart will display the drilled down data in the form of transition animation.
<md-example src="bar-multi-drilldown" width="100%" height="400" />
@@ -150,7 +150,7 @@ The ECharts [sampling](${optionPath}series-line.sampling)
configuration item all
## Added Two Languages: Arabic and Dutch
-In version 5.5.0, we added support for two languages, Arabic (AR) and Dutch
(NL). Developers can register new language packs through the
[echarts.registerLocale](~echarts.registerLocale) method.
+In version 5.5.0, we added support for two languages, Arabic (AR) and Dutch
(NL). Developers can register new language packs through the
[echarts.registerLocale](${mainSitePath}api.html#echarts.registerLocale) method.
## Tooltip Supports Specifying Container
@@ -164,10 +164,10 @@ In version 5.5.0, we added
[axisLabel.alignMin
(echarts-doc) branch master updated: tweak tooltip doc
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 f2776439 tweak tooltip doc
f2776439 is described below
commit f2776439f6408bab72cc1c5be640b8e4b20273f8
Author: plainheart
AuthorDate: Wed Feb 21 18:06:11 2024 +0800
tweak tooltip doc
---
en/option/component/tooltip.md | 18 --
zh/option/component/tooltip.md | 12 +---
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/en/option/component/tooltip.md b/en/option/component/tooltip.md
index 81676246..2b3c261b 100644
--- a/en/option/component/tooltip.md
+++ b/en/option/component/tooltip.md
@@ -199,27 +199,33 @@ Useful when tooltip is cut because of `'overflow:
hidden'` set on outer dom of c
version = "4.7.0"
) }}
-(DEPRECATED, use [appendTo](~tooltip.appendTo) instead.)
+(DEPRECATED since `v5.5.0`, use [appendTo](~tooltip.appendTo) instead.)
Whether to append the tooltip DOM element as a child of the `` of the
HTML page, when using [renderMode](~tooltip.renderMode) `'html'`.
-By default `false`, means that the tooltip DOM element will be one of a
descendant of its echarts DOM container. But that means that the tooltip might
be cut when overflow the container if some of the ancestors DOM element of the
echarts container are styled with `overflow: hidden`. This case could also be
resolved by setting [tooltip.confine](~tooltip.confine), but it might not
suitable for all scenarios.
+The default value is `false`, which means that the tooltip DOM element will be
one of a descendant of its echarts DOM container. But that means that the
tooltip might be cut when overflow the container if some of the ancestors DOM
element of the echarts container are styled with `overflow: hidden`. This case
could also be resolved by setting [tooltip.confine](~tooltip.confine), but it
might not suitable for all scenarios.
Here we provide `appendToBody: true` to auto append the tooltip element to
``, which is a common way to resolve this kind of issue. But `true` is
not set as a default value because to void to bring break change for some cases
where tooltip is deeply customized and to void some unexpected bad cases.
Note that it also works when CSS transform used.
-## appendTo() = Function | HTMLElement | string | null
+## appendTo(string|HTMLElement|Function)
{{ use: partial-version(
version = "5.5.0"
) }}
-Which DOM element to append the tooltip to. Only avaiable when using
[renderMode](~tooltip.renderMode) `'html'`.
+Which DOM element to append the tooltip to. Only available when using
[renderMode](~tooltip.renderMode) `'html'`.
-The default value is `null``, which means that the tooltip's DOM node will be
added as a descendant node of the chart’s DOM container. However, this approach
can cause the tooltip to be truncated if it extends beyond the container, due
to ancestors of the chart's DOM container having overflow: hidden set. This
issue can be partially addressed using tooltip.confine, but it may not cover
all scenarios.
+The default value is `null`, which means that the tooltip's DOM node will be
added as a descendant node of the chart’s DOM container. However, this approach
can cause the tooltip to be truncated if it extends beyond the container, due
to ancestors of the chart's DOM container having overflow: hidden set. This
issue can be partially addressed using tooltip.confine, but it may not cover
all scenarios.
-For such scenarios, `appendTo` can be specified. When it is a function, the
interface is in the form of `(chartContainer: HTMLElement) => HTMLElement |
undefined | null`, which means it returns the node that the tooltip's DOM node
should be added to. Returning `undefined` or `null` indicates that the default
logic described above should be used. Returning an HTMLElement means that it
should be added under that node.
+For such scenarios, `appendTo` can be specified. When it is a function, the
interface is in the form of
+
+```ts
+(chartContainer: HTMLElement) => HTMLElement | undefined | null
+```
+
+which means it returns the node that the tooltip's DOM node should be added
to. Returning `undefined` or `null` indicates that the default logic described
above should be used. Returning an HTMLElement means that it should be added
under that node.
Note that it also works when CSS transform used.
diff --git a/zh/option/component/tooltip.md b/zh/option/component/tooltip.md
index abedd35c..f75360d7 100644
--- a/zh/option/component/tooltip.md
+++ b/zh/option/component/tooltip.md
@@ -199,7 +199,7 @@ const option = {
version = "4.7.0"
) }}
-（已废弃，请使用 [appendTo](~tooltip.appendTo)。）
+（自 `v5.5.0` 已废弃，请使用 [appendTo](~tooltip.appendTo)。）
是否将 tooltip 的 DOM 节点添加为 HTML 的 `` 的子节点。只有当
[renderMode](~tooltip.rende
(echarts-doc) branch master updated: tweak Chinese changelog of 5.5.0
This is an automated email from the ASF dual-hosted git repository. wangzx 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 6ac7b050 tweak Chinese changelog of 5.5.0 6ac7b050 is described below commit 6ac7b0505925f8ef0cb5d4219b29c88933e1cb23 Author: plainheart AuthorDate: Wed Feb 21 16:27:24 2024 +0800 tweak Chinese changelog of 5.5.0 --- zh/changelog.md | 70 - 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/zh/changelog.md b/zh/changelog.md index 33d7a062..9a248a08 100644 --- a/zh/changelog.md +++ b/zh/changelog.md @@ -3,42 +3,42 @@ + [Break Change] [Feature] [core] 默认解析为 ESM 包。[#19513](https://github.com/apache/echarts/issues/19513) ([100pah](https://github.com/100pah)) + [Feature] [ssr] 服务器端渲染和客户端轻量运行时。[#18381](https://github.com/apache/echarts/issues/18381) ([Ovilia](https://github.com/Ovilia)) -+ [Feature] [animation] 支持多层下钻的通用动画。[#17611](https://github.com/apache/echarts/issues/17611) ([tyn1998](https://github.com/tyn1998)) -+ [Feature] [pie] 添加 `padAngle` 选项。[#19076](https://github.com/apache/echarts/issues/19076) ([linghaoSu](https://github.com/linghaoSu)) -+ [Feature] [pie] 添加 `endAngle` 以控制饼状图范围。[#18820](https://github.com/apache/echarts/issues/18820) ([linghaoSu](https://github.com/linghaoSu)) -+ [Feature] [polar] 允许设置 `angleAxis.endAngle`。[#19099](https://github.com/apache/echarts/issues/19099) ([yassilah](https://github.com/yassilah)) -+ [Feature] [sampler] 添加 min-max 采样器功能。[#19279](https://github.com/apache/echarts/issues/19279) ([snukhulov](https://github.com/snukhulov)) -+ [Feature] [i18n] 添加阿拉伯语（AR）翻译。[#19214](https://github.com/apache/echarts/issues/19214) ([OthmanAliModaes](https://github.com/OthmanAliModaes)) -+ [Feature] [i18n] 添加荷兰语（NL）翻译。[#19252](https://github.com/apache/echarts/issues/19252) ([tijmenamsing](https://github.com/tijmenamsing)) -+ [Feature] [tooltip] 添加 `appendTo` 选项，允许自定义提示工具容器。[#18436](https://github.com/apache/echarts/issues/18436) ([viking7982](https://github.com/viking7982)) -+ [Feature] [label] 支持最小/最大标签对齐。[#19228](https://github.com/apache/echarts/issues/19228) ([Ovilia](https://github.com/Ovilia)) -+ [Feature] [pictorialBar] 支持象形柱状图系列裁剪。[#19197](https://github.com/apache/echarts/issues/19197) ([Ovilia](https://github.com/Ovilia)) -+ [Feature] [tooltip] 将 `dataIndex` 添加到 `valueFormatter` 回调。[#19123](https://github.com/apache/echarts/issues/19123) ([ChepteaCatalin](https://github.com/ChepteaCatalin)) -+ [Fix] [toolbox] 修复工具箱文本无法应用指定或全局字体样式的问题。[#19170](https://github.com/apache/echarts/issues/19170) ([plainheart](https://github.com/plainheart)) -+ [Fix] [label] 修复 labelLine 在正常状态不显示，但其他状态显示的问题。[#18800](https://github.com/apache/echarts/issues/18800) ([linghaoSu](https://github.com/linghaoSu)) -+ [Fix] [labelLine] 修复饼图中 `emphasis.labelLine` 不生效的问题。[#19180](https://github.com/apache/echarts/issues/19180) ([shiersansi](https://github.com/shiersansi)) -+ [Fix] [marker] 修复当轴与 `alignWithLabel` 一起使用时，markArea 位置的问题。[#19516](https://github.com/apache/echarts/issues/19516) ([Ovilia](https://github.com/Ovilia)) -+ [Fix] [line] 修复在启用动画时，时间轴上的线可能交叉的问题。[#18960](https://github.com/apache/echarts/issues/18960) ([plainheart](https://github.com/plainheart)) -+ [Fix] [scatter] 修复由于微小偏移导致的边缘散点可能被意外裁剪的问题。[#18867](https://github.com/apache/echarts/issues/18867) ([plainheart](https://github.com/plainheart)) -+ [Fix] [sunburst] 标签旋转翻转。[#19176](https://github.com/apache/echarts/issues/19176) ([Ovilia](https://github.com/Ovilia)) -+ [Fix] [aria] 修复硬编码的系列类型名称翻译。[#19239](https://github.com/apache/echarts/issues/19239) ([Ovilia](https://github.com/Ovilia)) -+ [Feature] [matrix] 允许相对于原点以外的点进行旋转。[#1034](https://github.com/ecomfe/zrender/issues/1034) ([ChepteaCatalin](https://github.com/ChepteaCatalin)) -+ [Fix] [graph] 修复在销毁图表后，力布局迭代计时器不会停止的问题。[#19514](https://github.com/apache/echarts/issues/19514) ([plainheart](https://github.com/plainheart)) -+ [Fix] [tooltip] 修复当提示元素的父节点不存在时，可能出现的空指针异常。[#19265](https://github.com/apache/echarts/issues/19265) ([plainheart](https://github.com/plainheart)) -+ [Fix] [visualMap] 修复连续 visualMap 鼠标悬停事件除第一次连续 visualMap 外不注册的问题。[#19097](https://github.com/apache/echarts/issues/19097) ([linghaoSu](https://github.com/linghaoSu)) -+ [Fix] [clip] 在裁剪路径宽度上添加额外的空间，以防止意外裁剪。[#19056](https://github.com/apache/echarts/issues/19056) ([RexSkz](https://github.com/RexSkz)) -+ [Fix] [dataset] 修复多类型数组检测缺陷。[#19035](https://github.com/apache/echarts/issues/19035) ([linghaoSu](https://github.com/linghaoSu)) -+ [Fix] [core] 修复在开发环境中从全局对象读取默认初始化选项时可能出现的空指针异常。[#19217](https://github.com/apache/echarts/issues/19217) ([sunpm](https://github.com/sunpm)) ++ [Feature] [animation] 支持多级下钻全局过渡动画。[#17611](https://github.com/apache/echarts/issues/17611) ([tyn1998](https://github.com/tyn1998)) ++ [Feature] [pie] 新增 `padAngle
(echarts-www) branch master updated: update release announce to 5.5
This is an automated email from the ASF dual-hosted git repository. wangzx 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 5db5386c update release announce to 5.5 5db5386c is described below commit 5db5386ca5854e5218f717cacd5a8e2028624911 Author: plainheart AuthorDate: Wed Feb 21 15:00:07 2024 +0800 update release announce to 5.5 --- _jade/zh/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_jade/zh/index.jade b/_jade/zh/index.jade index 7b96d392..7dde82b2 100644 --- a/_jade/zh/index.jade +++ b/_jade/zh/index.jade @@ -40,7 +40,7 @@ block content #home-landing-animation-close-btn include ../components/svg/close.svg -section#new-version-section Apache ECharts 5.4 发布了! 查看新特性 +section#new-version-section Apache ECharts 5.5 发布了! 查看新特性 //- section#events-section //- .container - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: update download version to 5.5.0
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 eafbb6ac update download version to 5.5.0
eafbb6ac is described below
commit eafbb6aca54cd78101d35c925b9e8827b7240709
Author: Zhongxiang Wang
AuthorDate: Wed Feb 21 14:57:27 2024 +0800
update download version to 5.5.0
---
js/download.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/js/download.js b/js/download.js
index 01846710..62ec4976 100644
--- a/js/download.js
+++ b/js/download.js
@@ -1,9 +1,9 @@
//
$.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: '2023-07-18T00:00:00Z',
+publishedAt: '2024-02-18T00:00:00Z',
prerelease: false,
-name: '5.4.3'
+name: '5.5.0'
}];
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-examples) branch gh-pages updated: fix(editor): add missing ts definition for the `css` variable
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 089664f0 fix(editor): add missing ts definition for the `css` variable
089664f0 is described below
commit 089664f0876add4fde9f7d768804ef930a5d1b75
Author: plainheart
AuthorDate: Tue Feb 20 20:55:40 2024 +0800
fix(editor): add missing ts definition for the `css` variable
---
src/editor/CodeMonaco.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/editor/CodeMonaco.vue b/src/editor/CodeMonaco.vue
index 9c345be6..fbfb4402 100644
--- a/src/editor/CodeMonaco.vue
+++ b/src/editor/CodeMonaco.vue
@@ -82,6 +82,7 @@ declare global {
const ecStat: any;
const d3: any;
const myChart: echarts.ECharts
+let css: string
let option: echarts.EChartsOption
const echarts: typeof echarts
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/toolbox/saveAsImage created (now 385a817ca)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/toolbox/saveAsImage in repository https://gitbox.apache.org/repos/asf/echarts.git at 385a817ca fix(toolbox): use `typeof` keyword rather than `isFunction` util to detect if `MouseEvent` object is supported (fix unexpected replacement in https://github.com/apache/echarts/commit/53babd2b4c83e875f8df6c370b356d6b44c1919c#diff-0b91602cf047a98c67d6c4edaacbfa7399c8e0d2d4564b83ece8419d144aea84R64) This branch includes the following new commits: new 385a817ca fix(toolbox): use `typeof` keyword rather than `isFunction` util to detect if `MouseEvent` object is supported (fix unexpected replacement in https://github.com/apache/echarts/commit/53babd2b4c83e875f8df6c370b356d6b44c1919c#diff-0b91602cf047a98c67d6c4edaacbfa7399c8e0d2d4564b83ece8419d144aea84R64) 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(toolbox): use `typeof` keyword rather than `isFunction` util to detect if `MouseEvent` object is supported (fix unexpected replacement in https://github.com/apache/echarts/commit/
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch fix/toolbox/saveAsImage
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 385a817ca1e4fb516bf86f00c77722725b357215
Author: plainheart
AuthorDate: Fri Feb 16 20:53:33 2024 +0800
fix(toolbox): use `typeof` keyword rather than `isFunction` util to detect
if `MouseEvent` object is supported (fix unexpected replacement in
https://github.com/apache/echarts/commit/53babd2b4c83e875f8df6c370b356d6b44c1919c#diff-0b91602cf047a98c67d6c4edaacbfa7399c8e0d2d4564b83ece8419d144aea84R64)
---
src/component/toolbox/feature/SaveAsImage.ts | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/component/toolbox/feature/SaveAsImage.ts
b/src/component/toolbox/feature/SaveAsImage.ts
index 8777a9789..b40c9fdbc 100644
--- a/src/component/toolbox/feature/SaveAsImage.ts
+++ b/src/component/toolbox/feature/SaveAsImage.ts
@@ -17,14 +17,13 @@
* under the License.
*/
-/* global Uint8Array, document */
+/* global window, Uint8Array, document */
import env from 'zrender/src/core/env';
import { ToolboxFeature, ToolboxFeatureOption } from '../featureManager';
import { ZRColor } from '../../../util/types';
import GlobalModel from '../../../model/Global';
import ExtensionAPI from '../../../core/ExtensionAPI';
-import { isFunction } from 'zrender/src/core/util';
export interface ToolboxSaveAsImageFeatureOption extends ToolboxFeatureOption {
icon?: string
@@ -42,8 +41,6 @@ export interface ToolboxSaveAsImageFeatureOption extends
ToolboxFeatureOption {
lang?: string[]
}
-/* global window, document */
-
class SaveAsImage extends ToolboxFeature {
onclick(ecModel: GlobalModel, api: ExtensionAPI) {
@@ -61,7 +58,7 @@ class SaveAsImage extends
ToolboxFeature {
});
const browser = env.browser;
// Chrome, Firefox, New Edge
-if (isFunction(MouseEvent) && (browser.newEdge || (!browser.ie &&
!browser.edge))) {
+if (typeof MouseEvent === 'function' && (browser.newEdge ||
(!browser.ie && !browser.edge))) {
const $a = document.createElement('a');
$a.download = title + '.' + type;
$a.target = '_blank';
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) 02/02: feat(editor): support setting theme for charts via the URL parameter: `theme=themeName`
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/echarts-examples.git
commit c9bd8b9a2a1ef7843d60c3385ad5b5a6ac377883
Author: plainheart
AuthorDate: Mon Feb 5 23:11:43 2024 +0800
feat(editor): support setting theme for charts via the URL parameter:
`theme=themeName`
---
src/common/store.js | 2 ++
src/editor/Editor.vue | 2 +-
src/editor/Preview.vue| 12 +++-
src/editor/downloadExample.js | 12 ++--
src/editor/sandbox/openwith/helper.js | 4 +++-
src/editor/sandbox/setup.js | 2 +-
6 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/common/store.js b/src/common/store.js
index 59f2e3bb..268cef9b 100644
--- a/src/common/store.js
+++ b/src/common/store.js
@@ -27,6 +27,8 @@ export const store = {
version: '',
locale: '',
+ // 'light' and 'dark' are default built-in themes
+ theme: URL_PARAMS.theme === 'light' ? null : URL_PARAMS.theme,
darkMode: URL_PARAMS.theme === 'dark',
enableDecal: 'decal' in URL_PARAMS,
renderer: (() => {
diff --git a/src/editor/Editor.vue b/src/editor/Editor.vue
index 2f6e775e..ba101851 100644
--- a/src/editor/Editor.vue
+++ b/src/editor/Editor.vue
@@ -562,7 +562,7 @@ export default {
ts: store.typeCheck,
esm: this.fullCodeConfig.esm,
// legacy: true,
-theme: store.darkMode ? 'dark' : '',
+theme: store.darkMode ? 'dark' : store.theme,
renderer: store.renderer,
useDirtyRect: store.useDirtyRect,
ROOT_PATH: store.cdnRoot,
diff --git a/src/editor/Preview.vue b/src/editor/Preview.vue
index 9f59eca8..05e078e3 100644
--- a/src/editor/Preview.vue
+++ b/src/editor/Preview.vue
@@ -191,9 +191,11 @@ function getScripts(nightly) {
const code = store.runCode;
return [
+// echarts
echartsDir +
getScriptURL(SCRIPT_URLS.echartsJS) +
(store.isPR ? '?_=' + (store.prLatestCommit || Date.now()) : ''),
+// echarts-gl
...(isGL
? [
isLocal
@@ -201,18 +203,26 @@ function getScripts(nightly) {
: getScriptURL(SCRIPT_URLS.echartsGLJS)
]
: []),
+// echarts theme
+...(!store.darkMode && store.theme
+ ? [echartsDir + `/theme/${store.theme}.js`]
+ : []),
+// echarts bmap extension
...(hasBMap || /coordinateSystem.*:.*['"]bmap['"]/g.test(code)
? [
SCRIPT_URLS.bmapLibJS,
echartsDir + getScriptURL(SCRIPT_URLS.echartsBMapJS)
]
: []),
+// echarts stat
...(code.indexOf('ecStat.') > -1
? [getScriptURL(SCRIPT_URLS.echartsStatJS)]
: []),
+// echarts map
...(/map.*:.*['"]world['"]/g.test(code)
? [SCRIPT_URLS.echartsWorldMapJS]
: []),
+// data gui
...(code.indexOf('app.config') > -1 ? [SCRIPT_URLS.datGUIMinJS] : [])
].map((url) => ({ src: url }));
}
@@ -385,7 +395,7 @@ export default {
renderer: isCanvas ? null : store.renderer,
useDirtyRect: store.useDirtyRect && isCanvas ? 1 : null,
decal: store.enableDecal ? 1 : null,
-theme: store.darkMode ? 'dark' : null
+theme: store.darkMode ? 'dark' : store.theme || null
};
}
},
diff --git a/src/editor/downloadExample.js b/src/editor/downloadExample.js
index 8dd4d37b..37880360 100644
--- a/src/editor/downloadExample.js
+++ b/src/editor/downloadExample.js
@@ -13,13 +13,18 @@ export function download(sourceHeader) {
const jqueryScriptCode = hasJQueryJS
? ``
: '';
-
const echartsDir = SCRIPT_URLS[
store.echartsVersion.indexOf('dev') > -1
? 'echartsNightlyDir'
: 'echartsDir'
].replace('{{version}}', store.echartsVersion);
const echarts4Dir = SCRIPT_URLS.echartsDir.replace('{{version}}', '4.9.0');
+
+ const themeScriptCode =
+!store.darkMode && store.theme
+ ? `\n `
+ : '';
+
const code = `
@@ -35,6 +40,7 @@ ${sourceHeader}
+ ${themeScriptCode}
@@ -57,7 +63,9 @@ ${sourceHeader}
(echarts-examples) branch gh-pages updated (21994715 -> c9bd8b9a)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch gh-pages in repository https://gitbox.apache.org/repos/asf/echarts-examples.git from 21994715 use new version list API for smaller response size for Chinese example page new 0068a81e fix `histroy` -> `history` new c9bd8b9a feat(editor): support setting theme for charts via the URL parameter: `theme=themeName` The 2 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/common/store.js | 2 ++ src/editor/Editor.vue | 2 +- src/editor/Preview.vue| 12 +++- src/editor/downloadExample.js | 12 ++-- src/editor/sandbox/openwith/helper.js | 4 +++- src/editor/sandbox/setup.js | 4 ++-- 6 files changed, 29 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) 01/02: fix `histroy` -> `history`
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/echarts-examples.git
commit 0068a81eb611703a734829e60b2e00f3139541cc
Author: plainheart
AuthorDate: Mon Feb 5 22:16:58 2024 +0800
fix `histroy` -> `history`
---
src/editor/sandbox/setup.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/editor/sandbox/setup.js b/src/editor/sandbox/setup.js
index 85b64013..d50d4f95 100644
--- a/src/editor/sandbox/setup.js
+++ b/src/editor/sandbox/setup.js
@@ -279,7 +279,7 @@ function setup(isShared) {
'globalThis',
'document',
'location',
-'histroy',
+'history',
'eval',
'execScript',
'Function',
-
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: use new version list API for smaller response size for Chinese example page
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 21994715 use new version list API for smaller response size for
Chinese example page
21994715 is described below
commit 21994715f5eb26938e8e2161bace3783ad52faac
Author: plainheart
AuthorDate: Mon Feb 5 21:46:29 2024 +0800
use new version list API for smaller response size for Chinese example page
---
src/editor/Preview.vue | 38 +++---
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/editor/Preview.vue b/src/editor/Preview.vue
index 52f96b0f..9f59eca8 100644
--- a/src/editor/Preview.vue
+++ b/src/editor/Preview.vue
@@ -563,23 +563,30 @@ export default {
},
fetchVersionList() {
const isZH = store.locale === 'zh';
- const server = isZH
-? // speed up for China mainland. `data.jsdelivr.com` is very slow or
unaccessible for some ISPs.
- 'https://registry.npmmirror.com'
-: 'https://data.jsdelivr.com/v1/package/npm';
-
- const handleData = (data) => {
-if (isZH) {
- data.versions = Object.keys(data.versions).sort(rcompare);
- data.tags = data['dist-tags'];
-}
- };
+ const getVersionListAPI = (pkgName) =>
+isZH
+ ? // speed up for China mainland. `data.jsdelivr.com` is very slow
or unaccessible for some ISPs.
+// Another API is `https://registry.npmmirror.com/${pkgName}` with
a request header `Accept: application/vnd.npm.install-v1+json`.
+`https://registry.npmmirror.com/-/v1/search?text=${pkgName}=1`
+ : `https://data.jsdelivr.com/v1/package/npm/${pkgName}`;
+
+ const handleData =
+isZH &&
+((rawData) => {
+ rawData = rawData.objects[0].package;
+ const versions = rawData.versions.sort(rcompare);
+ const tags = rawData['dist-tags'];
+ return {
+versions,
+tags
+ };
+});
const prVersion = URL_PARAMS.pv;
const hasPRVersion = (this.hasPRVersion = isValidPRVersion(prVersion));
- $.getJSON(`${server}/echarts`).done((data) => {
-handleData(data);
+ $.getJSON(getVersionListAPI('echarts')).done((data) => {
+isZH && (data = handleData(data));
if (isDebug) {
console.log('echarts version data', data);
@@ -612,8 +619,9 @@ export default {
hasPRVersion && versions.unshift(prVersion);
});
- $.getJSON(`${server}/echarts-nightly`).done((data) => {
-handleData(data);
+ // TODO lazy load when needed
+ $.getJSON(getVersionListAPI('echarts-nightly')).done((data) => {
+isZH && (data = handleData(data));
if (isDebug) {
console.log('echarts-nightly version data', data);
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: chore: update workflow deps
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git The following commit(s) were added to refs/heads/master by this push: new 007afe8 chore: update workflow deps 007afe8 is described below commit 007afe8e872cd30043072a50f71b99931205267b Author: plainheart AuthorDate: Sat Feb 3 10:14:16 2024 +0800 chore: update workflow deps --- .github/workflows/deploy.yml | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 775c221..1194da7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,16 +10,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout ️ -uses: actions/checkout@v3 +uses: actions/checkout@v4 #with: # for generating contributors from all commit histories # Not using git log currently # fetch-depth: 0 - name: Setup Node.js -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 18 + registry-url: https://registry.npmjs.org/ - name: Install and Build run: | - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: fix deps
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git The following commit(s) were added to refs/heads/master by this push: new 87559de fix deps 87559de is described below commit 87559deaedafe1a282972aa5c7227a9596a94b85 Author: plainheart AuthorDate: Sat Feb 3 10:12:39 2024 +0800 fix deps --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index ee6e877..b981883 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "@nuxtjs/tailwindcss": "^4.1.2", "babel-eslint": "^10.1.0", "cheerio": "^1.0.0-rc.12", +"cross-env": "^7.0.3", "eslint": "^8.27.0", "eslint-plugin-nuxt": "^4.0.0", "eslint-plugin-prettier": "^4.2.1", - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: fix nuxt command can't start in node > 16
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new 4aecc87 fix nuxt command can't start in node > 16
4aecc87 is described below
commit 4aecc8740ed6ace0c7ee9d515d2f2eee7157d9aa
Author: plainheart
AuthorDate: Sat Feb 3 10:10:55 2024 +0800
fix nuxt command can't start in node > 16
---
package-lock.json | 28
package.json | 12 ++--
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index e209295..40e38d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,6 +37,7 @@
"@nuxtjs/tailwindcss": "^4.1.2",
"babel-eslint": "^10.1.0",
"cheerio": "^1.0.0-rc.12",
+"cross-env": "^7.0.3",
"eslint": "^8.27.0",
"eslint-plugin-nuxt": "^4.0.0",
"eslint-plugin-prettier": "^4.2.1",
@@ -5973,6 +5974,24 @@
"resolved":
"https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz;,
"integrity":
"sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
},
+"node_modules/cross-env": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz;,
+ "integrity":
"sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "dev": true,
+ "dependencies": {
+"cross-spawn": "^7.0.1"
+ },
+ "bin": {
+"cross-env": "src/bin/cross-env.js",
+"cross-env-shell": "src/bin/cross-env-shell.js"
+ },
+ "engines": {
+"node": ">=10.14",
+"npm": ">=6",
+"yarn": ">=1"
+ }
+},
"node_modules/cross-spawn": {
"version": "7.0.3",
"resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz;,
@@ -24201,6 +24220,15 @@
"resolved":
"https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz;,
"integrity":
"sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
},
+"cross-env": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz;,
+ "integrity":
"sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "dev": true,
+ "requires": {
+"cross-spawn": "^7.0.1"
+ }
+},
"cross-spawn": {
"version": "7.0.3",
"resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz;,
diff --git a/package.json b/package.json
index b863b66..ee6e877 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,13 @@
"description": "Apache ECharts Handbook",
"license": "Apache-2.0",
"scripts": {
-"dev": "nuxt",
-"start": "nuxt start",
+"dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt",
+"start": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt start",
"prepare-generate": "node build/generate-contributors.js && node
build/generate",
-"build:gh": "npm run prepare-generate && NUXT_ENV_DEPLOY=gh nuxt generate",
-"build:local": "npm run prepare-generate && NUXT_ENV_DEPLOY=local nuxt
generate",
-"build:localsite": "npm run prepare-generate && NUXT_ENV_DEPLOY=localsite
nuxt generate",
-"build:asf": "npm run prepare-generate && NUXT_ENV_DEPLOY=asf nuxt
generate"
+"build:gh": "npm run prepare-generate && cross-env
NODE_OPTIONS=--openssl-legacy-provider NUXT_ENV_DEPLOY=gh nuxt generate",
+"build:local": "npm run prepare-generate && cross-env
NODE_OPTIONS=--openssl-legacy-provider NUXT_ENV_DEPLOY=local nuxt generate",
+"build:localsite": "npm run prepare-generate && cross-env
NODE_OPTIONS=--openssl-legacy-provider NUXT_ENV_DEPLOY=localsite nuxt generate",
+"build:asf": "npm run prepare-generate && cross-env
NODE_OPTIONS=--openssl-legacy-provider NUXT_ENV_DEPLOY=asf nuxt generate"
},
"dependencies": {
"@nuxt/types": "^2.15.8",
-
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: fix webpack can't work in node > 16
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 2da47829 fix webpack can't work in node > 16
2da47829 is described below
commit 2da4782973ce5298ae2c505472d7af55d0554ddc
Author: plainheart
AuthorDate: Sat Feb 3 09:54:50 2024 +0800
fix webpack can't work in node > 16
---
package-lock.json | 19 +++
package.json | 7 ---
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d93cb3c1..23f3d254 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,6 +33,7 @@
"babel-loader": "^8.1.0",
"chalk": "^3.0.0",
"concurrently": "^5.3.0",
+"cross-env": "^7.0.3",
"css-loader": "^3.5.3",
"cwebp-bin": "^6.1.1",
"download-git-repo": "^3.0.2",
@@ -3340,6 +3341,24 @@
"node": ">=0.10.0"
}
},
+"node_modules/cross-env": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz;,
+ "integrity":
"sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "dev": true,
+ "dependencies": {
+"cross-spawn": "^7.0.1"
+ },
+ "bin": {
+"cross-env": "src/bin/cross-env.js",
+"cross-env-shell": "src/bin/cross-env-shell.js"
+ },
+ "engines": {
+"node": ">=10.14",
+"npm": ">=6",
+"yarn": ">=1"
+ }
+},
"node_modules/cross-spawn": {
"version": "7.0.3",
"dev": true,
diff --git a/package.json b/package.json
index a03b463c..a1030f7d 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,11 @@
"license": "Apache-2.0",
"private": true,
"scripts": {
-"build": "npx webpack --config build/webpack.config.js --mode production",
-"watch": "npx webpack --config build/webpack.config.js --mode development
--devtool source-map --watch",
+"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider webpack
--config build/webpack.config.js --mode production",
+"watch": "cross-env NODE_OPTIONS=--openssl-legacy-provider webpack
--config build/webpack.config.js --mode development --devtool source-map
--watch",
"localsite": "npm run compile:example && npm run build && node
build/copyResource.js --env localsite",
"release": "npm run compile:example && npm run build && node
build/copyResource.js --env asf",
-"dev": "npx concurrently --kill-others \"npm:watch\" \"npm:server\"",
+"dev": "concurrently --kill-others \"npm:watch\" \"npm:server\"",
"build:example": "npm run compile:example && node tool/build-example.js &&
node tool/build-example.js --gl",
"build:examplelist": "npm run compile:example && node
tool/build-example.js --no-thumb && node tool/build-example.js --no-thumb --gl",
"compile:example": "node tool/compile-example.js",
@@ -29,6 +29,7 @@
"babel-loader": "^8.1.0",
"chalk": "^3.0.0",
"concurrently": "^5.3.0",
+"cross-env": "^7.0.3",
"css-loader": "^3.5.3",
"cwebp-bin": "^6.1.1",
"download-git-repo": "^3.0.2",
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch master updated: chore: update workflow deps
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 04335d6b chore: update workflow deps
04335d6b is described below
commit 04335d6b85f7bfd12840376ddb0345a6f04d9496
Author: plainheart
AuthorDate: Sat Feb 3 09:44:47 2024 +0800
chore: update workflow deps
---
.github/workflows/nodejs.yml | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index a9dcf45b..0a92f683 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -10,19 +10,18 @@ jobs:
runs-on: ubuntu-latest
-strategy:
- matrix:
-node-version: [12.x]
-
steps:
- - uses: actions/checkout@v2
- - name: Use Node.js ${{ matrix.node-version }}
-uses: actions/setup-node@v2
+ - uses: actions/checkout@v4
+
+ - uses: actions/setup-node@v4
with:
- node-version: ${{ matrix.node-version }}
- - name: npm install and build
+ node-version: 18
+ registry-url: https://registry.npmjs.org/
+
+ - name: Build
run: |
npm install
+ npm run build:site
node build.js --env dev
env:
CI: true
-
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 webpack bundle can't work in node > 16
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 27d6073e fix webpack bundle can't work in node > 16
27d6073e is described below
commit 27d6073e7d2d09f616b7ed6772c907cada106a1e
Author: plainheart
AuthorDate: Sat Feb 3 09:36:53 2024 +0800
fix webpack bundle can't work in node > 16
---
package-lock.json | 28
package.json | 5 +++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 516ccf7e..58a8609c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,6 +28,7 @@
"chalk": "^3.0.0",
"concurrently": "^7.4.0",
"copy-dir": "^0.3.0",
+"cross-env": "^7.0.3",
"css-loader": "^3.5.3",
"file-loader": "^4.3.0",
"fs-extra": "^8.1.0",
@@ -3457,6 +3458,24 @@
"sha.js": "^2.4.8"
}
},
+"node_modules/cross-env": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz;,
+ "integrity":
"sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "dev": true,
+ "dependencies": {
+"cross-spawn": "^7.0.1"
+ },
+ "bin": {
+"cross-env": "src/bin/cross-env.js",
+"cross-env-shell": "src/bin/cross-env-shell.js"
+ },
+ "engines": {
+"node": ">=10.14",
+"npm": ">=6",
+"yarn": ">=1"
+ }
+},
"node_modules/cross-spawn": {
"version": "7.0.3",
"resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz;,
@@ -11802,6 +11821,15 @@
"sha.js": "^2.4.8"
}
},
+"cross-env": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz;,
+ "integrity":
"sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "dev": true,
+ "requires": {
+"cross-spawn": "^7.0.1"
+ }
+},
"cross-spawn": {
"version": "7.0.3",
"resolved":
"https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz;,
diff --git a/package.json b/package.json
index f79e7110..45ba5db6 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,8 @@
"build": "node build.js --env asf",
"watch": "node build.js --env dev --watch",
"localsite": "node build.js --env localsite",
-"build:site": "npx webpack --config build/webpack.config.js --mode
production",
-"watch:site": "npx webpack --config build/webpack.config.js --mode
development --devtool sourcemap --watch",
+"build:site": "cross-env NODE_OPTIONS=--openssl-legacy-provider webpack
--config build/webpack.config.js --mode production",
+"watch:site": "cross-env NODE_OPTIONS=--openssl-legacy-provider webpack
--config build/webpack.config.js --mode development --devtool sourcemap
--watch",
"server": "node server.js",
"format": "node tool/format.js",
"dev": "npx concurrently --kill-others \"npm:watch\" \"npm:watch:site\"
\"npm:server\""
@@ -24,6 +24,7 @@
"chalk": "^3.0.0",
"concurrently": "^7.4.0",
"copy-dir": "^0.3.0",
+"cross-env": "^7.0.3",
"css-loader": "^3.5.3",
"file-loader": "^4.3.0",
"fs-extra": "^8.1.0",
-
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: remove purge-cdn workflow & update action deps
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 19568cbc8 chore: remove purge-cdn workflow & update action deps
19568cbc8 is described below
commit 19568cbc8de4570ccc9bdbff6ee32096d001b211
Author: Zhongxiang Wang
AuthorDate: Sat Feb 3 09:03:09 2024 +0800
chore: remove purge-cdn workflow & update action deps
---
.github/workflows/check-links.yml | 14 +-
.github/workflows/deploy.yml | 10 +++
.github/workflows/purge-cdn.yml | 32 ---
.scripts/package.json | 3 +--
.scripts/purgeCDN.js | 55 ---
5 files changed, 12 insertions(+), 102 deletions(-)
diff --git a/.github/workflows/check-links.yml
b/.github/workflows/check-links.yml
index bb3351766..71a8ca408 100644
--- a/.github/workflows/check-links.yml
+++ b/.github/workflows/check-links.yml
@@ -10,17 +10,15 @@ jobs:
build:
runs-on: ubuntu-latest
-strategy:
- matrix:
-node-version: [12.x]
-
steps:
- - uses: actions/checkout@v2
- - name: Use Node.js ${{ matrix.node-version }}
-uses: actions/setup-node@v2
+ - uses: actions/checkout@v4
+
+ - uses: actions/setup-node@v4
with:
+ node-version: 18
registry-url: https://registry.npmjs.org/
- - name: Check links
+
+ - name: Check Links
run: |
npm i
node checkLinks.js
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5ac5447eb..7b3712272 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,12 +8,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout ️
-uses: actions/checkout@v3
+uses: actions/checkout@v4
- name: Setup Node.js
-uses: actions/setup-node@v3
+uses: actions/setup-node@v4
with:
- node-version: 16
+ node-version: 18
+ registry-url: https://registry.npmjs.org/
- name: Prepare workspace
run: mkdir tmp-workspace
@@ -49,11 +50,10 @@ jobs:
- name: Install ECharts Handbook
working-directory: tmp-workspace
run: |
- git clone https://github.com/apache/echarts-handbook
+ git clone --depth 1 https://github.com/apache/echarts-handbook
cd echarts-handbook
npm install
-
- name: Build
working-directory: tmp-workspace
run: |
diff --git a/.github/workflows/purge-cdn.yml b/.github/workflows/purge-cdn.yml
deleted file mode 100644
index a39a08133..0
--- a/.github/workflows/purge-cdn.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Check Changed Files & Purge CDN
-
-on:
- push:
-branches: [ asf-site ]
-
- workflow_dispatch:
-
-jobs:
- 'Check-Changed-Files-Purge-CDN':
-runs-on: ubuntu-latest
-
-steps:
- - uses: actions/checkout@v2
-with:
- fetch-depth: 2
-
- - name: Get changed files
-id: changed-files
-uses: tj-actions/changed-files@v1.1.2
-with:
- separator: ","
- files: |
-^[^\.]
-
- - name: Purge changed files
-run: |
- npm i
- node purgeCDN.js --files ${{
steps.changed-files.outputs.all_modified_files }}
-working-directory: .scripts
-
-
diff --git a/.scripts/package.json b/.scripts/package.json
index 818aa3a90..befa8b987 100644
--- a/.scripts/package.json
+++ b/.scripts/package.json
@@ -5,7 +5,6 @@
"globby": "^11.0.3"
},
"devDependencies": {
-"node-fetch": "^2.6.1",
-"minimist": "^1.2.5"
+"node-fetch": "^2.6.1"
}
}
diff --git a/.scripts/purgeCDN.js b/.scripts/purgeCDN.js
deleted file mode 100644
index ab6a5abf9..0
--- a/.scripts/purgeCDN.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// TODO no permission to run non-verified action
-
-const {runTasks} = require('./task');
-const fetch = require('node-fetch').default;
-const argv = require('minimist')(process.argv.slice(2));
-
-const files = typeof argv.files === 'string' && argv.files.split(',');
-
-if (!files || !files.length) {
-return console.log('No files to be purged');
-}
-
-function getCdnUrl(fileUrl) {
-return
`https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/${fileUrl}`;
-}
-
-function getPurgeUrl(fileUrl) {
-return
`https://purge.jsdelivr.net/gh/apache/echarts-website@asf-site/${fileUrl}`;
-}
-
-function purge(url) {
-return fetch(encodeURI(url))
-.then(res => res.json())
-.then(res => {
-if (res.status === 'finished') {
-console.log('Purged', url);
-}
-else {
-
(echarts) branch release-dev deleted (was b7548af6a)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch release-dev in repository https://gitbox.apache.org/repos/asf/echarts.git was b7548af6a chore: add a key 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) 01/01: Merge pull request #19577 from apache/release-dev
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch release in repository https://gitbox.apache.org/repos/asf/echarts.git commit 3fbfd2bcac34f21726fc4cc8d12d4366d1c0210e Merge: 4d3bbaefa b7548af6a Author: Zhongxiang Wang AuthorDate: Wed Jan 31 17:42:24 2024 +0800 Merge pull request #19577 from apache/release-dev chore: add a key KEYS | 58 ++ 1 file changed, 58 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch release updated (4d3bbaefa -> 3fbfd2bca)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/echarts.git from 4d3bbaefa Merge pull request #19568 from apache/fix-jest add b7548af6a chore: add a key new 3fbfd2bca Merge pull request #19577 from apache/release-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: KEYS | 58 ++ 1 file changed, 58 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch revert-19567-chore-source-release created (now 0e30eac78)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch revert-19567-chore-source-release in repository https://gitbox.apache.org/repos/asf/echarts.git at 0e30eac78 Revert "chore: add source release debug file" This branch includes the following new commits: new 0e30eac78 Revert "chore: add source release debug file" 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: Revert "chore: add source release debug file"
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch revert-19567-chore-source-release
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 0e30eac78e6eb1d0b12d2fcc687195e2ad43cf02
Author: Zhongxiang Wang
AuthorDate: Wed Jan 31 02:16:41 2024 +0800
Revert "chore: add source release debug file"
---
.github/workflows/source-release-debug.yml | 137 -
1 file changed, 137 deletions(-)
diff --git a/.github/workflows/source-release-debug.yml
b/.github/workflows/source-release-debug.yml
deleted file mode 100644
index 1a0fa724e..0
--- a/.github/workflows/source-release-debug.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-name: Source Release Debug
-
-on:
- workflow_dispatch: {}
-
-jobs:
- materials:
-runs-on: ubuntu-latest
-if: ${{ github.repository_owner == 'apache' }}
-
-strategy:
- matrix:
-node-version: [18.x]
-
-steps:
- - uses: actions/checkout@v4
-
- - name: Use Node.js ${{ matrix.node-version }}
-uses: actions/setup-node@v4
-with:
- node-version: ${{ matrix.node-version }}
-
- - name: Prepare env
-run: |
- echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
- - name: Cache node modules
-uses: actions/cache@v3
-env:
- cache-name: cache-node-modules
-with:
- # npm cache files are stored in `~/.npm` on Linux/macOS
- path: ~/.npm
- key: ${{ runner.os }}-build-${{ env.cache-name }}-${{
hashFiles('**/package-lock.json') }}
-
- - name: Prepare release materials
-run: |
- npm i
- node build/source-release/prepareReleaseMaterials.js \
---rcversion ${{env.RELEASE_VERSION}} \
---commit ${{github.sha}} \
---repo ${{github.repository}} \
---out tmp/materials
-
- - name: Archive materials
-uses: actions/upload-artifact@v3
-with:
- name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
- path: |
-tmp/materials/*
-
- source:
-runs-on: ubuntu-latest
-needs: materials
-
-strategy:
- matrix:
-node-version: [18.x]
-
-steps:
- - uses: actions/checkout@v4
-
- - name: Use Node.js ${{ matrix.node-version }}
-uses: actions/setup-node@v4
-with:
- node-version: ${{ matrix.node-version }}
-
- - name: Prepare env
-run: |
- echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
- # Get RELEASE_NOTE.txt and pack it into zip.
- - name: Download materials
-uses: actions/download-artifact@v3
-with:
- name: apache-echarts-${{env.RELEASE_VERSION}}-release-materials
-
- # TODO Check release version is RC
-
- # Archive before run others to avoid packing unknown files.
- - name: Archive source release
-uses: actions/upload-artifact@v3
-with:
- name: apache-echarts-${{env.RELEASE_VERSION}}-src
- path: |
-index.d.ts
-src/
-extension-src/
-ssr/client/src/
-licenses/
-theme/
-build/
-!build/source-release
-package.json
-package-lock.json
-LICENSE
-NOTICE
-README.md
-tsconfig.json
-test/ut
-test/types
-test/check-build.html
-RELEASE_NOTE.txt
-
-
- validate-source:
-runs-on: ubuntu-latest
-needs: source
-
-strategy:
- matrix:
-node-version: [18.x]
-
-steps:
- - name: Use Node.js ${{ matrix.node-version }}
-uses: actions/setup-node@v4
-with:
- node-version: ${{ matrix.node-version }}
-
- - name: Prepare env
-run: |
- echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
- - name: Download source release
-uses: actions/download-artifact@v3
-with:
- name: apache-echarts-${{env.RELEASE_VERSION}}-src
- path: tmp/echarts
-
- - name: Build source release
-run: |
- npm ci
- npx jest --version
- npm run release
- npm run test
- npm run test:dts
-working-directory: tmp/echarts
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix-jest created (now fde9fbdbc)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix-jest in repository https://gitbox.apache.org/repos/asf/echarts.git at fde9fbdbc fix(test): rename `jest.config.js` to `jest.config.cjs` to fix jest can't run This branch includes the following new commits: new fde9fbdbc fix(test): rename `jest.config.js` to `jest.config.cjs` to fix jest can't run 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(test): rename `jest.config.js` to `jest.config.cjs` to fix jest can't run
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch fix-jest
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit fde9fbdbc9809b509c13f3e1feb4b81788bb495b
Author: plainheart
AuthorDate: Wed Jan 31 01:23:14 2024 +0800
fix(test): rename `jest.config.js` to `jest.config.cjs` to fix jest can't
run
---
package.json| 6 +++---
test/ut/{jest.config.js => jest.config.cjs} | 0
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 64345cde8..4d813d42a 100644
--- a/package.json
+++ b/package.json
@@ -52,9 +52,9 @@
"release": "npm run build:lib && npm run build:i18n && npm run build &&
npm run build:esm && npm run build:extension && npm run build:ssr",
"help": "node build/build.js --help",
"test:visual": "node test/runTest/server.js",
-"test": "npx jest --config test/ut/jest.config.js",
-"test:single": "npx jest --config test/ut/jest.config.js --coverage=false
-t",
-"test:single:debug": "npx --node-arg=--inspect-brk jest --runInBand
--config test/ut/jest.config.js --coverage=false -t",
+"test": "npx jest --config test/ut/jest.config.cjs",
+"test:single": "npx jest --config test/ut/jest.config.cjs --coverage=false
-t",
+"test:single:debug": "npx --node-arg=--inspect-brk jest --runInBand
--config test/ut/jest.config.cjs --coverage=false -t",
"test:dts": "node build/testDts.js",
"mktest": "node test/build/mktest.js",
"mktest:help": "node test/build/mktest.js -h",
diff --git a/test/ut/jest.config.js b/test/ut/jest.config.cjs
similarity index 100%
rename from test/ut/jest.config.js
rename to test/ut/jest.config.cjs
-
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 #19567 from apache/chore-source-release
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 5cd6322b812d80fd5d3b4a0d95c24f7c05e3430f Merge: 6b8fae82e 39a690e16 Author: Zhongxiang Wang AuthorDate: Tue Jan 30 22:26:54 2024 +0800 Merge pull request #19567 from apache/chore-source-release chore: add source release debug file .github/workflows/source-release-debug.yml | 137 + 1 file changed, 137 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (6b8fae82e -> 5cd6322b8)
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
from 6b8fae82e Merge pull request #19513 from apache/module_default_esm
add dadc3ce7e chore: add source release debug file
add 39a690e16 chore: log jest version
new 5cd6322b8 Merge pull request #19567 from apache/chore-source-release
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/{source-release.yml => source-release-debug.yml} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
copy .github/workflows/{source-release.yml => source-release-debug.yml} (97%)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-bot) branch master updated: chore: update deps
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bot.git
The following commit(s) were added to refs/heads/master by this push:
new b0b0048 chore: update deps
b0b0048 is described below
commit b0b004894b78de9b92926d1efe63c6aa8b7e20ef
Author: plainheart
AuthorDate: Sun Jan 28 03:54:15 2024 +0800
chore: update deps
---
package-lock.json | 14 +++---
package.json | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index c11ada3..110c730 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"license": "Apache-2.0",
"dependencies": {
"@plainheart/google-translate-api": "^1.2.0",
-"bing-translate-api": "^2.10.0",
+"bing-translate-api": "^4.0.0",
"franc-min": "5.0.0",
"probot": "^12.3.3"
},
@@ -2584,9 +2584,9 @@
}
},
"node_modules/bing-translate-api": {
- "version": "2.10.0",
- "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-2.10.0.tgz;,
- "integrity":
"sha512-jAxLMMftjB9KizG/IqUz+pyfB6n4Q8zu7LVgbAULeHbBvOy+Enwxm+f2uNrKTeiO4tKhNqi13Kjk29DOc+q/zw==",
+ "version": "4.0.0",
+ "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.0.tgz;,
+ "integrity":
"sha512-nikKZQwhO+UCHPWIbMMvK1Idpsv/tXAcE4rLVlM1VcDc7e5Z58N7IhtQNkCTZ2M4Gj45j1u2nhK1R+9L6tppAw==",
"dependencies": {
"got": "^11.8.6"
}
@@ -11348,9 +11348,9 @@
"dev": true
},
"bing-translate-api": {
- "version": "2.10.0",
- "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-2.10.0.tgz;,
- "integrity":
"sha512-jAxLMMftjB9KizG/IqUz+pyfB6n4Q8zu7LVgbAULeHbBvOy+Enwxm+f2uNrKTeiO4tKhNqi13Kjk29DOc+q/zw==",
+ "version": "4.0.0",
+ "resolved":
"https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.0.tgz;,
+ "integrity":
"sha512-nikKZQwhO+UCHPWIbMMvK1Idpsv/tXAcE4rLVlM1VcDc7e5Z58N7IhtQNkCTZ2M4Gj45j1u2nhK1R+9L6tppAw==",
"requires": {
"got": "^11.8.6"
}
diff --git a/package.json b/package.json
index 3b809bb..8cc89e7 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
},
"dependencies": {
"@plainheart/google-translate-api": "^1.2.0",
-"bing-translate-api": "^2.10.0",
+"bing-translate-api": "^4.0.0",
"franc-min": "5.0.0",
"probot": "^12.3.3"
},
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch module_default_esm_fix deleted (was d403486da)
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a change to branch module_default_esm_fix
in repository https://gitbox.apache.org/repos/asf/echarts.git
was d403486da fix: (1) fix that some old version bundler (like rollup) do
not recognize wildcard that not at the end of the patter string (e.g. "exports:
{"./*.js": "xxx"}"). (2) Add readme to package.json.
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-website) branch asf-site updated: update main.css
This is an automated email from the ASF dual-hosted git repository.
wangzx 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 3e0d6f914 update main.css
3e0d6f914 is described below
commit 3e0d6f9145175eae28587bd5ffc9885cf242a2b0
Author: Zhongxiang Wang
AuthorDate: Sat Jan 20 22:29:38 2024 +0800
update main.css
---
zh/css/main.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zh/css/main.css b/zh/css/main.css
index ed149aba0..766a99ac8 100644
--- a/zh/css/main.css
+++ b/zh/css/main.css
@@ -1 +1 @@
-@font-face{font-family:'iconfont';src:url("font/iconfont.eot");src:url("font/iconfont.eot?#iefix")
format("embedded-opentype"),url("font/iconfont.woff")
format("woff"),url("font/iconfont.ttf")
format("truetype"),url("font/iconfont.svg#iconfont")
format("svg")}.iconfont{font-family:"iconfont"
!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@font-face{font-family:'Open
Sa [...]
+@font-face{font-family:'iconfont';src:url("font/iconfont.eot");src:url("font/iconfont.eot?#iefix")
format("embedded-opentype"),url("font/iconfont.woff")
format("woff"),url("font/iconfont.ttf")
format("truetype"),url("font/iconfont.svg#iconfont")
format("svg")}.iconfont{font-family:"iconfont"
!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@font-face{font-family:'Open
Sa [...]
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
