(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
(echarts-www) branch master updated: set `font-display` to `swap`
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 18183c0f set `font-display` to `swap` 18183c0f is described below commit 18183c0fc1d82a29f2ea9d81e0b93c3e920b3dc3 Author: plainheart AuthorDate: Sat Jan 20 22:12:15 2024 +0800 set `font-display` to `swap` --- _scss/main.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_scss/main.scss b/_scss/main.scss index 47180c13..fbc04da4 100644 --- a/_scss/main.scss +++ b/_scss/main.scss @@ -22,6 +22,7 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; +font-display: swap; src: url(font/OpenSans-Regular.ttf) format('truetype'); } @@ -29,6 +30,7 @@ font-family: 'Open Sans'; font-style: bold; font-weight: 800; +font-display: swap; src: url(font/OpenSans-Bold.ttf) format('truetype'); } - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch import-liftColor-from-zrender created (now a2efa5744)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch import-liftColor-from-zrender in repository https://gitbox.apache.org/repos/asf/echarts.git at a2efa5744 refactor(util): import `liftColor` function from zrender (ecomfe/zrender#999) This branch includes the following new commits: new a2efa5744 refactor(util): import `liftColor` function from zrender (ecomfe/zrender#999) 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: refactor(util): import `liftColor` function from zrender (ecomfe/zrender#999)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch import-liftColor-from-zrender in repository https://gitbox.apache.org/repos/asf/echarts.git commit a2efa574487a744e546b82fbee9229fc80776043 Author: plainheart AuthorDate: Fri Jan 19 10:38:57 2024 +0800 refactor(util): import `liftColor` function from zrender (ecomfe/zrender#999) --- src/util/states.ts | 32 ++-- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/util/states.ts b/src/util/states.ts index 3a8ad4502..3c8675dd4 100644 --- a/src/util/states.ts +++ b/src/util/states.ts @@ -19,7 +19,6 @@ */ import { Dictionary } from 'zrender/src/core/types'; -import LRU from 'zrender/src/core/LRU'; import Displayable, { DisplayableState } from 'zrender/src/graphic/Displayable'; import { PatternObject } from 'zrender/src/graphic/Pattern'; import { GradientObject } from 'zrender/src/graphic/Gradient'; @@ -45,13 +44,10 @@ import { isObject, keys, isArray, -each, -isString, -isGradientObject, -map +each } from 'zrender/src/core/util'; import { getECData } from './innerStore'; -import * as colorTool from 'zrender/src/tool/color'; +import { liftColor } from 'zrender/src/tool/color'; import SeriesData from '../data/SeriesData'; import SeriesModel from '../model/Series'; import { CoordinateSystemMaster, CoordinateSystem } from '../coord/CoordinateSystem'; @@ -109,30 +105,6 @@ type ExtendedDisplayable = Displayable & ExtendedProps; function hasFillOrStroke(fillOrStroke: string | PatternObject | GradientObject) { return fillOrStroke != null && fillOrStroke !== 'none'; } -// Most lifted color are duplicated. -const liftedColorCache = new LRU(100); -function liftColor(color: GradientObject): GradientObject; -function liftColor(color: string): string; -function liftColor(color: string | GradientObject): string | GradientObject { -if (isString(color)) { -let liftedColor = liftedColorCache.get(color); -if (!liftedColor) { -liftedColor = colorTool.lift(color, -0.1); -liftedColorCache.put(color, liftedColor); -} -return liftedColor; -} -else if (isGradientObject(color)) { -const ret = extend({}, color) as GradientObject; -ret.colorStops = map(color.colorStops, stop => ({ -offset: stop.offset, -color: colorTool.lift(stop.color, -0.1) -})); -return ret; -} -// Change nothing. -return color; -} function doChangeHoverState(el: ECElement, stateName: DisplayState, hoverStateEnum: 0 | 1 | 2) { if (el.onHoverStateChange && (el.hoverState || 0) !== hoverStateEnum) { - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/mark-area deleted (was 3a056bde1)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/mark-area in repository https://gitbox.apache.org/repos/asf/echarts.git was 3a056bde1 fix(markArea): fix markArea position when axis is with alignWithLabel 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 #19516 from apache/fix/mark-area
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 53bb9ff2f1140762e2c4ffe9eb356fdfc62958df Merge: 6cae00c7b 3a056bde1 Author: Zhongxiang Wang AuthorDate: Tue Jan 16 18:04:16 2024 +0800 Merge pull request #19516 from apache/fix/mark-area fix(marker): fix markArea position when axis is with `alignWithLabel` src/chart/bar/BaseBarSeries.ts | 3 +- test/markArea.html | 308 - 2 files changed, 309 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (6cae00c7b -> 53bb9ff2f)
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 6cae00c7b Merge pull request #19514 from apache/fix/graph-dispose add 3a056bde1 fix(markArea): fix markArea position when axis is with alignWithLabel new 53bb9ff2f Merge pull request #19516 from apache/fix/mark-area The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/chart/bar/BaseBarSeries.ts | 3 +- test/markArea.html | 308 - 2 files changed, 309 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/graph-dispose created (now 690ebe6ee)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/graph-dispose in repository https://gitbox.apache.org/repos/asf/echarts.git at 690ebe6ee fix(graph): fix force layout iteration timer doesn't stop after disposing the chart This branch includes the following new commits: new 690ebe6ee fix(graph): fix force layout iteration timer doesn't stop after disposing the chart 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(graph): fix force layout iteration timer doesn't stop after disposing the chart
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch fix/graph-dispose in repository https://gitbox.apache.org/repos/asf/echarts.git commit 690ebe6ee6c3f914718d466942f1884252b8e0ea Author: plainheart AuthorDate: Tue Jan 16 05:23:54 2024 +0800 fix(graph): fix force layout iteration timer doesn't stop after disposing the chart --- src/chart/graph/GraphView.ts | 8 - test/graph-case.html | 57 +++- test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/graph-case.json | 2 +- 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/src/chart/graph/GraphView.ts b/src/chart/graph/GraphView.ts index d5f51eba4..f4559521f 100644 --- a/src/chart/graph/GraphView.ts +++ b/src/chart/graph/GraphView.ts @@ -208,6 +208,8 @@ class GraphView extends ChartView { } dispose() { +this.remove(); + this._controller && this._controller.dispose(); this._controllerHost = null; } @@ -300,7 +302,11 @@ class GraphView extends ChartView { this._lineDraw.updateLayout(); } -remove(ecModel: GlobalModel, api: ExtensionAPI) { +remove() { +clearTimeout(this._layoutTimeout); +this._layouting = false; +this._layoutTimeout = null; + this._symbolDraw && this._symbolDraw.remove(); this._lineDraw && this._lineDraw.remove(); } diff --git a/test/graph-case.html b/test/graph-case.html index 7f199f5a4..4523593c7 100644 --- a/test/graph-case.html +++ b/test/graph-case.html @@ -39,7 +39,7 @@ under the License. - + @@ -154,6 +154,61 @@ under the License. }); + +require(['echarts'], function (echarts) { +var option = { +series: [{ +type: 'graph', +layout: 'force', +roam: true, +data: [ +{ +name: 'Node 1', +x: 300, +y: 300 +}, +{ +name: 'Node 2', +x: 800, +y: 300 +} +], +links: [ +{ +source: 'Node 1', +target: 'Node 2' +} +] +}] +}; + +var chart = testHelper.create(echarts, 'main2', { +title: [ +'Layout timer should stop after disposing chart' +], +buttons: [ +{ +text: 'Dispose', +onclick() { +const seriesModel = chart.getModel().getSeriesByType('graph')[0] +const graphView = chart.getViewOfSeriesModel(seriesModel) + +const container = chart.getDom() + +chart.dispose() + +if (graphView._layoutTimeout) { +const errMsg = 'Graph layout timer is not removed after disposing the chart!' +container.innerHTML = '<b style="color: red">' + errMsg + '</b>' +throw new Error(errMsg) +} +} +} +], +option: option +}); +}); + diff --git a/test/runTest/actions/__meta__.json b/test/runTest/actions/__meta__.json index fb743cb9c..8592bb1be 100644 --- a/test/runTest/actions/__meta__.json +++ b/test/runTest/actions/__meta__.json @@ -101,7 +101,7 @@ "geoScatter": 1, "getOption": 1, "graph": 2, - "graph-case": 1, + "graph-case": 2, "graph-grid": 1, "graph-simple": 2, "graphic-animation": 1, diff --git a/test/runTest/actions/graph-case.json b/test/runTest/actions/graph-case.json index ace16dc41..a4f345849 100644 --- a/test/runTest/actions/graph-case.json +++ b/test/runTest/actions/graph-case.json @@ -1 +1 @@ -[{"name":"Action 1","ops":[{"type":"mousemove","time":475,"x&quo
(echarts) branch master updated: Fix ValueAxisBaseOption document
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 ca52a24ce Fix ValueAxisBaseOption document new 58b94179c Merge pull request #19499 from taks/fix-document ca52a24ce is described below commit ca52a24ce5e5c26cd0f5df33e488f2ac28daca16 Author: taks <857tn...@gmail.com> AuthorDate: Fri Jan 12 10:08:27 2024 +0900 Fix ValueAxisBaseOption document --- src/coord/axisCommonTypes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coord/axisCommonTypes.ts b/src/coord/axisCommonTypes.ts index aa92868e3..fbfaf9cf4 100644 --- a/src/coord/axisCommonTypes.ts +++ b/src/coord/axisCommonTypes.ts @@ -151,7 +151,7 @@ export interface ValueAxisBaseOption extends NumericAxisBaseOptionCommon { /** * Optional value can be: * + `false`: always include value 0. - * + `false`: always include value 0. + * + `true`: the axis may not contain zero position. */ scale?: boolean; } - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated: chore(workflow): update actions/setup-node in workflows to v4
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 67ac77c59 chore(workflow): update actions/setup-node in workflows to v4 new 17b53e128 Merge pull request #19476 from striezel-stash/actions-setup-node-v4 67ac77c59 is described below commit 67ac77c59069c8c1b91037d21c0b22943f097b8c Author: Dirk Stolle AuthorDate: Mon Jan 8 02:22:06 2024 +0100 chore(workflow): update actions/setup-node in workflows to v4 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly-next.yml | 2 +- .github/workflows/nightly.yml| 2 +- .github/workflows/source-release.yml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e88f2e97f..0a15bd634 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: ${{ env.FETCH_DEPTH }} - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -70,7 +70,7 @@ jobs: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/nightly-next.yml b/.github/workflows/nightly-next.yml index 0abf26f50..1de371539 100644 --- a/.github/workflows/nightly-next.yml +++ b/.github/workflows/nightly-next.yml @@ -23,7 +23,7 @@ jobs: ref: next - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: registry-url: https://registry.npmjs.org/ node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7cfea0b57..cf6588173 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: registry-url: https://registry.npmjs.org/ node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/source-release.yml b/.github/workflows/source-release.yml index 8b7163f00..571913117 100644 --- a/.github/workflows/source-release.yml +++ b/.github/workflows/source-release.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -62,7 +62,7 @@ jobs: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} @@ -114,7 +114,7 @@ jobs: steps: - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated: chore(workflow): update actions/checkout in workflows to v4
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 b29904f60 chore(workflow): update actions/checkout in workflows to v4 new 0a0e4110d Merge pull request #19474 from striezel-stash/actions-checkout-v4 b29904f60 is described below commit b29904f6062f3e7cb2a570dcb93c30bd8e653a62 Author: Dirk Stolle AuthorDate: Sun Jan 7 00:54:39 2024 +0100 chore(workflow): update actions/checkout in workflows to v4 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly-next.yml | 2 +- .github/workflows/nightly.yml| 2 +- .github/workflows/source-release.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d11e9faa6..e88f2e97f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: run: | echo "FETCH_DEPTH=$(($PR_COMMIT_COUNT + 1))" >> $GITHUB_ENV - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: ${{ env.FETCH_DEPTH }} @@ -67,7 +67,7 @@ jobs: node-version: [18.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 diff --git a/.github/workflows/nightly-next.yml b/.github/workflows/nightly-next.yml index bf40c6e71..0abf26f50 100644 --- a/.github/workflows/nightly-next.yml +++ b/.github/workflows/nightly-next.yml @@ -18,7 +18,7 @@ jobs: node-version: [18.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: next diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 085b80d30..7cfea0b57 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,7 +18,7 @@ jobs: node-version: [18.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 diff --git a/.github/workflows/source-release.yml b/.github/workflows/source-release.yml index eab4413df..8b7163f00 100644 --- a/.github/workflows/source-release.yml +++ b/.github/workflows/source-release.yml @@ -14,7 +14,7 @@ jobs: node-version: [18.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 @@ -59,7 +59,7 @@ jobs: node-version: [18.x] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated: chore: fix some typos
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 0df7c0dc9 chore: fix some typos new 9711002f7 Merge pull request #19473 from striezel-stash/fix-typos 0df7c0dc9 is described below commit 0df7c0dc9a9f56487ef4a66fbd459709e9d682c0 Author: Dirk Stolle AuthorDate: Sun Jan 7 00:47:43 2024 +0100 chore: fix some typos --- build/config.js | 2 +- build/pre-publish.js| 4 ++-- src/data/helper/sourceHelper.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/config.js b/build/config.js index 092f7b23a..9d639e476 100644 --- a/build/config.js +++ b/build/config.js @@ -108,7 +108,7 @@ exports.createECharts = function (opt = {}) { opt, { name: 'echarts', -// Ignore default exports, which is only for compitable code like: +// Ignore default exports, which is only for compatible code like: // import echarts from 'echarts/lib/echarts'; exports: 'named', format: format diff --git a/build/pre-publish.js b/build/pre-publish.js index f590d1e79..cd99e6579 100644 --- a/build/pre-publish.js +++ b/build/pre-publish.js @@ -19,7 +19,7 @@ /** * [Create CommonJS files]: - * Compatible with prevoius folder structure: `echarts/lib` exists in `node_modules` + * Compatible with previous folder structure: `echarts/lib` exists in `node_modules` * (1) Build all files to CommonJS to `echarts/lib`. * (2) Remove __DEV__. * (3) Mount `echarts/src/export.js` to `echarts/lib/echarts.js`. @@ -206,7 +206,7 @@ module.exports = async function () { }; async function runTsCompile(localTs, compilerOptions, srcPathList) { -// Must do it. becuase the value in tsconfig.json might be different from the inner representation. +// Must do it, because the value in tsconfig.json might be different from the inner representation. // For example: moduleResolution: "NODE" => moduleResolution: 2 const {options, errors} = localTs.convertCompilerOptionsFromJson(compilerOptions, ecDir); diff --git a/src/data/helper/sourceHelper.ts b/src/data/helper/sourceHelper.ts index f0277d3a1..d1aa89d5e 100644 --- a/src/data/helper/sourceHelper.ts +++ b/src/data/helper/sourceHelper.ts @@ -314,7 +314,7 @@ export function querySeriesUpstreamDatasetModel( export function queryDatasetUpstreamDatasetModels( datasetModel: DatasetModel ): DatasetModel[] { -// Only these attributes declared, we by defualt reference to `datasetIndex: 0`. +// Only these attributes declared, we by default reference to `datasetIndex: 0`. // Otherwise, no reference. if (!datasetModel.get('transform', true) && !datasetModel.get('fromTransformResult', true) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix-ssr-data-undefined created (now 7a26ce56f)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix-ssr-data-undefined in repository https://gitbox.apache.org/repos/asf/echarts.git at 7a26ce56f fix(ssr): remove redundant SVG attributes with `undefined` value. This branch includes the following new commits: new 7a26ce56f fix(ssr): remove redundant SVG attributes with `undefined` value. 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(ssr): remove redundant SVG attributes with `undefined` value.
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch fix-ssr-data-undefined in repository https://gitbox.apache.org/repos/asf/echarts.git commit 7a26ce56f2df781935b81f127b6377a45ddb39bf Author: plainheart AuthorDate: Wed Jan 3 00:57:29 2024 +0800 fix(ssr): remove redundant SVG attributes with `undefined` value. --- src/core/echarts.ts| 8 ++-- src/util/innerStore.ts | 2 +- test/svg-ssr.html | 38 +- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/core/echarts.ts b/src/core/echarts.ts index aaf538c72..69978fd34 100644 --- a/src/core/echarts.ts +++ b/src/core/echarts.ts @@ -429,10 +429,14 @@ class ECharts extends Eventful { zrender.registerSSRDataGetter(el => { const ecData = getECData(el); +const dataIndex = ecData.dataIndex; +if (dataIndex == null) { +return; +} const hashMap = createHashMap(); hashMap.set('series_index', ecData.seriesIndex); -hashMap.set('data_index', ecData.dataIndex); -hashMap.set('ssr_type', ecData.ssrType); +hashMap.set('data_index', dataIndex); +ecData.ssrType && hashMap.set('ssr_type', ecData.ssrType); return hashMap; }); diff --git a/src/util/innerStore.ts b/src/util/innerStore.ts index a1ecb2a78..cf9ede71a 100644 --- a/src/util/innerStore.ts +++ b/src/util/innerStore.ts @@ -75,7 +75,7 @@ export const setCommonECData = (seriesIndex: number, dataType: SeriesDataType, d childECData.seriesIndex = seriesIndex; childECData.dataIndex = dataIdx; childECData.dataType = dataType; -childECData.ssrType === 'chart'; +childECData.ssrType = 'chart'; }); } } diff --git a/test/svg-ssr.html b/test/svg-ssr.html index af9a4dab7..c08e02fa7 100644 --- a/test/svg-ssr.html +++ b/test/svg-ssr.html @@ -41,7 +41,6 @@ under the License. - require([ @@ -118,5 +117,42 @@ under the License. + +require(['echarts'], function (echarts) { +var option = { +legend: {}, +xAxis: { +type: 'category', +data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] +}, +yAxis: { +type: 'value' +}, +series: [ +{ +name: 'line', +data: [150, 230, 224, 218, 135, 147, 260], +type: 'line' +} +] +}; +var myChart = testHelper.create(echarts, 'main1', { +option: option, +renderer: 'svg', +title: 'There should not be SSR attribute with **undefined** value' +}); +const svgDom = myChart.getZr().painter.getSvgDom(); +const undefinedCount = Array.from(svgDom.querySelectorAll('path')) +.filter(p => p.getAttribute('ecmeta_series_index') === 'undefined').length; +myChart.setOption({ +title: { +text: 'UndefinedCount: ' + undefinedCount, +textStyle: { +color: undefinedCount > 0 ? 'red' : 'black' +} +} +}); +}); + - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/workflow/update-notice-year deleted (was 60cbc9fe3)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git was 60cbc9fe3 chore(workflow): fix timezone error when getting new year by `new Date` The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (247889ab9 -> f1d9eb547)
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 247889ab9 Merge pull request #19455 from apache/bot/update-notice-year/2024 add 60cbc9fe3 chore(workflow): fix timezone error when getting new year by `new Date` new f1d9eb547 Merge pull request #19454 from apache/fix/workflow/update-notice-year The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/.scripts/update-notice-year.js | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) - 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 #19454 from apache/fix/workflow/update-notice-year
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 f1d9eb54707dc79943df613a33e93873bb79 Merge: 247889ab9 60cbc9fe3 Author: Zhongxiang Wang AuthorDate: Mon Jan 1 15:51:38 2024 +0800 Merge pull request #19454 from apache/fix/workflow/update-notice-year chore(workflow): fix timezone error when getting new year by `new Date` .github/workflows/.scripts/update-notice-year.js | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch bot/update-notice-year/2024 deleted (was 57be34334)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch bot/update-notice-year/2024 in repository https://gitbox.apache.org/repos/asf/echarts.git was 57be34334 chore: update NOTICE year to 2024 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 #19455 from apache/bot/update-notice-year/2024
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 247889ab9c0beff99313c801a0246a450960d2cf Merge: 323814424 57be34334 Author: Zhongxiang Wang AuthorDate: Mon Jan 1 13:46:22 2024 +0800 Merge pull request #19455 from apache/bot/update-notice-year/2024 chore: update NOTICE year to 2024 NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (323814424 -> 247889ab9)
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 323814424 Merge pull request #19452 from apache/workflow/update-notice-year add 57be34334 chore: update NOTICE year to 2024 new 247889ab9 Merge pull request #19455 from apache/bot/update-notice-year/2024 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: NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch bot/update-notice-year/2023 deleted (was 21c338963)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch bot/update-notice-year/2023 in repository https://gitbox.apache.org/repos/asf/echarts.git was 21c338963 chore: update NOTICE year to 2023 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/workflow/update-notice-year created (now 60cbc9fe3)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git at 60cbc9fe3 chore(workflow): fix timezone error when getting new year by `new Date` This branch includes the following new commits: new 60cbc9fe3 chore(workflow): fix timezone error when getting new year by `new Date` 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(workflow): fix timezone error when getting new year by `new Date`
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch fix/workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git commit 60cbc9fe3c34cfc23de82a587032a820968bfa9c Author: plainheart AuthorDate: Mon Jan 1 00:20:14 2024 +0800 chore(workflow): fix timezone error when getting new year by `new Date` --- .github/workflows/.scripts/update-notice-year.js | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/.scripts/update-notice-year.js b/.github/workflows/.scripts/update-notice-year.js index 61505ff5a..2fbb6b7b8 100644 --- a/.github/workflows/.scripts/update-notice-year.js +++ b/.github/workflows/.scripts/update-notice-year.js @@ -7,7 +7,10 @@ module.exports = async function updateNoticeYear( /** @type {{ octokit: Octokit, context: Context }} */ { octokit, context } ) { - const newYear = new Date().getFullYear() + const now = new Date() + // Change to UTC+8 + now.setHours(now.getHours() + 8) + const newYear = now.getFullYear() console.log('Prepare to update notice year to', newYear) const noticeContent = `Apache ECharts - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: fix(core): improve `getConnectedDataURL` & `getDataURL`
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch fix/getConnectedDataURL in repository https://gitbox.apache.org/repos/asf/echarts.git commit c722a8b1e7b081c143c0b26af94f6e0cfcd120e3 Author: plainheart AuthorDate: Mon Jan 1 00:10:29 2024 +0800 fix(core): improve `getConnectedDataURL` & `getDataURL` 1) fix `backgroundColor` specified by `toolbox.saveAsImage` is not working when using SVG renderer 2) fix temporary zr instance for `getConnectedDataURL` is never disposed - it may cause unexpected memory leak 3) fix toolbox component is not excluded by `getConnectedDataURL` (Resolves #19422) 4) fix `getConnectedDataURL` fails when connected charts are using SVG renderer (Resolves #18028, Resolves #19278) --- src/core/echarts.ts | 153 1 file changed, 106 insertions(+), 47 deletions(-) diff --git a/src/core/echarts.ts b/src/core/echarts.ts index aaf538c72..14d30ba55 100644 --- a/src/core/echarts.ts +++ b/src/core/echarts.ts @@ -88,7 +88,11 @@ import loadingDefault from '../loading/default'; import Scheduler from './Scheduler'; import lightTheme from '../theme/light'; import darkTheme from '../theme/dark'; -import {CoordinateSystemMaster, CoordinateSystemCreator, CoordinateSystemHostModel} from '../coord/CoordinateSystem'; +import type { +CoordinateSystemMaster, +CoordinateSystemCreator, +CoordinateSystemHostModel +} from '../coord/CoordinateSystem'; import { parseClassType } from '../util/clazz'; import {ECEventProcessor} from '../util/ECEventProcessor'; import { @@ -109,7 +113,7 @@ import { ECElementEvent, AnimationOption } from '../util/types'; -import Displayable from 'zrender/src/graphic/Displayable'; +import type Displayable from 'zrender/src/graphic/Displayable'; import { seriesSymbolTask, dataSymbolTask } from '../visual/symbol'; import { getVisualFromData, getItemVisualFromData } from '../visual/helper'; import { deprecateLog, deprecateReplaceLog, error, warn } from '../util/log'; @@ -121,8 +125,9 @@ import { createLocaleObject, SYSTEM_LANG, LocaleOption } from './locale'; import type {EChartsOption} from '../export/option'; import { findEventDispatcher } from '../util/event'; import decal from '../visual/decal'; -import CanvasPainter from 'zrender/src/canvas/Painter'; -import SVGPainter from 'zrender/src/svg/Painter'; +import type CanvasPainter from 'zrender/src/canvas/Painter'; +import type SVGPainter from 'zrender/src/svg/Painter'; +import { encodeBase64 } from 'zrender/src/svg/helper'; import lifecycle, { LifecycleEvents, UpdateLifecycleTransitionItem, @@ -806,16 +811,27 @@ class ECharts extends Eventful { }); }); -const url = this._zr.painter.getType() === 'svg' +const isSvg = this._zr.painter.getType() === 'svg'; +let backgroundColorToRecover; +if (isSvg && opts.backgroundColor) { +backgroundColorToRecover = this._zr.getBackgroundColor(); +this._zr.setBackgroundColor(opts.backgroundColor); +} + +const url = isSvg ? this.getSvgDataURL() : this.renderToCanvas(opts).toDataURL( -'image/' + (opts && opts.type || 'png') +'image/' + (opts.type || 'png') ); each(excludesComponentViews, function (view) { view.group.ignore = false; }); +backgroundColorToRecover && this._zr.setBackgroundColor(backgroundColorToRecover); + +excludesComponentViews.length && this._zr.refreshImmediately(); + return url; } @@ -832,24 +848,58 @@ class ECharts extends Eventful { return; } -const isSvg = opts.type === 'svg'; const groupId = this.group; -const mathMin = Math.min; -const mathMax = Math.max; -const MAX_NUMBER = Infinity; if (connectedGroups[groupId]) { +opts = opts || {}; + +const isSvg = opts.type === 'svg'; +const MAX_NUMBER = Infinity; +const mathMin = Math.min; +const mathMax = Math.max; let left = MAX_NUMBER; let top = MAX_NUMBER; let right = -MAX_NUMBER; let bottom = -MAX_NUMBER; -const canvasList: {dom: HTMLCanvasElement | string, left: number, top: number}[] = []; -const dpr = (opts && opts.pixelRatio) || this.getDevicePixelRatio(); - -each(instances, function (chart, id) { +const canvasList: { +dom: HTMLCanvasElement | string, +left: number, +top: number, +width: number, +height: number +}[] = []; +const dpr = isSvg +? 1 +: (opts.pixelRatio || this.getDevicePixelRatio()); +
(echarts) branch fix/getConnectedDataURL created (now c722a8b1e)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/getConnectedDataURL in repository https://gitbox.apache.org/repos/asf/echarts.git at c722a8b1e fix(core): improve `getConnectedDataURL` & `getDataURL` This branch includes the following new commits: new c722a8b1e fix(core): improve `getConnectedDataURL` & `getDataURL` 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 workflow/update-notice-year updated (c422a5d26 -> 642f37766)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git from c422a5d26 chore(workflow): add a scheduled workflow to update the NOTICE year automatically add 642f37766 style: remove redundant empty lines No new revisions were added by this update. Summary of changes: .github/workflows/update-notice-year.yml | 4 1 file changed, 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: chore(workflow): add a scheduled workflow to update the NOTICE year automatically
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git commit c422a5d266bc576a7b64c1ee4c9f0e3c235a0fe1 Author: plainheart AuthorDate: Sun Dec 31 19:07:16 2023 +0800 chore(workflow): add a scheduled workflow to update the NOTICE year automatically --- .github/workflows/.scripts/update-notice-year.js | 90 .github/workflows/update-notice-year.yml | 28 2 files changed, 118 insertions(+) diff --git a/.github/workflows/.scripts/update-notice-year.js b/.github/workflows/.scripts/update-notice-year.js new file mode 100644 index 0..61505ff5a --- /dev/null +++ b/.github/workflows/.scripts/update-notice-year.js @@ -0,0 +1,90 @@ +/** + * @typedef {import('@octokit/rest').Octokit} Octokit + * @typedef {import('@actions/github')['context']} Context + */ + +module.exports = async function updateNoticeYear( + /** @type {{ octokit: Octokit, context: Context }} */ + { octokit, context } +) { + const newYear = new Date().getFullYear() + console.log('Prepare to update notice year to', newYear) + + const noticeContent = `Apache ECharts +Copyright 2017-${newYear} The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/).` + + const repoCtx = context.repo + + const repoInfo = (await octokit.rest.repos.get(repoCtx)).data + const defaultBranchName = repoInfo.default_branch + const remoteNoticeFile = (await octokit.rest.repos.getContent({ +...repoCtx, +path: 'NOTICE', +ref: defaultBranchName + })).data + const remoteNoticeContent = base64ToUtf8(remoteNoticeFile.content) + if (remoteNoticeContent === noticeContent) { +console.log('NOTICE year is already updated.') +return + } + + console.log('Ready to update the NOTICE file:\n' + noticeContent) + + const defaultBranch = (await octokit.rest.repos.getBranch({ +...repoCtx, +branch: defaultBranchName + })).data + + const newBranchName = `bot/update-notice-year/${newYear}` + await octokit.rest.git.createRef({ +...repoCtx, +ref: `refs/heads/${newBranchName}`, +sha: defaultBranch.commit.sha + }) + console.log('Created a new branch:', newBranchName) + + await octokit.rest.repos.createOrUpdateFileContents({ +...repoCtx, +path: 'NOTICE', +message: `chore: update NOTICE year to ${newYear}`, +content: utf8ToBase64(noticeContent), +sha: remoteNoticeFile.sha, +branch: newBranchName + }) + + console.log('Updated the NOTICE file on the new branch') + + const pr = (await octokit.rest.pulls.create({ +...repoCtx, +head: newBranchName, +base: defaultBranchName, +maintainer_can_modify: true, +title: `chore: update NOTICE year to ${newYear}`, +body: `## Brief Information + +This pull request is in the type of: + +- [ ] bug fixing +- [ ] new feature +- [x] others + +### What does this PR do? + +Update notice year to ${newYear}. + +Happy new year! 祝大家新年快乐!` + })).data + + console.log(`Opened PR #${pr.number} for updating the NOTICE file`) +} + +function utf8ToBase64(data) { + return Buffer.from(data, 'utf-8').toString('base64') +} + +function base64ToUtf8(data) { + return Buffer.from(data, 'base64').toString('utf-8') +} diff --git a/.github/workflows/update-notice-year.yml b/.github/workflows/update-notice-year.yml new file mode 100644 index 0..3489e2f63 --- /dev/null +++ b/.github/workflows/update-notice-year.yml @@ -0,0 +1,28 @@ +name: Update NOTICE year + +on: + schedule: +# 1/1 00:00 UTC+8 +- cron: '0 16 31 12 *' + workflow_dispatch: + +jobs: + update-notice-year: +if: ${{ github.repository_owner == 'apache' }} +runs-on: ubuntu-latest + +steps: + - uses: actions/checkout@v4 +with: + sparse-checkout: | +.github/workflows/.scripts + + - uses: actions/github-script@v7 +with: + script: | +const updateNoticeYear = require('.github/workflows/.scripts/update-notice-year.js') +await updateNoticeYear({ octokit: github, context }) + + + + - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch workflow/update-notice-year created (now c422a5d26)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git at c422a5d26 chore(workflow): add a scheduled workflow to update the NOTICE year automatically This branch includes the following new commits: new c422a5d26 chore(workflow): add a scheduled workflow to update the NOTICE year automatically 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 workflow/update-notice-year deleted (was 437e0028b)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git was 437e0028b chore(workflow): add a scheduled workflow to update the NOTICE year automatically This change permanently discards the following revisions: discard 437e0028b chore(workflow): add a scheduled workflow to update the NOTICE year automatically - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: chore(workflow): add a scheduled workflow to update the NOTICE year automatically
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git commit 437e0028b4cd1067104453bb4747f1ee1d8c322f Author: plainheart AuthorDate: Sun Dec 31 18:46:14 2023 +0800 chore(workflow): add a scheduled workflow to update the NOTICE year automatically --- .github/workflows/.scripts/update-notice-year.js | 90 .github/workflows/update-notice-year.yml | 27 +++ 2 files changed, 117 insertions(+) diff --git a/.github/workflows/.scripts/update-notice-year.js b/.github/workflows/.scripts/update-notice-year.js new file mode 100644 index 0..61505ff5a --- /dev/null +++ b/.github/workflows/.scripts/update-notice-year.js @@ -0,0 +1,90 @@ +/** + * @typedef {import('@octokit/rest').Octokit} Octokit + * @typedef {import('@actions/github')['context']} Context + */ + +module.exports = async function updateNoticeYear( + /** @type {{ octokit: Octokit, context: Context }} */ + { octokit, context } +) { + const newYear = new Date().getFullYear() + console.log('Prepare to update notice year to', newYear) + + const noticeContent = `Apache ECharts +Copyright 2017-${newYear} The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/).` + + const repoCtx = context.repo + + const repoInfo = (await octokit.rest.repos.get(repoCtx)).data + const defaultBranchName = repoInfo.default_branch + const remoteNoticeFile = (await octokit.rest.repos.getContent({ +...repoCtx, +path: 'NOTICE', +ref: defaultBranchName + })).data + const remoteNoticeContent = base64ToUtf8(remoteNoticeFile.content) + if (remoteNoticeContent === noticeContent) { +console.log('NOTICE year is already updated.') +return + } + + console.log('Ready to update the NOTICE file:\n' + noticeContent) + + const defaultBranch = (await octokit.rest.repos.getBranch({ +...repoCtx, +branch: defaultBranchName + })).data + + const newBranchName = `bot/update-notice-year/${newYear}` + await octokit.rest.git.createRef({ +...repoCtx, +ref: `refs/heads/${newBranchName}`, +sha: defaultBranch.commit.sha + }) + console.log('Created a new branch:', newBranchName) + + await octokit.rest.repos.createOrUpdateFileContents({ +...repoCtx, +path: 'NOTICE', +message: `chore: update NOTICE year to ${newYear}`, +content: utf8ToBase64(noticeContent), +sha: remoteNoticeFile.sha, +branch: newBranchName + }) + + console.log('Updated the NOTICE file on the new branch') + + const pr = (await octokit.rest.pulls.create({ +...repoCtx, +head: newBranchName, +base: defaultBranchName, +maintainer_can_modify: true, +title: `chore: update NOTICE year to ${newYear}`, +body: `## Brief Information + +This pull request is in the type of: + +- [ ] bug fixing +- [ ] new feature +- [x] others + +### What does this PR do? + +Update notice year to ${newYear}. + +Happy new year! 祝大家新年快乐!` + })).data + + console.log(`Opened PR #${pr.number} for updating the NOTICE file`) +} + +function utf8ToBase64(data) { + return Buffer.from(data, 'utf-8').toString('base64') +} + +function base64ToUtf8(data) { + return Buffer.from(data, 'base64').toString('utf-8') +} diff --git a/.github/workflows/update-notice-year.yml b/.github/workflows/update-notice-year.yml new file mode 100644 index 0..bf396a065 --- /dev/null +++ b/.github/workflows/update-notice-year.yml @@ -0,0 +1,27 @@ +name: Update NOTICE year + +on: + schedule: +- cron: '0 0 1 1 *' + workflow_dispatch: + +jobs: + update-notice-year: +if: ${{ github.repository_owner == 'apache' }} +runs-on: ubuntu-latest + +steps: + - uses: actions/checkout@v4 +with: + sparse-checkout: | +.github/workflows/.scripts + + - uses: actions/github-script@v7 +with: + script: | +const updateNoticeYear = require('.github/workflows/.scripts/update-notice-year.js') +await updateNoticeYear({ octokit: github, context }) + + + + - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch workflow/update-notice-year created (now 437e0028b)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch workflow/update-notice-year in repository https://gitbox.apache.org/repos/asf/echarts.git at 437e0028b chore(workflow): add a scheduled workflow to update the NOTICE year automatically This branch includes the following new commits: new 437e0028b chore(workflow): add a scheduled workflow to update the NOTICE year automatically 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-bot) branch master updated: feat: auto delete update-notice-year branch created by bot
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 8f9d9fb feat: auto delete update-notice-year branch created by bot 8f9d9fb is described below commit 8f9d9fb0e3b5eafd4a060722a0939a67c51e64f4 Author: plainheart AuthorDate: Sun Dec 31 18:14:10 2023 +0800 feat: auto delete update-notice-year branch created by bot --- index.js | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 6abe430..e13a91e 100644 --- a/index.js +++ b/index.js @@ -275,11 +275,20 @@ module.exports = (/** @type {Probot} */ app) => { labelText.PR_AWAITING_REVIEW ]) ]; -const isMerged = context.payload.pull_request.merged; -if (isMerged) { +const pr = context.payload.pull_request; +if (pr.merged) { actions.push(commentIssue(context, text.PR_MERGED)); } -return Promise.all(actions); +// delete created branch by bot +if (pr.head.ref.includes('update-notice-year') && pr.user.type == 'Bot') { +const deleteBranch = context.octokit.git.deleteRef( +context.repo({ +ref: 'heads/' + pr.head.ref +}) +); +actions.push(deleteBranch); +} +return Promise.allSettled(actions); }); app.on(['pull_request_review.submitted'], async context => { - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated: fix: Fix typo s/buidling/building/
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 f3010506d fix: Fix typo s/buidling/building/ new d3733876f Merge pull request #19449 from hugo-syn/master f3010506d is described below commit f3010506d229478423492fd30ba92eb37c9dcf3f Author: hugo-syn AuthorDate: Fri Dec 29 13:16:49 2023 +0100 fix: Fix typo s/buidling/building/ --- build/pre-publish.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pre-publish.js b/build/pre-publish.js index 6975c2744..f590d1e79 100644 --- a/build/pre-publish.js +++ b/build/pre-publish.js @@ -87,7 +87,7 @@ const compileWorkList = [ module: 'ES2015', rootDir: ecDir, outDir: tmpDir, -// Generate types when buidling esm +// Generate types when building esm declaration: true, declarationDir: typesDir }, - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated: fix: Fix typo s/Usefull/Useful/
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 d047d7164 fix: Fix typo s/Usefull/Useful/ new 69cab1f64 Merge pull request #19446 from hugo-syn/master d047d7164 is described below commit d047d716460ad2c9d1e78af334a31e20b81514d1 Author: hugo-syn AuthorDate: Thu Dec 28 13:18:00 2023 +0100 fix: Fix typo s/Usefull/Useful/ --- src/component/axis/AxisBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/axis/AxisBuilder.ts b/src/component/axis/AxisBuilder.ts index a3773a823..1644d5024 100644 --- a/src/component/axis/AxisBuilder.ts +++ b/src/component/axis/AxisBuilder.ts @@ -70,7 +70,7 @@ export interface AxisBuilderCfg { tickDirection?: number labelDirection?: number /** - * Usefull when onZero. + * Useful when onZero. */ labelOffset?: number /** - 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: broken links in dynamic-data.md
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 ea14284 fix: broken links in dynamic-data.md new 610fbdd Merge pull request #104 from ZonaHex/patch-1 ea14284 is described below commit ea142841e5e63e7546af93d6a9d56ed87487a7ce Author: ZonaHe AuthorDate: Wed Dec 27 17:19:02 2023 +0800 fix: broken links in dynamic-data.md --- contents/zh/how-to/data/dynamic-data.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents/zh/how-to/data/dynamic-data.md b/contents/zh/how-to/data/dynamic-data.md index 3262beb..251133b 100644 --- a/contents/zh/how-to/data/dynamic-data.md +++ b/contents/zh/how-to/data/dynamic-data.md @@ -106,7 +106,7 @@ $.get('data.json').done(function (data) { ECharts 由数据驱动,数据的改变驱动图表展现的改变,因此动态数据的实现也变得异常简单。 -所有数据的更新都通过 [setOption](${mainSitePath}/api.html#echartsInstance.setOption)实现,你只需要定时获取数据,[setOption](~api.html#echartsInstance.setOption) 填入数据,而不用考虑数据到底产生了哪些变化,ECharts 会找到两组数据之间的差异然后通过合适的动画去表现数据的变化。 +所有数据的更新都通过 [setOption](${mainSitePath}/api.html#echartsInstance.setOption)实现,你只需要定时获取数据,[setOption](${mainSitePath}/api.html#echartsInstance.setOption) 填入数据,而不用考虑数据到底产生了哪些变化,ECharts 会找到两组数据之间的差异然后通过合适的动画去表现数据的变化。 具体可以看下面示例: - 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 format flaw in 25450d7487e1a404d181ceaadb0df58abf94cb29
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 ececb97a tweak format flaw in 25450d7487e1a404d181ceaadb0df58abf94cb29 ececb97a is described below commit ececb97af5f332958753ab7abc35f96eed237a5f Author: plainheart AuthorDate: Fri Dec 22 00:16:09 2023 +0800 tweak format flaw in 25450d7487e1a404d181ceaadb0df58abf94cb29 --- en/option/component/legend.md | 16 zh/option/component/legend.md | 16 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/en/option/component/legend.md b/en/option/component/legend.md index 112a8cfd..4fedcede 100644 --- a/en/option/component/legend.md +++ b/en/option/component/legend.md @@ -135,9 +135,13 @@ Legend color when not selected. Legend border color when not selected. -## inactiveBorderWidth(number|'auto'|'inherit') = 'auto' +## inactiveBorderWidth(number|string) = 'auto' -Legend border width when not selected. If it is `'auto'`, the border width is set to be 2 if there is border width in the series, 0 elsewise. If it is `'inherit'`, it always takes the border width of the series. +Legend border width when not selected. + +If it is `'auto'`, the border width is set to be 2 if there is border width in the series, 0 elsewise. + +If it is `'inherit'`, it always takes the border width of the series. ## selected(Object) @@ -221,9 +225,13 @@ Legend color when not selected. Legend border color when not selected. -### inactiveBorderWidth(number|'auto'|'inherit') = 'auto' +### inactiveBorderWidth(number|string) = 'auto' + +Legend border width when not selected. + +If it is `'auto'`, the border width is set to be 2 if there is border width in the series, 0 elsewise. -Legend border width when not selected. If it is `'auto'`, the border width is set to be 2 if there is border width in the series, 0 elsewise. If it is `'inherit'`, it always takes the border width of the series. +If it is `'inherit'`, it always takes the border width of the series. ### symbolRotate(number|string) = 'inherit' diff --git a/zh/option/component/legend.md b/zh/option/component/legend.md index f936f40f..410c83e8 100644 --- a/zh/option/component/legend.md +++ b/zh/option/component/legend.md @@ -218,9 +218,13 @@ formatter: function (name) { 图例关闭时的描边颜色。 -## inactiveBorderWidth(number|'auto'|'inherit') = 'auto' +## inactiveBorderWidth(number|string) = 'auto' -图例关闭时的描边粗细。如果为 `'auto'` 表示:如果系列存在描边,则取 2,如果系列不存在描边,则取 0。如果为 `'inherit'` 则表示:始终取系列的描边粗细。 +图例关闭时的描边粗细。 + +如果为 `'auto'` 表示:如果系列存在描边,则取 2,如果系列不存在描边,则取 0。 + +如果为 `'inherit'` 表示:始终取系列的描边粗细。 ## selected(Object) @@ -319,9 +323,13 @@ data: [{ 图例关闭时的描边颜色。 -### inactiveBorderWidth(number|'auto'|'inherit') = 'auto' +### inactiveBorderWidth(number|string) = 'auto' + +图例关闭时的描边粗细。 + +如果为 `'auto'` 表示:如果系列存在描边,则取 2,如果系列不存在描边,则取 0。 -图例关闭时的描边粗细。如果为 `'auto'` 表示:如果系列存在描边,则取 2,如果系列不存在描边,则取 0。如果为 `'inherit'` 则表示:始终取系列的描边粗细。 +如果为 `'inherit'` 表示:始终取系列的描边粗细。 ### textStyle(Object) - 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 builder source of Chinese website
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 76bd17f5 update builder source of Chinese website 76bd17f5 is described below commit 76bd17f54e4aedfe6c88cfd2209914874335c3a1 Author: plainheart AuthorDate: Mon Dec 18 12:19:57 2023 +0800 update builder source of Chinese website --- _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 1a758b92..ff7f9072 100644 --- a/_jade/components/builder.jade +++ b/_jade/components/builder.jade @@ -22,7 +22,7 @@ block content h1 #{isCN ? '在线定制' : 'Online Builder'} if isCN p 可自由选择所需图表、坐标系、组件进行打包下载。 -p 注意:打包的源文件来自 jsDelivr CDN,非 Apache 官方源代码和编译产物 +p 注意:打包的源文件来自 npmmirror 镜像站,非 Apache 官方源代码和编译产物 else p Bundle and download the needed charts and components. p NOTE: The bundler downloads sources from jsDelivr CDN, the built file isn't an official Apache source release or distribution. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: preconnect to docsearch server to make the first query faster
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 bd65bf9 preconnect to docsearch server to make the first query faster bd65bf9 is described below commit bd65bf91f19c844009eb7faf13114e4ac2f47ee5 Author: plainheart AuthorDate: Sun Dec 17 21:19:41 2023 +0800 preconnect to docsearch server to make the first query faster --- components/partials/Sidebar.vue | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/components/partials/Sidebar.vue b/components/partials/Sidebar.vue index ec259a1..6c0ef39 100644 --- a/components/partials/Sidebar.vue +++ b/components/partials/Sidebar.vue @@ -88,11 +88,23 @@ import Vue from 'vue' import SidebarNavItem from './SidebarNavItem.vue' +const docsearchAppId = '14SYRIFETO' + export default Vue.extend({ components: { SidebarNavItem }, + head: { +link: [ + { +rel: 'preconnect', +href: `https://${docsearchAppId.toLowerCase()}-dsn.algolia.net`, +crossOrigin: '' + } +] + }, + data() { return { sidebarOpen: false @@ -112,7 +124,7 @@ export default Vue.extend({ }) // @ts-ignore docsearch({ - appId: atob('MTRTWVJJRkVUTw'), + appId: docsearchAppId, apiKey: atob('MDY2ZGZiZDg3MTVlN2E0NGNjNjA4N2UyOTE0Njk1ZDE'), indexName: 'apache_echarts', inputSelector: '#handbook-search-input', - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch master updated: update links in zh/zr-graphic.md
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 93da3b40 update links in zh/zr-graphic.md 93da3b40 is described below commit 93da3b40bf6ac336de8ab036069da47d787e9266 Author: Zhongxiang Wang AuthorDate: Fri Dec 15 12:23:29 2023 +0800 update links in zh/zr-graphic.md --- zh/option/partial/zr-graphic.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh/option/partial/zr-graphic.md b/zh/option/partial/zr-graphic.md index 27e8f622..7b4546b8 100644 --- a/zh/option/partial/zr-graphic.md +++ b/zh/option/partial/zr-graphic.md @@ -275,7 +275,7 @@ group 是唯一的可以有子节点的容器。group 可以用来整体定位 ###${prefix} font(string) -字体大小、字体类型、粗细、字体样式。格式参见 [css font](https://developer.mozilla.org/en-US/docs/Web/CSS/font)。 +字体大小、字体类型、粗细、字体样式。格式参见 [css font](https://developer.mozilla.org/zh-CN/docs/Web/CSS/font)。 例如: ``` @@ -1576,23 +1576,23 @@ Position of `textContent`. ###${prefix} lineDash(null | false | number[] | 'solid' | 'dashed' | 'dotted') = null -在填充线时使用虚线模式。详见 [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash)。 +在填充线时使用虚线模式。详见 [MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/setLineDash)。 ###${prefix} lineDashOffset(number) = 0 -在填充线时使用虚线的偏移量。详细见 [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineDashOffset)。 +在填充线时使用虚线的偏移量。详细见 [MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineDashOffset)。 ###${prefix} lineCap('butt' | 'round' | 'square') = 'butt' -如何绘制每一条线段末端的属性。详见 [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineCap)。 +如何绘制每一条线段末端的属性。详见 [MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineCap)。 ###${prefix} lineJoin('bevel' | 'round' | 'miter') = 'miter' -设置线条转折点的样式。详见 [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin)。 +设置线条转折点的样式。详见 [MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/lineJoin)。 ###${prefix} miterLimit(number) = 10 -设置斜接面限制比例的属性。详见 [MDN](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/miterLimit)。 +设置斜接面限制比例的属性。详见 [MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/CanvasRenderingContext2D/miterLimit)。 ###${prefix} shadowBlur(number) = undefined - 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 html lang in zh pages
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 0c23d431 fix html lang in zh pages 0c23d431 is described below commit 0c23d431e21ff18498d219daa22874fba7b25dc2 Author: plainheart AuthorDate: Sun Dec 10 03:28:44 2023 +0800 fix html lang in zh pages --- public/zh/api.html | 2 +- public/zh/option-gl.html | 2 +- public/zh/option.html| 2 +- public/zh/tutorial.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/zh/api.html b/public/zh/api.html index 1d908da2..f81eefc3 100644 --- a/public/zh/api.html +++ b/public/zh/api.html @@ -1,5 +1,5 @@ - + diff --git a/public/zh/option-gl.html b/public/zh/option-gl.html index e347d23e..68ea2b34 100644 --- a/public/zh/option-gl.html +++ b/public/zh/option-gl.html @@ -1,5 +1,5 @@ - + diff --git a/public/zh/option.html b/public/zh/option.html index 52b2520b..3bc8c01c 100644 --- a/public/zh/option.html +++ b/public/zh/option.html @@ -1,5 +1,5 @@ - + diff --git a/public/zh/tutorial.html b/public/zh/tutorial.html index c57c35b8..f762d8ab 100644 --- a/public/zh/tutorial.html +++ b/public/zh/tutorial.html @@ -1,5 +1,5 @@ - + - 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: tweak nuxt loading color
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 aeabc10 chore: tweak nuxt loading color aeabc10 is described below commit aeabc1002dcf59a69d77e93259fea67c5e140be8 Author: plainheart AuthorDate: Sat Dec 9 22:42:00 2023 +0800 chore: tweak nuxt loading color --- nuxt.config.js | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nuxt.config.js b/nuxt.config.js index d299642..ff5e55d 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -46,7 +46,10 @@ export default { /* ** Customize the progress-bar color */ - // loading: { color: '#fff' }, + loading: { +color: '#F72C5B', +continuous: true + }, /* ** Global CSS */ - 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(docsearch): update docsearch config
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 ba38992 fix(docsearch): update docsearch config ba38992 is described below commit ba38992f9bab6a8c67ec2d00509905c25dcde388 Author: plainheart AuthorDate: Sat Dec 9 21:42:14 2023 +0800 fix(docsearch): update docsearch config --- components/partials/Sidebar.vue | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/partials/Sidebar.vue b/components/partials/Sidebar.vue index 1bf6e83..ec259a1 100644 --- a/components/partials/Sidebar.vue +++ b/components/partials/Sidebar.vue @@ -2,7 +2,7 @@ @@ -112,14 +112,16 @@ export default Vue.extend({ }) // @ts-ignore docsearch({ - apiKey: '6ade5f1ff34e94690f9ea38cddcc2f55', + appId: atob('MTRTWVJJRkVUTw'), + apiKey: atob('MDY2ZGZiZDg3MTVlN2E0NGNjNjA4N2UyOTE0Njk1ZDE'), indexName: 'apache_echarts', - inputSelector: '#handbook-search-intput', + inputSelector: '#handbook-search-input', algoliaOptions: { // @ts-ignore facetFilters: [`lang:${this.$i18n.locale}`] }, - debug: false // Set debug to true if you want to inspect the dropdown + // Set debug to true if you want to inspect the dropdown + // debug: true }) } }) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-theme-builder) branch master updated: use China CDN for Chinese website
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-theme-builder.git The following commit(s) were added to refs/heads/master by this push: new 33a3594 use China CDN for Chinese website 33a3594 is described below commit 33a3594f72a2a78d4990300a2f36d1aea0e552f3 Author: plainheart AuthorDate: Sat Dec 9 06:57:40 2023 +0800 use China CDN for Chinese website --- app/en/theme-builder/app.min.js | 2 +- app/zh/body.html| 18 +- app/zh/index.html | 18 +- app/zh/theme-builder/app.min.js | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/en/theme-builder/app.min.js b/app/en/theme-builder/app.min.js index 0bf79e5..6883eb7 100644 --- a/app/en/theme-builder/app.min.js +++ b/app/en/theme-builder/app.min.js @@ -1 +1 @@ -var VueColor=Vue.extend({template:'',compiled:function(){var a=this,t=$(this.$el);t.find("input").val(this.color),t.colorpicker().on("changeColor",function(){var e=t.find("input").val();echarts.color.parse(e)&$set("color",e)}),a.$watch("color",function(e){t.colorpicker("setValue",e)})},props:{color:{twoWay:!0}}});Vue.component("co [...] \ No newline at end of file +var VueColor=Vue.extend({template:'',compiled:function(){var a=this,t=$(this.$el);t.find("input").val(this.color),t.colorpicker().on("changeColor",function(){var e=t.find("input").val();echarts.color.parse(e)&$set("color",e)}),a.$watch("color",function(e){t.colorpicker("setValue",e)})},props:{color:{twoWay:!0}}}),VueColorList=(Vue [...] \ No newline at end of file diff --git a/app/zh/body.html b/app/zh/body.html index d93d34a..be12868 100644 --- a/app/zh/body.html +++ b/app/zh/body.html @@ -1,6 +1,6 @@ - - - +https://lib.baomitu.com/bootstrap-colorpicker/2.5.3/css/bootstrap-colorpicker.min.css;> +https://lib.baomitu.com/highlight.js/9.16.2/styles/default.min.css;> +https://lib.baomitu.com/highlight.js/9.16.2/styles/github.min.css;> @@ -510,11 +510,11 @@ - - - - - - +https://registry.npmmirror.com/echarts/5/files/dist/echarts.min.js"</a>;> +https://lib.baomitu.com/lodash.js/4.17.21/lodash.min.js"</a>;> +https://lib.baomitu.com/bootstrap-colorpicker/2.5.3/js/bootstrap-colorpicker.min.js"</a>;> +https://lib.baomitu.com/vue/1.0.28/vue.min.js"</a>;> +https://lib.baomitu.com/highlight.js/9.16.2/highlight.min.js"</a>;> +https://lib.baomitu.com/FileSaver.js/2.0.5/FileSaver.min.js"</a>;> diff --git a/app/zh/index.html b/app/zh/index.html index ffb3ebf..08fac7a 100644 --- a/app/zh/index.html +++ b/app/zh/index.html @@ -13,9 +13,9 @@ AUTOGENERATED. DON'T MODIFY - - - +https://lib.baomitu.com/bootstrap-colorpicker/2.5.3/css/bootstrap-colorpicker.min.css;> +https://lib.baomitu.com/highlight.js/9.16.2/styles/default.min.css;> +https://lib.baomitu.com/highlight.js/9.16.2/styles/github.min.css;> @@ -525,12 +525,12 @@ AUTOGENERATED. DON'T MODIFY - - - - - - +https://registry.npmmirror.com/echarts/5/files/dist/echarts.min.js"</a>;> +https://lib.baomitu.com/lodash.js/4.17.21/lodash.min.js"</a>;> +https://lib.baomitu.com/bootstrap-colorpicker/2.5.3/js/bootstrap-colorpicker.min.js"</a>;> +https://lib.baomitu.com/vue/1.0.28/vue.min.js"</a>;> +https://lib.baomitu.com/highlight.js/9.16.2/highlight.min.js"</a>;> +https://lib.baomitu.com/FileSaver.js/2.0.5/FileSaver.min.js"</a>;> diff --git a/app/zh/theme-builder/app.min.js b/app/zh/theme-builder/app.min.js index 8b7c976..6d2f71f 100644 --- a/app/zh/theme-builder/app.min.js +++ b/app/zh/theme-builder/app.min.js @@ -1 +1 @@ -var VueColor=Vue.extend({template:'',compiled:function(){var a=this,t=$(this.$el);t.find("input").val(this.color),t.colorpicker().on("changeColor",function(){var e=t.find("input").val();echarts.color.parse(e)&$set("color",e)}),a.$watch("color",function(e){t.colorpicker("setValue",e)})},props:{color:{twoWay:!0}}});Vue.component("co [...] \ No newline at end of file +var VueColor=Vue.extend({template:'',compiled:function(){var a=this,t=$(this.$el);t.find("input").val(this.color),t.colorpicker().on("changeColor",function(){var e=t.find("input").val();echarts.color.parse(e)&$set("color",e)}),a.$watch("color",function(e){t.colorpicker("setValue",e)})},props:{color:{twoWay:!0}}}),VueColorList=(Vue [...] \ 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-handbook) branch master updated: fix: move head config to layouts/default.vue
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 a8432c9 fix: move head config to layouts/default.vue a8432c9 is described below commit a8432c9fb0d64de770d98bd4dccb6a9ffd73e01a Author: plainheart AuthorDate: Sat Dec 9 06:28:41 2023 +0800 fix: move head config to layouts/default.vue --- layouts/default.vue | 69 ++--- nuxt.config.js | 49 + 2 files changed, 61 insertions(+), 57 deletions(-) diff --git a/layouts/default.vue b/layouts/default.vue index a9d5c07..ee8f289 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -28,20 +28,71 @@ export default { Navbar }, + head() { +const locale = (this as any).$i18n.locale; +const isCN = locale === 'zh'; +const appName = isCN ? '使用手册' : 'Handbook' +return { + titleTemplate: chunk => `${chunk ? chunk + ' - ' : ''}${appName} - Apache ECharts`, + htmlAttrs: { +lang: isCN ? 'zh-CN' : 'en' + }, + link: [ +{ + rel: 'shortcut icon', + type: 'image/png', + href: `https://echarts.apache.org/${locale}/images/favicon.png` +}, +{ + rel: 'stylesheet', + href: isCN +? 'https://lib.baomitu.com/twitter-bootstrap/3.4.1/css/bootstrap.min.css' +: 'https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css' +}, +{ + rel: 'stylesheet', + href: `https://echarts.apache.org/${locale}/css/main.css` +}, +{ + rel: 'stylesheet', + href: isCN +? 'https://lib.baomitu.com/docsearch.js/2.6.3/docsearch.min.css' +: 'https://fastly.jsdelivr.net/npm/docsearch.js@2.6.3/dist/cdn/docsearch.min.css' +} + ], + script: [ +{ + src: isCN +? 'https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js' +: 'https://fastly.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js' +}, +{ + src: isCN +? 'https://lib.baomitu.com/twitter-bootstrap/3.4.1/js/bootstrap.min.js' +: 'https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js' +}, +{ + src: isCN +? 'https://lib.baomitu.com/docsearch.js/2.6.3/docsearch.min.js' +: 'https://fastly.jsdelivr.net/npm/docsearch.js@2.6.3/dist/cdn/docsearch.min.js' +} + ], + noscript: [ +{ + body: true, + innerHTML: '很抱歉,Apache ECharts 网站需要启用 JavaScript 才能正常运行。' +} + ], + __dangerouslyDisableSanitizers: ['noscript'] +} + }, + mounted() { // This help scroll to the hash const hash = location.hash location.hash = '' location.hash = hash - }, - - computed: { -// posts(): string { -// return this.$store.state.posts.zh -// } - }, - - methods: {} + } } diff --git a/nuxt.config.js b/nuxt.config.js index f679c5d..d299642 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -41,54 +41,7 @@ export default { /* ** Headers of the page */ - head() { -const locale = this.$i18n.locale; -const isCN = locale === 'zh'; -const appName = isCN ? '使用手册' : 'Handbook' -return { - titleTemplate: chunk => `${chunk ? chunk + ' - ' : ''}${appName} - Apache ECharts`, - link: [ -{ - rel: 'shortcut icon', - type: 'image/png', - href: `https://echarts.apache.org/${locale}/images/favicon.png` -}, -{ - rel: 'stylesheet', - href: isCN -? 'https://lib.baomitu.com/twitter-bootstrap/3.4.1/css/bootstrap.min.css' -: 'https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css' -}, -{ - rel: 'stylesheet', - href: `https://echarts.apache.org/${locale}/css/main.css` -}, -{ - rel: 'stylesheet', - href: isCN -? 'https://lib.baomitu.com/docsearch.js/2.6.3/docsearch.min.css' -: 'https://fastly.jsdelivr.net/npm/docsearch.js@2.6.3/dist/cdn/docsearch.min.css' -} - ], - script: [ -{ - src: isCN -? 'https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js' -: 'https://fastly.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js' -}, -{ - src: isCN -? 'https://lib.baomitu.com/twitter-bootstrap/3.4.1/js/bootstrap.min.js' -: 'https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js' -}, -{ - src: isCN -? 'https://lib.baomitu.com/docsearch.js/2.6.3/docsearch.min.js' -:
(echarts-www) branch master updated: update main.scss
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 d6db3cae update main.scss d6db3cae is described below commit d6db3cae38644ce09737bb57e2d0bed574320bef Author: plainheart AuthorDate: Sat Dec 9 06:25:37 2023 +0800 update main.scss --- _scss/main.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/_scss/main.scss b/_scss/main.scss index a56e07d4..47180c13 100644 --- a/_scss/main.scss +++ b/_scss/main.scss @@ -126,6 +126,7 @@ body { background-color: rgba(0, 0, 0, 0.6); color: #fff; text-align: center; +pointer-events: none; } #apache-banner { - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-handbook) branch master updated: use China CDN for Chinese website
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 c9bfea8 use China CDN for Chinese website c9bfea8 is described below commit c9bfea893b9f00c8d40094f1d620c6dff8f41f07 Author: plainheart AuthorDate: Sat Dec 9 05:45:40 2023 +0800 use China CDN for Chinese website --- app.html | 23 +++-- components/markdown/Live.vue | 13 +- layouts/default.vue | 5 nuxt.config.js | 60 ++-- 4 files changed, 57 insertions(+), 44 deletions(-) diff --git a/app.html b/app.html index 77cdfff..5df43a3 100644 --- a/app.html +++ b/app.html @@ -1,20 +1,9 @@ -https://fastly.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css; -/> -https://echarts.apache.org/zh/css/main.css; -/> -https://fastly.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css; -/> + + + {{ HEAD }} @@ -22,12 +11,6 @@ document.getElementById('nav-doc').className = 'active' -https://fastly.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min.js"</a>;> -https://fastly.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"</a>;> -https://fastly.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"</a>; -> https://www.googletagmanager.com/gtag/js?id=UA-141228404-1"</a>;>
(echarts-examples) branch gh-pages updated: use China CDN for Chinese website
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 ef135eb3 use China CDN for Chinese website ef135eb3 is described below commit ef135eb3d8feff37541d4861f2731c04ec6693f2 Author: plainheart AuthorDate: Sat Dec 9 04:30:39 2023 +0800 use China CDN for Chinese website --- public/zh/editor.html | 12 +-- public/zh/index.html | 12 +-- public/zh/view.html | 12 +-- src/common/config.js | 40 --- src/common/helper.js | 4 +++- src/editor/CodeAce.vue| 4 +++- src/editor/CodeMonaco.vue | 6 +- src/editor/Editor.vue | 3 ++- src/editor/FullCodePreview.vue| 4 +++- src/editor/Preview.vue| 4 +++- src/editor/downloadExample.js | 6 -- src/editor/sandbox/index.js | 7 -- src/editor/sandbox/openwith/helper.js | 4 +++- 13 files changed, 86 insertions(+), 32 deletions(-) diff --git a/public/zh/editor.html b/public/zh/editor.html index 2e8ff2c8..194c4571 100644 --- a/public/zh/editor.html +++ b/public/zh/editor.html @@ -20,16 +20,16 @@ https://lib.baomitu.com/twitter-bootstrap/3.4.1/css/bootstrap.min.css; /> https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css; + href="https://lib.baomitu.com/element-ui/2.15.14/theme-chalk/index.min.css; /> -https://fastly.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js"</a>;> -https://fastly.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"</a>;> -https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js"</a>;> -https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/index.js"</a>;> +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://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 cb34d927..b69b6938 100644 --- a/public/zh/index.html +++ b/public/zh/index.html @@ -20,16 +20,16 @@ https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css; + href="https://lib.baomitu.com/twitter-bootstrap/3.4.1/css/bootstrap.min.css; /> https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css; + href="https://lib.baomitu.com/element-ui/2.15.14/theme-chalk/index.min.css; /> -https://fastly.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js"</a>;> -https://fastly.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"</a>;> -https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js"</a>;> -https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/index.js"</a>;> +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://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 c85347a2..7c1f4233 100644 --- a/public/zh/view.html +++ b/public/zh/view.html @@ -20,16 +20,16 @@ https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css; + href="https://lib.baomitu.com/twitter-bootstrap/3.4.1/css/bootstrap.min.css; /> https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css; + href="https://lib.baomitu.com/element-ui/2.15.14/theme-chalk/index.min.css; /> -https://fastly.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js"</a>;> -https://fastly.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"</a>;> -https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js"</a>;> -https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/index.js"</a>;> +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://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 in
(echarts-doc) branch master updated: fix CDN URL
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 5ccc0b20 fix CDN URL 5ccc0b20 is described below commit 5ccc0b204861ca391a1244c77b439ed853cdf6fd Author: plainheart AuthorDate: Sat Dec 9 03:03:18 2023 +0800 fix CDN URL --- src/components/LiveExample.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/LiveExample.vue b/src/components/LiveExample.vue index 115a224e..4d12e23c 100644 --- a/src/components/LiveExample.vue +++ b/src/components/LiveExample.vue @@ -87,7 +87,7 @@ function fetchECharts() { return echartsLoadPromise || (echartsLoadPromise = new Promise(function (resolve, reject) { const script = document.createElement('script'); script.src = store.locale === 'zh' -? 'https://lib.baomitu.com/echarts/latest/echarts.min.js' +? 'https://registry.npmmirror.com/echarts/latest/files/dist/echarts.min.js' : 'https://fastly.jsdelivr.net/npm/echarts@latest/dist/echarts.min.js'; script.async = true; script.onload = function () { - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: use China CDN for Chinese website
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 c7ef35c3 use China CDN for Chinese website c7ef35c3 is described below commit c7ef35c3f6b9913df5edf339df7be087c5af6ec7 Author: plainheart AuthorDate: Sat Dec 9 02:48:30 2023 +0800 use China CDN for Chinese website --- _jade/components/download.jade| 2 +- _jade/layouts/doc.jade| 12 ++-- _jade/layouts/example-simple.jade | 6 +++--- _jade/layouts/example.jade| 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_jade/components/download.jade b/_jade/components/download.jade index a1735325..cff805f3 100644 --- a/_jade/components/download.jade +++ b/_jade/components/download.jade @@ -3,7 +3,7 @@ extends ../layouts/basic block extra_head title 下载 - Apache ECharts -//- script(src="#{cdnThirdParty.sweetalertJS}") +//- script(src="#{cdn3rdRoot.sweetalertJS}") block content nav(class='navbar navbar-default navbar-fixed-top') diff --git a/_jade/layouts/doc.jade b/_jade/layouts/doc.jade index 2f387a91..a5ab9ee0 100644 --- a/_jade/layouts/doc.jade +++ b/_jade/layouts/doc.jade @@ -7,7 +7,7 @@ block extra_head /* position: sticky should not have overflow parents.*/ overflow-x: hidden; } -link(rel="stylesheet", href="#{cdnThirdParty.elementUICSS}") +link(rel="stylesheet", href="#{cdn3rdRoot.elementUICSS}") link(rel="stylesheet", href="#{getAssetUrl(cdnPayRoot, ecWWWLang + '/css/doc-bundle.css')}") block content @@ -34,11 +34,11 @@ block content block extra_js -script(src="#{cdnThirdParty.vueJS}") -script(src="#{cdnThirdParty.elementUIJS}") -script(src="#{cdnThirdParty.codeMirrorJS}") -script(src="#{cdnThirdParty.codeMirrorJSModeJS}") -script(src="#{cdnThirdParty.beautifierJS}") +script(src="#{cdn3rdRoot.vueJS}") +script(src="#{cdn3rdRoot.elementUIJS}") +script(src="#{cdn3rdRoot.codeMirrorJS}") +script(src="#{cdn3rdRoot.codeMirrorJSModeJS}") +script(src="#{cdn3rdRoot.beautifierJS}") script(src="#{getAssetUrl(cdnPayRoot, ecWWWLang + '/js/doc-bundle.js')}") script(type="text/javascript"). document.getElementById('nav-doc').className = 'active'; diff --git a/_jade/layouts/example-simple.jade b/_jade/layouts/example-simple.jade index afa78a80..6a5aefc8 100644 --- a/_jade/layouts/example-simple.jade +++ b/_jade/layouts/example-simple.jade @@ -7,7 +7,7 @@ block extra_head /* position: sticky should not have overflow parents.*/ overflow-x: hidden; } -link(rel="stylesheet", href="#{cdnThirdParty.elementUICSS}") +link(rel="stylesheet", href="#{cdn3rdRoot.elementUICSS}") link(rel="stylesheet", href="#{getAssetUrl(cdnPayRoot, 'examples/css/example-bundle.css')}") block content @@ -15,8 +15,8 @@ block content #ec-example-main block extra_js -script(src="#{cdnThirdParty.vueJS}") -script(src="#{cdnThirdParty.elementUIJS}") +script(src="#{cdn3rdRoot.vueJS}") +script(src="#{cdn3rdRoot.elementUIJS}") script(src="#{getAssetUrl(cdnPayRoot, 'examples/js/example-bundle.js')}") script(type="text/javascript"). window.EC_WWW_CDN_PAY_ROOT = '#{cdnPayRoot}'; diff --git a/_jade/layouts/example.jade b/_jade/layouts/example.jade index 358a8784..aa3a005d 100644 --- a/_jade/layouts/example.jade +++ b/_jade/layouts/example.jade @@ -7,7 +7,7 @@ block extra_head /* position: sticky should not have overflow parents.*/ overflow-x: hidden; } -link(rel="stylesheet", href="#{cdnThirdParty.elementUICSS}") +link(rel="stylesheet", href="#{cdn3rdRoot.elementUICSS}") link(rel="stylesheet", href="#{getAssetUrl(cdnPayRoot, 'examples/css/example-bundle.css')}") block content @@ -34,8 +34,8 @@ block content block extra_js -script(src="#{cdnThirdParty.vueJS}") -script(src="#{cdnThirdParty.elementUIJS}") +script(src="#{cdn3rdRoot.vueJS}") +script(src="#{cdn3rdRoot.elementUIJS}") script(src="#{getAssetUrl(cdnPayRoot, 'examples/js/example-bundle.js')}") script(type="text/javascript"). document.getElementById('nav-examples').className = 'active'; - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch master updated: use China CDN for Chinese website
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 813fe22e use China CDN for Chinese website 813fe22e is described below commit 813fe22e62d84eb15b7f05b4e793cebdc739e99f Author: plainheart AuthorDate: Sat Dec 9 02:37:20 2023 +0800 use China CDN for Chinese website --- public/en/api.html | 12 ++-- public/en/option-gl.html | 12 ++-- public/en/option.html | 12 ++-- public/en/tutorial.html| 12 ++-- public/zh/api.html | 12 ++-- public/zh/option-gl.html | 12 ++-- public/zh/option.html | 12 ++-- public/zh/tutorial.html| 12 ++-- src/components/LiveExample.vue | 5 +++-- src/config.js | 3 --- 10 files changed, 51 insertions(+), 53 deletions(-) diff --git a/public/en/api.html b/public/en/api.html index 7c1a2ac9..5466a43c 100644 --- a/public/en/api.html +++ b/public/en/api.html @@ -23,13 +23,13 @@ - +https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css;> - - - - - +https://fastly.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js"</a>;> +https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/index.js"</a>;> +https://fastly.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"</a>;> +https://fastly.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.min.js"</a>;> +https://fastly.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"</a>;> echartsDoc.init('#app', { diff --git a/public/en/option-gl.html b/public/en/option-gl.html index 9f4bba10..48d6e779 100644 --- a/public/en/option-gl.html +++ b/public/en/option-gl.html @@ -22,13 +22,13 @@ - +https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css;> - - - - - +https://fastly.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js"</a>;> +https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/index.js"</a>;> +https://fastly.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"</a>;> +https://fastly.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.min.js"</a>;> +https://fastly.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"</a>;> echartsDoc.init('#app', { diff --git a/public/en/option.html b/public/en/option.html index f91b695b..17bc02d4 100644 --- a/public/en/option.html +++ b/public/en/option.html @@ -24,13 +24,13 @@ <div id="app"></div> -<link rel="stylesheet" href="//fastly.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css"> +<link rel="stylesheet" href="<a rel="nofollow" href="https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css"">https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css"</a>;> <link rel="stylesheet" href="../css/doc-bundle.css"> -<script src="//fastly.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"> - - - - +https://fastly.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js"</a>;> +https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/index.js"</a>;> +https://fastly.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"</a>;> +https://fastly.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.min.js"</a>;> +https://fastly.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"</a>;> echartsDoc.init('#app', { diff --git a/public/en/tutorial.html b/public/en/tutorial.html index af0768d9..9d09eebe 100644 --- a/public/en/tutorial.html +++ b/public/en/tutorial.html @@ -23,13 +23,13 @@ <div id="app"></div> -<link rel="stylesheet" href="//fastly.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css"> +<link rel="stylesheet" href="<a rel="nofollow" href="https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css"">https://fastly.jsdelivr.net/npm/element-ui@2.15.14/lib/theme-chalk/index.css"</a>;> <link rel="stylesheet" href="../css/doc-bundle.css"> -<script src="//fastly.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"> - - - - +https://fastly.js
(echarts-www) 02/02: use China CDN for Chinese website
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 commit 6213cf021ec9ef85279d35463e4e40b99287b753 Author: plainheart AuthorDate: Sat Dec 9 02:18:58 2023 +0800 use China CDN for Chinese website --- _jade/components/builder.jade | 30 +- _jade/layouts/basic.jade | 24 +--- _jade/zh/cheat-sheet.jade | 2 +- _jade/zh/coding-standard.jade | 4 ++-- _jade/zh/download-map.jade| 4 ++-- _jade/zh/download-theme.jade | 4 ++-- _jade/zh/events.jade | 2 +- _jade/zh/events/2021-05-13-iscas.jade | 2 +- _jade/zh/events/2021-07-05-apachecon.jade | 2 +- _jade/zh/feature.jade | 2 +- _jade/zh/index.jade | 2 +- builder/build.js | 17 + builder/echarts.html | 3 ++- config/common.js | 25 + js/index.js | 2 +- 15 files changed, 83 insertions(+), 42 deletions(-) diff --git a/_jade/components/builder.jade b/_jade/components/builder.jade index 97a0b9a9..1a758b92 100644 --- a/_jade/components/builder.jade +++ b/_jade/components/builder.jade @@ -124,21 +124,33 @@ block content include ../en/footer block extra_js - script(src="https://fastly.jsdelivr.net/npm/compare-versions@3.6.0/index.min.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 extraBuilderParam = '=1'; +else +- var npmRegistryServer = 'https://data.jsdelivr.com/v1/package/npm'; +- var npmVersionFetcher = 'json.versions'; +- var tagPropName = 'tags'; + +if isCN + script(src="https://registry.npmmirror.com/compare-versions/3.6.0/files/index.js;) +else + script(src="https://fastly.jsdelivr.net/npm/compare-versions@3.6.0/index.min.js;) script. -var $versionsDom = document.querySelector('#versions'); +var $versionsDom = document.querySelector('#versions'); -fetch('https://data.jsdelivr.com/v1/package/npm/echarts', { -mode: 'cors' -}).then(res => res.json()).then(json => { -const versions = json.versions.filter(version => compareVersions(version, '3.8.0') >= 0); -versions.forEach(version => { +fetch('#{npmRegistryServer}/echarts', { mode: 'cors' }).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'); $optionDom.value = version; $optionDom.innerHTML = version; $versionsDom.appendChild($optionDom); }); -$versionsDom.value = json.tags.latest; +$versionsDom.value = json['#{tagPropName}'].latest; }); function updateCheckbox() { @@ -185,7 +197,7 @@ block extra_js parameters += '=true'; } -parameters += `=${$versionsDom.value || ''}`; +parameters += `=${$versionsDom.value || ''}!{extraBuilderParam}`; //- var email = $('#email').val(); var log = parameters; diff --git a/_jade/layouts/basic.jade b/_jade/layouts/basic.jade index 42def47c..756bbb3e 100644 --- a/_jade/layouts/basic.jade +++ b/_jade/layouts/basic.jade @@ -6,6 +6,13 @@ block variables block variablesLang +- var isCN = ecWWWLang == 'zh'; + +if isCN +- var cdn3rdRoot = cdnThirdPartyCN; +else +- var cdn3rdRoot = cdnThirdParty; + doctype html html(lang='#{htmlAttrLang}') head @@ -14,26 +21,21 @@ html(lang='#{htmlAttrLang}') meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1') meta(name='viewport', content='width=device-width,initial-scale=1,user-scalable=no') -if ecWWWLang == 'zh' +if isCN meta(name="description" content="Apache ECharts,一款基于JavaScript的数据可视化图表库,提供直观,生动,可交互,可个性化定制的数据可视化图表。") else meta(name="description" content="Apache ECharts, a powerful, interactive charting and visualization library for browser") meta(name="keywords" content="echarts,apache,charts,data-visualization,charting-library,visualization,data-viz,canvas,svg,plot,graph") link(rel='shortcut icon', href='#{cdnPayR
(echarts-www) 01/02: chore: remove demo.jade
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 commit 0ac907e0410c58b1e6340d0281038a8a630dfeb9 Author: plainheart AuthorDate: Fri Dec 8 23:24:48 2023 +0800 chore: remove demo.jade --- _jade/demo.jade| 4 _jade/zh/demo.jade | 55 -- 2 files changed, 59 deletions(-) diff --git a/_jade/demo.jade b/_jade/demo.jade deleted file mode 100644 index 8f416bdf.. --- a/_jade/demo.jade +++ /dev/null @@ -1,4 +0,0 @@ -extends layouts/redirect - -block variables -- var redirectTo = 'demo.html' diff --git a/_jade/zh/demo.jade b/_jade/zh/demo.jade deleted file mode 100644 index 9a044712.. --- a/_jade/zh/demo.jade +++ /dev/null @@ -1,55 +0,0 @@ -extends ../layouts/basic - -block extra_head -title Examples - Apache ECharts -script. -var chartId = location.hash.slice(1); -window.location ='./examples/editor.html?c=' + chartId; -link(rel="stylesheet", href="#{cdnThirdParty.perfectScrollbarCSS}") - -block content -nav(class='navbar navbar-default navbar-fixed-top') -include ../components/nav - -#left-chart-nav -ul - -#nav-mask -#nav-layer -ul.chart-list - -#chart-demo - -block extra_js -script(type='text/javascript', src='#{cdnThirdParty.lodash}') - -script(type='text/javascript', src='#{cdnThirdParty.perfectScrollbarJS}') - -script(type='text/javascript'). -var GALLERY_PATH = '#{galleryPath}'; -var GALLERY_EDITOR_PATH = GALLERY_PATH + 'editor.html?c='; -var GALLERY_VIEW_PATH = GALLERY_PATH + 'view.html?c='; -var GALLERY_THUMB_PATH = GALLERY_PATH + 'data/thumb/'; - -script(type='text/javascript', src="#{getAssetUrl(cdnPayRoot, ecWWWLang + '/js/config.js')}") -script(type='text/javascript', src="#{getAssetUrl(cdnPayRoot, ecWWWLang + '/js/examples-nav.js')}") - -script(type='text/javascript'). -document.getElementById('nav-examples').className = 'active'; -function encodeHTML(source) { -return String(source) -.replace(/&/g, '') -.replace(//g, '') -.replace(/"/g, '') -.replace(/'/g, ''); -} -function loadDemo() { -var chartId = location.hash.slice(1); -$('#chart-demo').html(''); -} - -$(window).on('hashchange', function () { -loadDemo(); -}); -loadDemo(); - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated (72cd9d37 -> 6213cf02)
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-www.git from 72cd9d37 use China CDN for Chinese website (WIP) new 0ac907e0 chore: remove demo.jade new 6213cf02 use China CDN for Chinese website 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: _jade/components/builder.jade | 30 - _jade/demo.jade | 4 --- _jade/layouts/basic.jade | 24 +++--- _jade/zh/cheat-sheet.jade | 2 +- _jade/zh/coding-standard.jade | 4 +-- _jade/zh/demo.jade| 55 --- _jade/zh/download-map.jade| 4 +-- _jade/zh/download-theme.jade | 4 +-- _jade/zh/events.jade | 2 +- _jade/zh/events/2021-05-13-iscas.jade | 2 +- _jade/zh/events/2021-07-05-apachecon.jade | 2 +- _jade/zh/feature.jade | 2 +- _jade/zh/index.jade | 2 +- builder/build.js | 17 +++--- builder/echarts.html | 3 +- config/common.js | 25 +++--- js/index.js | 2 +- 17 files changed, 83 insertions(+), 101 deletions(-) delete mode 100644 _jade/demo.jade delete mode 100644 _jade/zh/demo.jade - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master-tmp deleted (was a59feb446)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch master-tmp in repository https://gitbox.apache.org/repos/asf/echarts.git was a59feb446 [test] Add test case for https://github.com/apache/echarts/issues/19093 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 #19357 from apache/master-tmp
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 5b0c09637a00e033bc63e93fb41391b56e3a9ffd Merge: 7731729f0 a59feb446 Author: Zhongxiang Wang AuthorDate: Tue Dec 5 11:14:20 2023 +0800 Merge pull request #19357 from apache/master-tmp [test] Add test case for apache/echarts#19093 test/lib/testHelper.js| 3 + test/manual-svg-color-bug-202311.html | 184 ++ 2 files changed, 187 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated (7731729f0 -> 5b0c09637)
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 7731729f0 Merge pull request #19197 from apache/feat-pictorialBar-clip add a59feb446 [test] Add test case for https://github.com/apache/echarts/issues/19093 new 5b0c09637 Merge pull request #19357 from apache/master-tmp 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: test/lib/testHelper.js| 3 + test/manual-svg-color-bug-202311.html | 184 ++ 2 files changed, 187 insertions(+) create mode 100644 test/manual-svg-color-bug-202311.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: use China CDN for Chinese website (WIP)
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 72cd9d37 use China CDN for Chinese website (WIP) 72cd9d37 is described below commit 72cd9d375be552c4073924b161e39553648da650 Author: plainheart AuthorDate: Mon Dec 4 01:13:41 2023 +0800 use China CDN for Chinese website (WIP) --- _jade/en/index.jade | 1 - _jade/zh/download-theme.jade | 2 +- _jade/zh/index.jade | 11 --- js/index.js | 6 -- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/_jade/en/index.jade b/_jade/en/index.jade index 06ab9bc4..ae20e0da 100644 --- a/_jade/en/index.jade +++ b/_jade/en/index.jade @@ -166,4 +166,3 @@ block extra_js }; script(src='https://fastly.jsdelivr.net/npm/vanilla-lazyload@12.0.0/dist/lazyload.min.js') script(src='#{cdnPayRoot}/#{ecWWWLang}/js/index.js?_v_=#{homeVersion}') -//- https://buttons.github.io/buttons.js"</a>;> diff --git a/_jade/zh/download-theme.jade b/_jade/zh/download-theme.jade index dd324f96..5753e6ea 100644 --- a/_jade/zh/download-theme.jade +++ b/_jade/zh/download-theme.jade @@ -19,7 +19,7 @@ block content .row each themeName, idx in theme .col-sm-4.theme -a(class="download-theme" href="https://fastly.jsdelivr.net/npm/echarts/theme/#{themeName}.js?_v_=#{cdnPayVersion}; download="#{themeName}.js" target="_blank") +a(class="download-theme" href="https://registry.npmmirror.com/echarts/latest/files/theme/#{themeName}.js?_v_=#{cdnPayVersion}; download="#{themeName}.js" target="_blank") img(src="#{cdnPayRoot}/#{ecWWWLang}/asset/theme/thumb/#{themeName}.png?_v_=#{cdnPayVersion}" alt="") p #{themeName} diff --git a/_jade/zh/index.jade b/_jade/zh/index.jade index 72d705cf..1b41fc4a 100644 --- a/_jade/zh/index.jade +++ b/_jade/zh/index.jade @@ -4,8 +4,8 @@ extends ../layouts/basic block extra_head title Apache ECharts - script(src="https://fastly.jsdelivr.net/npm/scrollreveal@4.0.7/dist/scrollreveal.min.js;) - script(src="https://fastly.jsdelivr.net/npm/lottie-web@5.7.6/build/player/lottie.min.js;) + script(src="https://lib.baomitu.com/scrollReveal.js/4.0.7/scrollreveal.min.js;) +script(src="https://lib.baomitu.com/lottie-web/5.7.6/lottie.min.js;) block content nav(class='navbar navbar-default navbar-fixed-top', role="navigation") @@ -159,12 +159,9 @@ block content include ../components/footer block extra_js - script(src='https://fastly.jsdelivr.net/npm/vanilla-lazyload@12.0.0/dist/lazyload.min.js') -script(src='#{cdnPayRoot}/#{ecWWWLang}/js/index.js?_v_=#{homeVersion}') -//- https://buttons.github.io/buttons.js"</a>;> - script. window.lazyLoadOptions = { elements_selector: ".lazy" }; - script(src='https://fastly.jsdelivr.net/npm/vanilla-lazyload@12.0.0/dist/lazyload.min.js') + script(src='https://lib.baomitu.com/vanilla-lazyload/12.0.0/lazyload.min.js') +script(src='#{cdnPayRoot}/#{ecWWWLang}/js/index.js?_v_=#{homeVersion}') diff --git a/js/index.js b/js/index.js index a18b7b96..c2785f87 100644 --- a/js/index.js +++ b/js/index.js @@ -122,8 +122,10 @@ window.lazyLoadOptions = { function loadLandingAnimationScripts() { return new Promise((resolve) => { -// var landingAnimationURL = 'http://localhost/echarts-www-landing-animation/' -var landingAnimationURL = 'https://fastly.jsdelivr.net/npm/echarts-www-landing-animation/'; +var landingAnimationURL = +window.EC_WWW_LANG === 'zh' +? 'https://registry.npmmirror.com/echarts-www-landing-animation/latest/files/' +: 'https://cdn.jsdelivr.net/npm/echarts-www-landing-animation/'; // Load script. var link = document.createElement('link'); var script = document.createElement('script'); - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-www) branch master updated: chore: upgrade node-sass dep
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 683e3f27 chore: upgrade node-sass dep 683e3f27 is described below commit 683e3f27f18ea74b289254597958d40d74f024e1 Author: plainheart AuthorDate: Mon Dec 4 01:10:07 2023 +0800 chore: upgrade node-sass dep --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b922f0a..f5f49387 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "jade": "^1.11.0", "less": "^3.10.3", "md5": "^2.3.0", -"node-sass": "^7.0.0", +"node-sass": "^9.0.0", "onchange": "^6.1.0", "postcss": "^7.0.25", "requirejs": "^2.3.6", - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch feat-pictorialBar-clip deleted (was 71799e9a6)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch feat-pictorialBar-clip in repository https://gitbox.apache.org/repos/asf/echarts.git was 71799e9a6 Merge branch 'master' into feat-pictorialBar-clip 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-doc) branch dev updated (68c787fe -> 0accd2fa)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 68c787fe Merge pull request #375 from apache/master new f5b94e8b feat(sampler): add min-max sampler function new b749cbdf feat(sampler): add min-max sampler function new 3b4d0223 add version tip for new downsampling strategy `minmax` new 0accd2fa Merge pull request #374 from snukhulov/feat-add-minmax-sampler The 2539 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: en/option/series/bar.md | 5 +++-- en/option/series/line.md | 5 +++-- zh/option/series/bar.md | 3 ++- zh/option/series/line.md | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-doc) branch master updated: fix typo series-treemp -> series-treemap
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 0ecfd3e2 fix typo series-treemp -> series-treemap new d26c81d2 Merge pull request #378 from abdulhdr1/master 0ecfd3e2 is described below commit 0ecfd3e2786310e4384b42ee10b1ea4d6e58fe22 Author: Abdul AuthorDate: Tue Nov 28 11:02:52 2023 -0300 fix typo series-treemp -> series-treemap --- en/option/series/treemap.md | 4 ++-- zh/option/series/treemap.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en/option/series/treemap.md b/en/option/series/treemap.md index 1be55495..9e5b1f80 100644 --- a/en/option/series/treemap.md +++ b/en/option/series/treemap.md @@ -316,7 +316,7 @@ the the data format of [series-treemap.data](~series-treemap.data) is a forest. { value: 2323,// The value of this node, indicating the area size. // it could also be an array, such as [2323, 43, 55], in which the first item of array indicates the area size. -// The other items of the array can be used for extra visual mapping. See details in series-treemp.levels. +// The other items of the array can be used for extra visual mapping. See details in series-treemap.levels. id: 'someid-1', // id is not mandatory. // But if using API, id is used to locate node. name: 'description of this node', // show the description text in rectangle. @@ -358,7 +358,7 @@ The value of this node, indicating the area size. It could also be an array, such as [2323, 43, 55], in which the first item of array indicates the area size. -The other items of the array can be used for extra visual mapping. See details in series-treemp.levels. +The other items of the array can be used for extra visual mapping. See details in series-treemap.levels. ### id(string) diff --git a/zh/option/series/treemap.md b/zh/option/series/treemap.md index 932482d3..03c3905f 100644 --- a/zh/option/series/treemap.md +++ b/zh/option/series/treemap.md @@ -467,7 +467,7 @@ treemap 默认把第一个维度(Array 第一项)映射到『面积』上。 { value: 2323,// value字段的值,对应到面积大小。 // 也可以是数组,如 [2323, 43, 55],则数组第一项对应到面积大小。 -// 数组其他项可以用于额外的视觉映射,详情参见 series-treemp.levels。 +// 数组其他项可以用于额外的视觉映射,详情参见 series-treemap.levels。 id: 'someid-1', // id 不是必须设置的。 // 但是如果想使用 API 来改变某个节点,需要用 id 来定位。 name: 'description of this node', // 显示在矩形中的描述文字。 - 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 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-bot.git The following commit(s) were added to refs/heads/master by this push: new bbba269 chore: update workflow deps bbba269 is described below commit bbba269474032cb86e4035d0707fac69063bf3e7 Author: plainheart AuthorDate: Sat Nov 18 17:45:22 2023 +0800 chore: update workflow deps --- .github/workflows/bot-wakup.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bot-wakup.yml b/.github/workflows/bot-wakup.yml index 10f9bd4..3aec48a 100644 --- a/.github/workflows/bot-wakup.yml +++ b/.github/workflows/bot-wakup.yml @@ -11,13 +11,13 @@ jobs: strategy: matrix: -node-version: ['16.x'] +node-version: ['20.x'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} -uses: actions/setup-node@v3 +uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} registry-url: https://registry.npmjs.org/ - 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: upgrade bing-translate-api
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 5c75464 chore: upgrade bing-translate-api 5c75464 is described below commit 5c75464f28514b0f22230bdbad424bfb437d5168 Author: plainheart AuthorDate: Sat Nov 18 17:35:47 2023 +0800 chore: upgrade bing-translate-api --- 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 d05e256..c11ada3 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.9.2", +"bing-translate-api": "^2.10.0", "franc-min": "5.0.0", "probot": "^12.3.3" }, @@ -2584,9 +2584,9 @@ } }, "node_modules/bing-translate-api": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-2.9.2.tgz;, - "integrity": "sha512-zkB2LTL2g/xm7s7i/exkrTLasw7ezn5M4BuXLJmHzMx7X14saICSy7ZbNyxA5Q2f+acfhFFpDIDfNto0jx5O9A==", + "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==", "dependencies": { "got": "^11.8.6" } @@ -11348,9 +11348,9 @@ "dev": true }, "bing-translate-api": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-2.9.2.tgz;, - "integrity": "sha512-zkB2LTL2g/xm7s7i/exkrTLasw7ezn5M4BuXLJmHzMx7X14saICSy7ZbNyxA5Q2f+acfhFFpDIDfNto0jx5O9A==", + "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==", "requires": { "got": "^11.8.6" } diff --git a/package.json b/package.json index 0f21c13..3b809bb 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@plainheart/google-translate-api": "^1.2.0", -"bing-translate-api": "^2.9.2", +"bing-translate-api": "^2.10.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-bot) branch master updated: fix(glitch): skip notification for the same workflow run
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 acbdd8b fix(glitch): skip notification for the same workflow run acbdd8b is described below commit acbdd8b07543cd56a11a8078173e20605d78d713 Author: plainheart AuthorDate: Sat Nov 18 17:27:30 2023 +0800 fix(glitch): skip notification for the same workflow run --- src/glitch/wakeup.js | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/glitch/wakeup.js b/src/glitch/wakeup.js index 5974804..b134063 100644 --- a/src/glitch/wakeup.js +++ b/src/glitch/wakeup.js @@ -31,14 +31,24 @@ const WAKEUP_URL = 'https://apache-incubator-echarts-bot-1.glitch.me/probot'; } })(); +let lastNoticedWorkflowRunId; + async function isNotificationNeeded() { const failedActionRuns = await fetch('https://api.github.com/repos/apache/echarts-bot/actions/workflows/8490751/runs?status=failure_page=1') .then(res => res.json()); const latestFailedRun = failedActionRuns.workflow_runs[0]; if (!latestFailedRun) { -return true +return true; +} +if (latestFailedRun.id === lastNoticedWorkflowRunId) { +console.log('skip notification for the same workflow run:', lastNoticedWorkflowRunId); +return false; } const lastFailedTs = Date.parse(latestFailedRun.run_started_at); // send notification when the failure last for one hour and more -return Date.now() - lastFailedTs >= 60 * 60 * 1e3; +if (Date.now() - lastFailedTs >= 60 * 60 * 1e3) { +lastNoticedWorkflowRunId = latestFailedRun.id; +return true; +} +return false; } - 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 (db9ebe78 -> ebbe945e)
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 db9ebe78 fix(editor): revert jQuery reuse (due to $.getScript window context) (007749385bfcc99266c25d5401691f5be2f5a629) add 3365bd18 chore(deps-dev): bump sharp from 0.30.5 to 0.32.6 new ebbe945e Merge pull request #86 from apache/dependabot/npm_and_yarn/sharp-0.32.6 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 | 482 +- package.json | 2 +- 2 files changed, 227 insertions(+), 257 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts-examples) 01/01: Merge pull request #86 from apache/dependabot/npm_and_yarn/sharp-0.32.6
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 ebbe945efb84c7584d03ef427be6abd1e448bfe0 Merge: db9ebe78 3365bd18 Author: Zhongxiang Wang AuthorDate: Fri Nov 17 13:21:32 2023 +0800 Merge pull request #86 from apache/dependabot/npm_and_yarn/sharp-0.32.6 chore(deps-dev): bump sharp from 0.30.5 to 0.32.6 package-lock.json | 482 +- package.json | 2 +- 2 files changed, 227 insertions(+), 257 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/tooltip-dispose-NPE deleted (was 0d29cd898)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/tooltip-dispose-NPE in repository https://gitbox.apache.org/repos/asf/echarts.git was 0d29cd898 fix(tooltip): still use `parentNode.removeChild` to reserve support for IE. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch master updated: fix(tooltip): fix potential NPE when the parent node of the tooltip element doesn't exist (#19265)
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 fd9e62d7f fix(tooltip): fix potential NPE when the parent node of the tooltip element doesn't exist (#19265) fd9e62d7f is described below commit fd9e62d7fdd88e95ddaf3c371353e8f6ca7d9e6a Author: Zhongxiang Wang AuthorDate: Mon Nov 6 12:32:18 2023 +0800 fix(tooltip): fix potential NPE when the parent node of the tooltip element doesn't exist (#19265) * fix(tooltip): use `remove` rather than `parentNode.removeChild` to fix potential NPE when its parent node doesn't exists. (apache/echarts#19248) * fix(tooltip): clearTimeout when disposing * fix(tooltip): still use `parentNode.removeChild` to reserve support for IE. --- src/component/tooltip/TooltipHTMLContent.ts | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/component/tooltip/TooltipHTMLContent.ts b/src/component/tooltip/TooltipHTMLContent.ts index da1960835..7e08b53f9 100644 --- a/src/component/tooltip/TooltipHTMLContent.ts +++ b/src/component/tooltip/TooltipHTMLContent.ts @@ -520,7 +520,11 @@ class TooltipHTMLContent { } dispose() { -this.el.parentNode.removeChild(this.el); +clearTimeout(this._hideTimeout); +clearTimeout(this._longHideTimeout); + +const parentNode = this.el.parentNode; +parentNode && parentNode.removeChild(this.el); this.el = this._container = null; } - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/tooltip-dispose-NPE updated: fix(tooltip): still use `parentNode.removeChild` to reserve support for IE.
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch fix/tooltip-dispose-NPE in repository https://gitbox.apache.org/repos/asf/echarts.git The following commit(s) were added to refs/heads/fix/tooltip-dispose-NPE by this push: new 0d29cd898 fix(tooltip): still use `parentNode.removeChild` to reserve support for IE. 0d29cd898 is described below commit 0d29cd898f550d7d6451af4f4f56881082188941 Author: plainheart AuthorDate: Wed Nov 1 23:27:03 2023 +0800 fix(tooltip): still use `parentNode.removeChild` to reserve support for IE. --- src/component/tooltip/TooltipHTMLContent.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/component/tooltip/TooltipHTMLContent.ts b/src/component/tooltip/TooltipHTMLContent.ts index 817ec1d60..7e08b53f9 100644 --- a/src/component/tooltip/TooltipHTMLContent.ts +++ b/src/component/tooltip/TooltipHTMLContent.ts @@ -522,7 +522,9 @@ class TooltipHTMLContent { dispose() { clearTimeout(this._hideTimeout); clearTimeout(this._longHideTimeout); -this.el.remove(); + +const parentNode = this.el.parentNode; +parentNode && parentNode.removeChild(this.el); this.el = this._container = null; } - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/tooltip-dispose-NPE updated: fix(tooltip): clearTimeout when disposing
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch fix/tooltip-dispose-NPE in repository https://gitbox.apache.org/repos/asf/echarts.git The following commit(s) were added to refs/heads/fix/tooltip-dispose-NPE by this push: new ab4372f8e fix(tooltip): clearTimeout when disposing ab4372f8e is described below commit ab4372f8e7db8656ca5c43e6a90ba7bb40f212d4 Author: plainheart AuthorDate: Wed Nov 1 19:27:32 2023 +0800 fix(tooltip): clearTimeout when disposing --- src/component/tooltip/TooltipHTMLContent.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/component/tooltip/TooltipHTMLContent.ts b/src/component/tooltip/TooltipHTMLContent.ts index cc6ef51c5..817ec1d60 100644 --- a/src/component/tooltip/TooltipHTMLContent.ts +++ b/src/component/tooltip/TooltipHTMLContent.ts @@ -520,6 +520,8 @@ class TooltipHTMLContent { } dispose() { +clearTimeout(this._hideTimeout); +clearTimeout(this._longHideTimeout); this.el.remove(); this.el = this._container = null; } - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) 01/01: fix(tooltip): use `remove` rather than `parentNode.removeChild` to fix potential NPE when its parent node doesn't exists. (apache/echarts#19248)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a commit to branch fix/tooltip-dispose-NPE in repository https://gitbox.apache.org/repos/asf/echarts.git commit 61e22c33ce44867282c4fd475a335bb8b3488cc6 Author: plainheart AuthorDate: Wed Nov 1 19:04:22 2023 +0800 fix(tooltip): use `remove` rather than `parentNode.removeChild` to fix potential NPE when its parent node doesn't exists. (apache/echarts#19248) --- src/component/tooltip/TooltipHTMLContent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/tooltip/TooltipHTMLContent.ts b/src/component/tooltip/TooltipHTMLContent.ts index da1960835..cc6ef51c5 100644 --- a/src/component/tooltip/TooltipHTMLContent.ts +++ b/src/component/tooltip/TooltipHTMLContent.ts @@ -520,7 +520,7 @@ class TooltipHTMLContent { } dispose() { -this.el.parentNode.removeChild(this.el); +this.el.remove(); this.el = this._container = null; } - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
(echarts) branch fix/tooltip-dispose-NPE created (now 61e22c33c)
This is an automated email from the ASF dual-hosted git repository. wangzx pushed a change to branch fix/tooltip-dispose-NPE in repository https://gitbox.apache.org/repos/asf/echarts.git at 61e22c33c fix(tooltip): use `remove` rather than `parentNode.removeChild` to fix potential NPE when its parent node doesn't exists. (apache/echarts#19248) This branch includes the following new commits: new 61e22c33c fix(tooltip): use `remove` rather than `parentNode.removeChild` to fix potential NPE when its parent node doesn't exists. (apache/echarts#19248) 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