[echarts] 01/01: Merge pull request #18829 from apache/workflow/pr-preview
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 82153b647e8a0838b36248d4d50a8fc76a9e9bd9 Merge: 78f56df4f 497c756ef Author: Wenli Zhang AuthorDate: Thu Jun 29 21:19:57 2023 +0800 Merge pull request #18829 from apache/workflow/pr-preview chore(workflow): refactor pr review workflow .github/workflows/ci.yml | 102 -- .github/workflows/pr-preview.yml | 76 ++ .github/workflows/teardown-pr-preview.yml | 30 + 3 files changed, 134 insertions(+), 74 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (78f56df4f -> 82153b647)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 78f56df4f Merge pull request #18828 from apache/fix/workflow-env-var add 497c756ef chore(workflow): refactor pr review workflow new 82153b647 Merge pull request #18829 from apache/workflow/pr-preview The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci.yml | 102 -- .github/workflows/pr-preview.yml | 76 ++ .github/workflows/teardown-pr-preview.yml | 30 + 3 files changed, 134 insertions(+), 74 deletions(-) create mode 100644 .github/workflows/pr-preview.yml create mode 100644 .github/workflows/teardown-pr-preview.yml - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix/workflow-env-var deleted (was 3f083f1ba)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix/workflow-env-var in repository https://gitbox.apache.org/repos/asf/echarts.git was 3f083f1ba chore(workflow): fix wrong env variable 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 (48de47ed7 -> 78f56df4f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 48de47ed7 Merge pull request #18803 from apache/workflow/pr-preview add 3f083f1ba chore(workflow): fix wrong env variable new 78f56df4f Merge pull request #18828 from apache/fix/workflow-env-var The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18828 from apache/fix/workflow-env-var
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 78f56df4f6541e94b6625a8e9042074d3b65a66a Merge: 48de47ed7 3f083f1ba Author: Wenli Zhang AuthorDate: Thu Jun 29 14:57:48 2023 +0800 Merge pull request #18828 from apache/fix/workflow-env-var chore(workflow): fix wrong env variable .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch workflow/pr-preview deleted (was ac41c5338)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch workflow/pr-preview in repository https://gitbox.apache.org/repos/asf/echarts.git was ac41c5338 chore: change the query param `pr` of the `pr-preview` action to `version` 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 (0ddf9f77d -> 48de47ed7)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 0ddf9f77d Merge pull request #18808 from linghaoSu/fix/sunburst-rotate-label add bcb695c38 chore: add PR preview workflow add ac41c5338 chore: change the query param `pr` of the `pr-preview` action to `version` new 48de47ed7 Merge pull request #18803 from apache/workflow/pr-preview The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci.yml | 90 ++-- 1 file changed, 87 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18803 from apache/workflow/pr-preview
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 48de47ed7a71b6f8eb52d7f2efd9048f4a93f4d3 Merge: 0ddf9f77d ac41c5338 Author: Wenli Zhang AuthorDate: Thu Jun 29 10:18:01 2023 +0800 Merge pull request #18803 from apache/workflow/pr-preview chore: add PR preview workflow .github/workflows/ci.yml | 90 ++-- 1 file changed, 87 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-examples] branch pr-preview deleted (was ab36fa8e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch pr-preview in repository https://gitbox.apache.org/repos/asf/echarts-examples.git was ab36fa8e feat(editor): add `noReview` tip 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-examples] branch gh-pages updated (f2896129 -> 12b61104)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch gh-pages in repository https://gitbox.apache.org/repos/asf/echarts-examples.git from f2896129 chore(deps): bump semver from 7.3.7 to 7.5.2 (#76) add c242fbb8 chore: update README.md add aca662d2 feat(editor): support PR preview (apache/echarts#18803) add ab36fa8e feat(editor): add `noReview` tip new 12b61104 Merge pull request #77 from apache/pr-preview 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: README.md | 40 ++--- public/en/editor.html | 4 +- public/zh/editor.html | 4 +- src/common/config.js| 6 +- src/common/i18n.js | 64 src/common/store.js | 12 ++ src/editor/Editor.vue | 357 +++- src/editor/Preview.vue | 72 +++-- src/editor/sandbox/index.js | 49 +++--- 9 files changed, 545 insertions(+), 63 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 #77 from apache/pr-preview
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/echarts-examples.git commit 12b61104cce9be3b767affe2fac3ca21da73fae9 Merge: f2896129 ab36fa8e Author: Wenli Zhang AuthorDate: Thu Jun 29 10:10:04 2023 +0800 Merge pull request #77 from apache/pr-preview feat(editor): support PR preview README.md | 40 ++--- public/en/editor.html | 4 +- public/zh/editor.html | 4 +- src/common/config.js| 6 +- src/common/i18n.js | 64 src/common/store.js | 12 ++ src/editor/Editor.vue | 357 +++- src/editor/Preview.vue | 72 +++-- src/editor/sandbox/index.js | 49 +++--- 9 files changed, 545 insertions(+), 63 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix(sunburst): normalize label rotation when decompress from matrix
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 e7ad886d7 fix(sunburst): normalize label rotation when decompress from
matrix
new 0ddf9f77d Merge pull request #18808 from
linghaoSu/fix/sunburst-rotate-label
e7ad886d7 is described below
commit e7ad886d7bbe9e7b5001cc888c0c5833b08edb6c
Author: linghao.su
AuthorDate: Mon Jun 26 23:48:31 2023 +0800
fix(sunburst): normalize label rotation when decompress from matrix
---
src/chart/sunburst/SunburstPiece.ts | 2 +-
src/label/LabelManager.ts | 3 +
test/runTest/actions/__meta__.json | 1 +
test/runTest/actions/sunburst-label-rotate.json | 1 +
test/sunburst-label-rotate.html | 110
5 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/src/chart/sunburst/SunburstPiece.ts
b/src/chart/sunburst/SunburstPiece.ts
index f937b59ab..b0d662796 100644
--- a/src/chart/sunburst/SunburstPiece.ts
+++ b/src/chart/sunburst/SunburstPiece.ts
@@ -270,7 +270,7 @@ class SunburstPiece extends graphic.Sector {
rotate = rotateType * Math.PI / 180;
}
-state.rotation = rotate;
+state.rotation = normalizeRadian(rotate);
});
diff --git a/src/label/LabelManager.ts b/src/label/LabelManager.ts
index f2b2aefd3..d20c75f16 100644
--- a/src/label/LabelManager.ts
+++ b/src/label/LabelManager.ts
@@ -53,6 +53,7 @@ import { PathStyleProps } from 'zrender/src/graphic/Path';
import Model from '../model/Model';
import { prepareLayoutList, hideOverlap, shiftLayoutOnX, shiftLayoutOnY } from
'./labelLayoutHelper';
import { labelInner, animateLabelValue } from './labelStyle';
+import { normalizeRadian } from 'zrender/src/contain/util';
interface LabelDesc {
label: ZRText
@@ -219,6 +220,8 @@ class LabelManager {
dummyTransformable.scaleX = dummyTransformable.scaleY = 1;
}
+dummyTransformable.rotation =
normalizeRadian(dummyTransformable.rotation);
+
const host = label.__hostTarget;
let hostRect;
if (host) {
diff --git a/test/runTest/actions/__meta__.json
b/test/runTest/actions/__meta__.json
index e5263c168..dee65260b 100644
--- a/test/runTest/actions/__meta__.json
+++ b/test/runTest/actions/__meta__.json
@@ -177,6 +177,7 @@
"stackBar-dataZoom": 7,
"sunburst-book": 1,
"sunburst-canvas": 1,
+ "sunburst-label-rotate": 1,
"svg-ssr": 1,
"symbol": 1,
"symbol2": 1,
diff --git a/test/runTest/actions/sunburst-label-rotate.json
b/test/runTest/actions/sunburst-label-rotate.json
new file mode 100644
index 0..f2e04c555
--- /dev/null
+++ b/test/runTest/actions/sunburst-label-rotate.json
@@ -0,0 +1 @@
+[{"name":"Action
1","ops":[{"type":"mousemove","time":1481,"x":532,"y":440},{"type":"mousemove","time":1683,"x":530,"y":437},{"type":"mousemove","time":1889,"x":530,"y":437},{"type":"mousemove","time":2092,"x":516,"y":421},{"type":"mousemove","time":2298,"x":510,"y":410},{"type":"mousemove","time":2500,"x":499,"y":393},{"type":"screenshot","time":2642},{"type":"mousemove","time":2705,"x":494,"y":386},{"type":"mousemove","time":2905,"x":447,"y":313},{"type":"mousemove","time":3111,"x":441
[...]
\ No newline at end of file
diff --git a/test/sunburst-label-rotate.html b/test/sunburst-label-rotate.html
new file mode 100644
index 0..a249b1b6e
--- /dev/null
+++ b/test/sunburst-label-rotate.html
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+require([
+"echarts",
+// 'map/js/china',
+// './data/nutrients.json'
+], function (echarts) {
+var option;
+
+var data = [
+{
+name: "Grandpa",
+children: [
+{
+name: "Uncle Leo",
+value: 15,
+children: [
+
[echarts] branch husky created (now cc71ba06c)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch husky in repository https://gitbox.apache.org/repos/asf/echarts.git at cc71ba06c chore: update pre commit permission No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch ssr updated: fix(ssr): remove unnecessary code
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch ssr
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/ssr by this push:
new 01df82a9e fix(ssr): remove unnecessary code
01df82a9e is described below
commit 01df82a9ed41ef6b26d73f4124bc75f3b2f9e1ad
Author: Ovilia
AuthorDate: Tue Jun 27 14:44:52 2023 +0800
fix(ssr): remove unnecessary code
---
src/core/echarts.ts | 4
1 file changed, 4 deletions(-)
diff --git a/src/core/echarts.ts b/src/core/echarts.ts
index e01e30ddc..75bd56561 100644
--- a/src/core/echarts.ts
+++ b/src/core/echarts.ts
@@ -2767,10 +2767,6 @@ export function getInstanceById(key: string):
EChartsType | undefined {
return instances[key];
}
-export function registerSSRDataGetter() {
-
-}
-
/**
* Register theme
*/
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch ssr updated (6bca1329b -> c8ba77cc2)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts.git from 6bca1329b chore(ssr): update building of ssr client add 8abf36c2e fix(lines): symbolSize should be updated #18350 add ae0dd0efe chore: make reproduction link required add 1ea88856a Merge pull request #18458 from cloydlau/master add 18752ca58 chore: add official editor link to issue template add cb5b9762e Merge pull request #18464 from apache/update-issue-template add 24c01c134 fix(legend): inherit legend rich text color from legend's options. close #18196 add c62197285 add test case add f5bb3b0c8 Merge pull request #18260 from ChepteaCatalin/fix-18196 add 036c610a9 feat(axisPointer): add option to disable emphasis. close #18495 add 8041cde9a fix(tooltip): remove triggerEmphasis from involveSeries add 6b4f8950f Merge pull request #18524 from juliepagano/fix-18495 add e39e3df90 fix(time-format): fix yy time format add 103b3e364 Merge pull request #18535 from linghaoSu/fix/time-format add 98a78b2c5 fix(label): ellipsis was not working add f22a8edf8 Merge pull request #18525 from apache/fix-18517 add 18645a72f chore: update `jest-canvas-mock` to fix test fails on node v18 add 5fd7a07c8 chore: fix node version doesn't work and update node to v18 add d7ac6c380 Merge pull request #18538 from apache/fix/jest-canvas-mock add 691afc7d5 fix(emphasis): fix focus self not work when item emphasis by other component add dc141d2c2 fix(state): lint comment in states.ts add 6da8276ab Merge pull request #18511 from linghaoSu/fix/emphasis_self add 73e566cce chore(deps): bump yaml and husky add 99f5cfd73 Merge pull request #18563 from apache/dependabot/npm_and_yarn/yaml-and-husky--removed add fa5dbd8c6 update `init` function type signature so it can be identical to document add 8b0877344 Merge pull request #18575 from zhuscat/patch-1 add 41d906a67 fix: typo in echarts.all.ts add 9e5745a01 Merge pull request #18613 from kirklin/master add a237e0a78 fix(graph): fix graph chart can't be hidden by legend due to edgeLabel NPE. add dfd95aa50 chore: enable eslint cache. add daa747931 Merge pull request #18624 from apache/fix/graph/edgeLabel-NPE add bb403c1d4 test(pie): add a test case to cover #18412 add 38d02654b Merge pull request #18625 from apache/test/pie-selectedOffset add 77ef25280 fix(axis): show last tick for single data #18453 add a555684bb Merge pull request #18469 from apache/fix-18453 add 9291b824b chore(deps): bump socket.io-parser from 3.4.2 to 3.4.3 add e20d372b0 Merge pull request #18660 from apache/dependabot/npm_and_yarn/socket.io-parser-3.4.3 add 060d5f958 test(deps): move some dependencies that only are required by VRT to dedicated folder to speed up npm install. add 8c4b8f404 fix(husky): fix husky hooks not install brought by the update in 73e566cce94326e87173c2bf5699bc90864334e9 add 306af1055 test(deps): move `slugify` to test folder add 5ae2c84ef feat(test): add tips for installing dependencies before running visual test & add eslint config for `runTest` folder add b7002c6ab feat(test): add scripts into VRT tool package.json add 0749a6578 Merge pull request #18725 from apache/move-test-dep add 54d82434b fix(label): revert fdda0254e2a1594f71a44a2a0c30def700e58acb (#18222) add 9ea570c97 fix(sankey): fix `value` is undefined in label/edgeLabel formatter. add 9ee9b91ca fix(sankey): prevent `edgeLabel` formatter from inheriting `label.formatter`. add 7dce2b6be test(pie): tweak `pie-label` test case add f36dc4558 Merge pull request #18733 from apache/fix/sankey-label-formatter add 8ef4d3b8b fix(api): only deprecate disConnect but not disconnect add f27b086b2 Merge pull request #18758 from Justineo/fix-disconnect add c8ba77cc2 chore: merge No new revisions were added by this update. Summary of changes: .github/ISSUE_TEMPLATE/bug_report.yml |6 +- .github/workflows/ci.yml |4 +- .github/workflows/nightly-next.yml|4 +- .github/workflows/nightly.yml |5 +- .github/workflows/source-release.yml |6 +- .husky/pre-commit |5 + .huskyrc |5 - package-lock.json | 4563 +-- package.json | 15 +- src/chart/helper/Line.ts | 20 +- src/chart/sankey/SankeyView.ts| 35 +- src/component/axisPointer/AxisPointerModel.ts |1 + src/component/axisPointer/axisTrigger.ts |2 +- src/component/axisPointer/modelHelper.ts |4 + s
[echarts] branch ssr updated: chore(ssr): update building of ssr client
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch ssr
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/ssr by this push:
new 6bca1329b chore(ssr): update building of ssr client
6bca1329b is described below
commit 6bca1329b195b7851eb19ce1e43d866c0ba05a8f
Author: Ovilia
AuthorDate: Tue Jun 27 14:20:29 2023 +0800
chore(ssr): update building of ssr client
---
.github/workflows/source-release.yml | 1 +
build/build-ssr-client.js| 36
build/pre-publish.js | 2 +-
ssr/client/dist/index.js | 109 +++
ssr/client/dist/index.js.map | 1 +
ssr/client/src/index.ts | 4 +-
test/lib/config.js | 2 +-
test/ssr.html| 9 +--
8 files changed, 120 insertions(+), 44 deletions(-)
diff --git a/.github/workflows/source-release.yml
b/.github/workflows/source-release.yml
index 87b85d5cc..959bc99c6 100644
--- a/.github/workflows/source-release.yml
+++ b/.github/workflows/source-release.yml
@@ -87,6 +87,7 @@ jobs:
index.d.ts
src/
extension-src/
+ssr/client/src/
licenses/
theme/
build/
diff --git a/build/build-ssr-client.js b/build/build-ssr-client.js
deleted file mode 100644
index 6f89a4432..0
--- a/build/build-ssr-client.js
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-const rollup = require('rollup');
-const chalk = require('chalk');
-const createSSRClient = require('./config').createSSRClient;
-
-async function run() {
-const config = createSSRClient({ min: true });
-console.log(chalk.cyan.dim(`Bundling ${config.input}`))
-
-console.time('rollup build ssr-client');
-const bundle = await rollup.rollup(config);
-await bundle.write(config.output);
-console.timeEnd('rollup build ssr-client');
-}
-
-run();
diff --git a/build/pre-publish.js b/build/pre-publish.js
index 91914e576..6975c2744 100644
--- a/build/pre-publish.js
+++ b/build/pre-publish.js
@@ -249,7 +249,7 @@ async function tsCompile(compilerOptionsOverride,
srcPathList) {
&& compilerOptionsOverride.rootDir
&& compilerOptionsOverride.outDir
);
-console.log(compilerOptionsOverride, srcPathList)
+
let compilerOptions = {
...tsConfig.compilerOptions,
...compilerOptionsOverride,
diff --git a/ssr/client/dist/index.js b/ssr/client/dist/index.js
new file mode 100644
index 0..818242b77
--- /dev/null
+++ b/ssr/client/dist/index.js
@@ -0,0 +1,109 @@
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+(function (global, factory) {
+ typeof exports === 'object' && typeof module !== 'undefined' ?
factory(exports) :
+ typeof define === 'function' && define.amd ? define(['exports'], factory) :
+ (global = typeof globalThis !== 'undefined' ? globalThis : global || self,
factory(global['echarts-ssr-client'] = {}));
+}(this, (function (exports) { 'use strict';
+
+ /**
+ * AUTO-GENERATED FILE. DO NOT MODIFY.
+ */
+
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under
[echarts] branch ssr updated (b2ff198ac -> a63297085)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts.git from b2ff198ac feat(ssr): call registerSSRDataGetter instead of metaData add a63297085 chore(ssr): update building ssr client No new revisions were added by this update. Summary of changes: .gitignore | 1 + .../build-ssr-client.js| 25 build/build.js | 6 ++ build/config.js| 16 + build/pre-publish.js | 30 - package.json | 3 +- ssr/client/src/index.ts| 74 ++ test/lib/config.js | 1 + test/ssr.html | 46 +- 9 files changed, 145 insertions(+), 57 deletions(-) copy test/build/esm2cjs/src/forbiden-export.src.js => build/build-ssr-client.js (63%) create mode 100644 ssr/client/src/index.ts - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (e20d372b0 -> 0749a6578)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
from e20d372b0 Merge pull request #18660 from
apache/dependabot/npm_and_yarn/socket.io-parser-3.4.3
add 060d5f958 test(deps): move some dependencies that only are required by
VRT to dedicated folder to speed up npm install.
add 8c4b8f404 fix(husky): fix husky hooks not install brought by the
update in 73e566cce94326e87173c2bf5699bc90864334e9
add 306af1055 test(deps): move `slugify` to test folder
add 5ae2c84ef feat(test): add tips for installing dependencies before
running visual test & add eslint config for `runTest` folder
add b7002c6ab feat(test): add scripts into VRT tool package.json
add 0749a6578 Merge pull request #18725 from apache/move-test-dep
No new revisions were added by this update.
Summary of changes:
.husky/pre-commit |5 +
.huskyrc |5 -
package-lock.json | 4155 ++--
package.json |9 +-
{extension-src => test/runTest}/.eslintrc.yaml |8 +-
test/runTest/client/index.html |4 +-
test/runTest/package-lock.json | 5023
test/runTest/package.json | 13 +-
test/runTest/recorder/index.html |4 +-
test/runTest/server.js | 15 +-
10 files changed, 5317 insertions(+), 3924 deletions(-)
create mode 100644 .husky/pre-commit
delete mode 100644 .huskyrc
copy {extension-src => test/runTest}/.eslintrc.yaml (92%)
create mode 100644 test/runTest/package-lock.json
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch move-test-dep deleted (was b7002c6ab)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch move-test-dep in repository https://gitbox.apache.org/repos/asf/echarts.git was b7002c6ab feat(test): add scripts into VRT tool 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] branch master updated (0749a6578 -> f36dc4558)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 0749a6578 Merge pull request #18725 from apache/move-test-dep add 54d82434b fix(label): revert fdda0254e2a1594f71a44a2a0c30def700e58acb (#18222) add 9ea570c97 fix(sankey): fix `value` is undefined in label/edgeLabel formatter. add 9ee9b91ca fix(sankey): prevent `edgeLabel` formatter from inheriting `label.formatter`. add 7dce2b6be test(pie): tweak `pie-label` test case new f36dc4558 Merge pull request #18733 from apache/fix/sankey-label-formatter The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/chart/sankey/SankeyView.ts | 35 +++ src/label/labelStyle.ts| 6 +++--- test/pie-label.html| 3 +++ test/sankey-labelValue.html| 27 --- 4 files changed, 53 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18733 from apache/fix/sankey-label-formatter
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit f36dc455851444b3effc4df63fa39090536891de Merge: 0749a6578 7dce2b6be Author: Wenli Zhang AuthorDate: Tue Jun 13 19:06:37 2023 +0800 Merge pull request #18733 from apache/fix/sankey-label-formatter fix(sankey): fix `value` is undefined in label/edgeLabel formatter src/chart/sankey/SankeyView.ts | 35 +++ src/label/labelStyle.ts| 6 +++--- test/pie-label.html| 3 +++ test/sankey-labelValue.html| 27 --- 4 files changed, 53 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix/sankey-label-formatter deleted (was 7dce2b6be)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix/sankey-label-formatter in repository https://gitbox.apache.org/repos/asf/echarts.git was 7dce2b6be test(pie): tweak `pie-label` test case 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 ssr updated (27cc76986 -> b2ff198ac)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts.git from 27cc76986 test(ssr): add test cases add 0e7eac717 feat(ssr): improve code add b2ff198ac feat(ssr): call registerSSRDataGetter instead of metaData No new revisions were added by this update. Summary of changes: src/component/legend/LegendView.ts | 29 + src/core/echarts.ts| 13 + src/util/innerStore.ts | 18 ++ test/ssr.html | 37 + 4 files changed, 57 insertions(+), 40 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-examples] branch gh-pages updated: fix: remove unnecessary tooltip in the example
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 8bb5ad5c fix: remove unnecessary tooltip in the example
8bb5ad5c is described below
commit 8bb5ad5cb2940e32bebb9b123ee0c9d2801cd273
Author: Ovilia
AuthorDate: Wed May 31 15:09:46 2023 +0800
fix: remove unnecessary tooltip in the example
---
public/examples/ts/candlestick-brush.ts | 12
1 file changed, 12 deletions(-)
diff --git a/public/examples/ts/candlestick-brush.ts
b/public/examples/ts/candlestick-brush.ts
index 686bbf1b..862ddcf7 100644
--- a/public/examples/ts/candlestick-brush.ts
+++ b/public/examples/ts/candlestick-brush.ts
@@ -195,18 +195,6 @@ $.get(ROOT_PATH + '/data/asset/data/stock-DJI.json',
function (rawData) {
color0: downColor,
borderColor: undefined,
borderColor0: undefined
- },
- tooltip: {
-formatter: function (param: any) {
- param = param[0];
- return [
-'Date: ' + param.name + '',
-'Open: ' + param.data[0] + '',
-'Close: ' + param.data[1] + '',
-'Lowest: ' + param.data[2] + '',
-'Highest: ' + param.data[3] + ''
- ].join('');
-}
}
},
{
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-18453 deleted (was 77ef25280)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-18453 in repository https://gitbox.apache.org/repos/asf/echarts.git was 77ef25280 fix(axis): show last tick for single data #18453 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 (38d02654b -> a555684bb)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 38d02654b Merge pull request #18625 from apache/test/pie-selectedOffset add 77ef25280 fix(axis): show last tick for single data #18453 new a555684bb Merge pull request #18469 from apache/fix-18453 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/coord/Axis.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18469 from apache/fix-18453
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit a555684bb96010382c1e60569c3e0a237ffb2849 Merge: 38d02654b 77ef25280 Author: Wenli Zhang AuthorDate: Tue May 23 15:59:59 2023 +0800 Merge pull request #18469 from apache/fix-18453 fix(axis): show last tick for single data #18453 src/coord/Axis.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18558 from apache/master
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch next in repository https://gitbox.apache.org/repos/asf/echarts.git commit 11b4c8e93b88b9d807195162246df1715ced3908 Merge: 5c1c53d2a 99f5cfd73 Author: Wenli Zhang AuthorDate: Tue Apr 25 11:05:34 2023 +0800 Merge pull request #18558 from apache/master chore: merge `master` branch to `next` branch to fix broken nightly-next build .github/ISSUE_TEMPLATE/bug_report.yml | 6 +- .github/workflows/ci.yml | 4 +- .github/workflows/nightly-next.yml| 4 +- .github/workflows/nightly.yml | 5 +- .github/workflows/source-release.yml | 6 +- build/build.js| 4 +- package-lock.json | 482 +- package.json | 4 +- src/chart/helper/Line.ts | 20 +- src/component/axisPointer/AxisPointerModel.ts | 1 + src/component/axisPointer/axisTrigger.ts | 2 +- src/component/axisPointer/modelHelper.ts | 4 + src/component/legend/LegendView.ts| 8 +- src/label/labelStyle.ts | 2 +- src/util/states.ts| 7 + src/util/time.ts | 2 +- src/util/types.ts | 4 + test/emphasis-self.html | 137 ++ test/label-ellipsis.html | 110 + test/legend-style.html| 56 +++ test/lines-symbolSize-update.html | 107 + test/runTest/actions/__meta__.json| 4 +- test/runTest/actions/emphasis-self.json | 1 + test/runTest/actions/lines-symbolSize-update.json | 1 + test/runTest/actions/tooltip-axisPointer2.json| 2 +- test/tooltip-axisPointer2.html| 216 +- test/ut/spec/util/time.test.ts| 131 ++ 27 files changed, 842 insertions(+), 488 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch next updated (5c1c53d2a -> 11b4c8e93)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/echarts.git
from 5c1c53d2a Merge pull request #18420 from apache/master
add 9caa5f8dd chore: update `prepublish` to `prepare` in build script.
(follow up ecomfe/zrender#998 & #18416)
add 6dbe25ca7 Merge pull request #18427 from apache/update-script
add 8abf36c2e fix(lines): symbolSize should be updated #18350
add ae0dd0efe chore: make reproduction link required
add 1ea88856a Merge pull request #18458 from cloydlau/master
add 18752ca58 chore: add official editor link to issue template
add cb5b9762e Merge pull request #18464 from apache/update-issue-template
add 24c01c134 fix(legend): inherit legend rich text color from legend's
options. close #18196
add c62197285 add test case
add f5bb3b0c8 Merge pull request #18260 from ChepteaCatalin/fix-18196
add 036c610a9 feat(axisPointer): add option to disable emphasis. close
#18495
add 8041cde9a fix(tooltip): remove triggerEmphasis from involveSeries
add 6b4f8950f Merge pull request #18524 from juliepagano/fix-18495
add e39e3df90 fix(time-format): fix yy time format
add 103b3e364 Merge pull request #18535 from linghaoSu/fix/time-format
add 98a78b2c5 fix(label): ellipsis was not working
add f22a8edf8 Merge pull request #18525 from apache/fix-18517
add 18645a72f chore: update `jest-canvas-mock` to fix test fails on node
v18
add 5fd7a07c8 chore: fix node version doesn't work and update node to v18
add d7ac6c380 Merge pull request #18538 from apache/fix/jest-canvas-mock
add 691afc7d5 fix(emphasis): fix focus self not work when item emphasis by
other component
add dc141d2c2 fix(state): lint comment in states.ts
add 6da8276ab Merge pull request #18511 from linghaoSu/fix/emphasis_self
add 73e566cce chore(deps): bump yaml and husky
add 99f5cfd73 Merge pull request #18563 from
apache/dependabot/npm_and_yarn/yaml-and-husky--removed
new 11b4c8e93 Merge pull request #18558 from apache/master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/ISSUE_TEMPLATE/bug_report.yml | 6 +-
.github/workflows/ci.yml | 4 +-
.github/workflows/nightly-next.yml| 4 +-
.github/workflows/nightly.yml | 5 +-
.github/workflows/source-release.yml | 6 +-
build/build.js| 4 +-
package-lock.json | 482 +-
package.json | 4 +-
src/chart/helper/Line.ts | 20 +-
src/component/axisPointer/AxisPointerModel.ts | 1 +
src/component/axisPointer/axisTrigger.ts | 2 +-
src/component/axisPointer/modelHelper.ts | 4 +
src/component/legend/LegendView.ts| 8 +-
src/label/labelStyle.ts | 2 +-
src/util/states.ts| 7 +
src/util/time.ts | 2 +-
src/util/types.ts | 4 +
test/emphasis-self.html | 137 ++
test/{line-step.html => label-ellipsis.html} | 54 +--
test/legend-style.html| 56 +++
test/lines-symbolSize-update.html | 107 +
test/runTest/actions/__meta__.json| 4 +-
test/runTest/actions/emphasis-self.json | 1 +
test/runTest/actions/lines-symbolSize-update.json | 1 +
test/runTest/actions/tooltip-axisPointer2.json| 2 +-
test/tooltip-axisPointer2.html| 216 +-
test/ut/spec/util/time.test.ts| 131 ++
27 files changed, 759 insertions(+), 515 deletions(-)
create mode 100644 test/emphasis-self.html
copy test/{line-step.html => label-ellipsis.html} (67%)
create mode 100644 test/lines-symbolSize-update.html
create mode 100644 test/runTest/actions/emphasis-self.json
create mode 100644 test/runTest/actions/lines-symbolSize-update.json
create mode 100755 test/ut/spec/util/time.test.ts
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (6da8276ab -> 99f5cfd73)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 6da8276ab Merge pull request #18511 from linghaoSu/fix/emphasis_self add 73e566cce chore(deps): bump yaml and husky add 99f5cfd73 Merge pull request #18563 from apache/dependabot/npm_and_yarn/yaml-and-husky--removed No new revisions were added by this update. Summary of changes: package-lock.json | 468 ++ package.json | 2 +- 2 files changed, 12 insertions(+), 458 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (d7ac6c380 -> 6da8276ab)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from d7ac6c380 Merge pull request #18538 from apache/fix/jest-canvas-mock new 691afc7d5 fix(emphasis): fix focus self not work when item emphasis by other component new dc141d2c2 fix(state): lint comment in states.ts new 6da8276ab Merge pull request #18511 from linghaoSu/fix/emphasis_self The 9063 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/util/states.ts | 7 ++ test/emphasis-self.html | 137 test/runTest/actions/__meta__.json | 1 + test/runTest/actions/emphasis-self.json | 1 + 4 files changed, 146 insertions(+) create mode 100644 test/emphasis-self.html create mode 100644 test/runTest/actions/emphasis-self.json - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (103b3e364 -> f22a8edf8)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
from 103b3e364 Merge pull request #18535 from linghaoSu/fix/time-format
add 98a78b2c5 fix(label): ellipsis was not working
new f22a8edf8 Merge pull request #18525 from apache/fix-18517
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/label/labelStyle.ts | 2 +-
src/util/types.ts| 2 ++
test/{line-step.html => label-ellipsis.html} | 54 ++--
3 files changed, 30 insertions(+), 28 deletions(-)
copy test/{line-step.html => label-ellipsis.html} (67%)
-
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 #18525 from apache/fix-18517
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit f22a8edf85db98b813e56ae0d3990249bc1ef563 Merge: 103b3e364 98a78b2c5 Author: Wenli Zhang AuthorDate: Thu Apr 20 14:28:20 2023 +0800 Merge pull request #18525 from apache/fix-18517 fix(label): ellipsis was not working src/label/labelStyle.ts | 2 +- src/util/types.ts| 2 + test/label-ellipsis.html | 110 +++ 3 files changed, 113 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated: doc(axisPointer): document `triggerEmphasis` option
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
The following commit(s) were added to refs/heads/dev by this push:
new bb4b20c8 doc(axisPointer): document `triggerEmphasis` option
new de82a243 Merge pull request #343 from juliepagano/docs-fix-18495
bb4b20c8 is described below
commit bb4b20c870c898ca991424104699ba6dcc8cd345
Author: Julie Pagano
AuthorDate: Tue Apr 18 10:23:39 2023 -0700
doc(axisPointer): document `triggerEmphasis` option
---
en/option/partial/axisPointer-common.md | 6 ++
zh/option/partial/axisPointer-common.md | 6 ++
2 files changed, 12 insertions(+)
diff --git a/en/option/partial/axisPointer-common.md
b/en/option/partial/axisPointer-common.md
index 9e1c3070..a987ccc9 100644
--- a/en/option/partial/axisPointer-common.md
+++ b/en/option/partial/axisPointer-common.md
@@ -100,6 +100,12 @@ Options:
prefix = ${prefix}
) }}
+#${prefix} triggerEmphasis(boolean) = true
+
+
+
+Whether to trigger emphasis of series.
+
#${prefix} triggerTooltip(boolean) = true
diff --git a/zh/option/partial/axisPointer-common.md
b/zh/option/partial/axisPointer-common.md
index 8092e91a..3ebaec44 100644
--- a/zh/option/partial/axisPointer-common.md
+++ b/zh/option/partial/axisPointer-common.md
@@ -95,6 +95,12 @@ axisPointer 的 label 默认不显示（也就是默认只显示指示线），
prefix = ${prefix}
) }}
+#${prefix} triggerEmphasis(boolean) = true
+
+
+
+是否触发系列强调功能。
+
#${prefix} triggerTooltip(boolean) = true
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge pull request #344 from apache/master
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 3224219f9da7dbdd587238c005cd2f3aab783edc Merge: 84f53719 ffc7d1d6 Author: Wenli Zhang AuthorDate: Wed Apr 19 10:03:03 2023 +0800 Merge pull request #344 from apache/master Merge master into dev editor/package-lock.json| 71 +- en/api/action.md|4 +- en/api/events.md|4 +- en/changelog.md | 47 + en/option/component/axis-common.md |5 +- en/option/component/data-zoom-slider.md |2 +- en/option/component/geo.md |4 +- en/option/component/visual-map.md |2 +- en/option/partial/label.md |8 +- en/option/partial/tooltip-common.md | 16 +- en/option/partial/zr-graphic.md | 30 +- en/option/series/candlestick.md | 16 +- en/option/series/lines.md |4 + en/option/series/sunburst.md| 22 + en/option/series/tree.md| 24 +- en/option/series/treemap.md | 32 +- package-lock.json | 1984 +++ zh/api/action.md|4 +- zh/api/events.md|4 +- zh/changelog.md | 49 +- zh/option-gl/partial/formatter.md |2 +- zh/option/component/axis-common.md |5 +- zh/option/component/data-zoom-slider.md |2 +- zh/option/partial/label.md |8 +- zh/option/partial/tooltip-common.md | 12 +- zh/option/partial/zr-graphic.md | 35 +- zh/option/series/candlestick.md | 16 +- zh/option/series/lines.md |4 + zh/option/series/sunburst.md| 22 + zh/option/series/tree.md| 24 +- zh/option/series/treemap.md | 32 +- 31 files changed, 1414 insertions(+), 1080 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch dev updated (84f53719 -> 3224219f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch dev in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 84f53719 tweak doc for #276 add aa1def8a fix typo in geo.md add 34556bf6 Merge pull request #310 from StoecklAlexanderPeter/fix-typoInGeo add b53fe9d6 chore(deps): bump loader-utils from 1.4.0 to 1.4.1 in /editor add 70775991 Merge pull request #308 from apache/dependabot/npm_and_yarn/editor/loader-utils-1.4.1 add 69589ec5 chore(deps): bump socket.io-parser from 3.3.2 to 3.3.3 in /editor add 8eb33fe3 Merge pull request #309 from apache/dependabot/npm_and_yarn/editor/socket.io-parser-3.3.3 add 10594db9 chore(deps): bump minimatch from 3.0.4 to 3.0.8 in /editor add 748698bb Merge pull request #311 from apache/dependabot/npm_and_yarn/editor/minimatch-3.0.8 add ab015217 chore(deps): bump loader-utils from 1.2.3 to 1.4.2 add 415e4406 Merge pull request #312 from apache/dependabot/npm_and_yarn/loader-utils-1.4.2 add f97206d7 Update graph.md add d9ee8736 Update graph.md add b8922a46 Merge pull request #197 from kongmoumou/doc-graph-draggable add f9e233e6 Revert "docs: update graph draggable option" add 45df5941 Merge pull request #314 from apache/revert-197-doc-graph-draggable add 7a625c81 chore(deps): bump engine.io from 3.6.0 to 3.6.1 in /editor add 53066df5 Merge pull request #317 from apache/dependabot/npm_and_yarn/editor/engine.io-3.6.1 add ea9cc3a7 fix(dataZoom): add missing `#` for default areaStyle color add 37665834 fix(graphic): add missing `opacity` option for graphic element style. add f5fdfcaa feat(candlestick): add doc for borderColorDoji apache/echarts#17717 add db41093e Merge pull request #319 from apache/feat-doji add 8cfb6cab chore: changelog for `5.4.1` (#318) add 30783e85 Merge pull request #320 from apache/dev add c330d4f8 chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 add 7a426b3e Merge pull request #325 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 add 38965b7d Change log for `5.4.1` (#324) add d5c97454 fix wrong action name `toggleSelected` -> `toggleSelect` add c4eb5089 chore(deps): bump json5 from 1.0.1 to 1.0.2 add fe962ae8 Merge pull request #330 from apache/dependabot/npm_and_yarn/json5-1.0.2 add 7a30c841 doc: add animation options for axes apache/echarts#18153 add de006d75 add missing `tooltip` option for lines series add e7937bde chore(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 in /editor add 442ffa45 Merge pull request #333 from apache/dependabot/npm_and_yarn/editor/http-cache-semantics-4.1.1 add e3d08f52 chore(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 add 9e1663ac Merge pull request #334 from apache/dependabot/npm_and_yarn/http-cache-semantics-4.1.1 add 1919f8d4 chore(deps): bump cacheable-request and command-line-basics add 2a06a643 Merge pull request #336 from apache/dependabot/npm_and_yarn/cacheable-request-and-command-line-basics-10.2.7 add abeaa0e9 fix(sunburst): add `startAngle` add 55f08640 Merge pull request #337 from apache/sunburst-start-angle add 1a392b9d fix(sunburst): add missing option `clockwise`. add d9b5cfe7 fix(tree/treemap/sunburst): add missing options: treePathInfo/treeAncestors/tooltip... (apache/echarts#18308) add 8ed1ba7b Update changelog.md add e2deab45 improve en changelog of 5.4.2 & add zh changelog add 23040fe2 Update visual-map.md add 7ac8df9c Merge pull request #340 from theatlasroom/patch-1 add d7ca2ce0 add release date in changelog of v5.4.2 add 7c89d351 doc(graphic-text): add doc for 'style.width', 'style.overflow', 'style.ellipsis' add 2939e1db fix incorrect links add ffc7d1d6 Merge pull request #342 from linghaoSu/feat/graphic-text-overflow new 3224219f Merge pull request #344 from apache/master The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: editor/package-lock.json| 71 +- en/api/action.md|4 +- en/api/events.md|4 +- en/changelog.md | 47 + en/option/component/axis-common.md |5 +- en/option/component/data-zoom-slider.md |2 +- en/option/component/geo.md |4 +- en/option/component/visual-map.md |2 +- en/option/partial/label.md |8 +- en/option/partial/tooltip-common.md | 16 +- en/option/partial/zr-graphic.md | 30 +- en/option/series/candlestick.md | 16 +- en/option/series/lines.md |
[echarts] branch master updated (f5bb3b0c8 -> 6b4f8950f)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from f5bb3b0c8 Merge pull request #18260 from ChepteaCatalin/fix-18196 new 036c610a9 feat(axisPointer): add option to disable emphasis. close #18495 new 8041cde9a fix(tooltip): remove triggerEmphasis from involveSeries new 6b4f8950f Merge pull request #18524 from juliepagano/fix-18495 The 9053 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/component/axisPointer/AxisPointerModel.ts | 1 + src/component/axisPointer/axisTrigger.ts | 2 +- src/component/axisPointer/modelHelper.ts | 4 + src/util/types.ts | 2 + test/runTest/actions/__meta__.json | 2 +- test/runTest/actions/tooltip-axisPointer2.json | 2 +- test/tooltip-axisPointer2.html | 216 - 7 files changed, 225 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-18517 created (now 98a78b2c5)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-18517 in repository https://gitbox.apache.org/repos/asf/echarts.git at 98a78b2c5 fix(label): ellipsis was not working This branch includes the following new commits: new 98a78b2c5 fix(label): ellipsis was not working 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(label): ellipsis was not working
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-18517
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 98a78b2c53946c0fc2c83d57b0bb7ad34851702a
Author: Ovilia
AuthorDate: Tue Apr 18 15:48:16 2023 +0800
fix(label): ellipsis was not working
---
src/label/labelStyle.ts | 2 +-
src/util/types.ts| 2 +
test/label-ellipsis.html | 110 +++
3 files changed, 113 insertions(+), 1 deletion(-)
diff --git a/src/label/labelStyle.ts b/src/label/labelStyle.ts
index cd5f8c4a6..3d6740a37 100644
--- a/src/label/labelStyle.ts
+++ b/src/label/labelStyle.ts
@@ -460,7 +460,7 @@ const TEXT_PROPS_WITH_GLOBAL = [
'textShadowColor', 'textShadowBlur', 'textShadowOffsetX',
'textShadowOffsetY'
] as const;
const TEXT_PROPS_SELF = [
-'align', 'lineHeight', 'width', 'height', 'tag', 'verticalAlign'
+'align', 'lineHeight', 'width', 'height', 'tag', 'verticalAlign',
'ellipsis'
] as const;
const TEXT_PROPS_BOX = [
'padding', 'borderWidth', 'borderRadius', 'borderDashOffset',
diff --git a/src/util/types.ts b/src/util/types.ts
index 6f135e83a..445957043 100644
--- a/src/util/types.ts
+++ b/src/util/types.ts
@@ -1056,6 +1056,8 @@ export interface LabelOption extends TextCommonOption {
minMargin?: number
overflow?: TextStyleProps['overflow']
+ellipsis?: TextStyleProps['ellipsis']
+
silent?: boolean
precision?: number | 'auto'
valueAnimation?: boolean
diff --git a/test/label-ellipsis.html b/test/label-ellipsis.html
new file mode 100644
index 0..04b3b15da
--- /dev/null
+++ b/test/label-ellipsis.html
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+require([
+'echarts',
+// 'map/js/china',
+// './data/nutrients.json'
+], function (echarts) {
+var option;
+
+option = {
+title: {
+text: 'Main Title',
+left: 'center',
+top: 'center',
+textStyle: {
+fontSize: 30,
+width: 120,
+overflow: 'truncate',
+ellipsis: '%%%'
+}
+},
+xAxis: {
+type: 'category',
+data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+axisLabel: {
+width: 50,
+overflow: 'truncate',
+ellipsis: '%%%',
+formatter: 'xx'
+}
+},
+yAxis: {
+type: 'value'
+},
+series: [
+{
+data: [150, 230, 224, 218, 135, 147, 260],
+type: 'line',
+label: {
+show: true,
+formatter: 'x',
+width: 50,
+overflow: 'truncate',
+ellipsis: '%%%'
+}
+}
+]
+};
+
+var chart = testHelper.create(echarts, 'main0', {
+title: [
+'It should display "%%%" instead of "..." as ellipsis'
+],
+option: option
+// height: 300,
+// buttons: [{text: 'btn-txt', onclick: function () {}}],
+// recordCanvas: true,
+});
+});
+
+
+
+
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-18453 created (now 77ef25280)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-18453 in repository https://gitbox.apache.org/repos/asf/echarts.git at 77ef25280 fix(axis): show last tick for single data #18453 This branch includes the following new commits: new 77ef25280 fix(axis): show last tick for single data #18453 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(axis): show last tick for single data #18453
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-18453
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 77ef25280e71d31ead013097da9240d24f8c5b95
Author: Ovilia
AuthorDate: Mon Apr 3 18:18:16 2023 +0800
fix(axis): show last tick for single data #18453
---
src/coord/Axis.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/coord/Axis.ts b/src/coord/Axis.ts
index a71051507..5a33a3397 100644
--- a/src/coord/Axis.ts
+++ b/src/coord/Axis.ts
@@ -302,7 +302,7 @@ function fixOnBandTicksCoords(
let diffSize;
if (ticksLen === 1) {
ticksCoords[0].coord = axisExtent[0];
-last = ticksCoords[1] = {coord: axisExtent[0]};
+last = ticksCoords[1] = {coord: axisExtent[1]};
}
else {
const crossLen = ticksCoords[ticksLen - 1].tickValue -
ticksCoords[0].tickValue;
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (cb5b9762e -> f5bb3b0c8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from cb5b9762e Merge pull request #18464 from apache/update-issue-template new 24c01c134 fix(legend): inherit legend rich text color from legend's options. close #18196 new c62197285 add test case new f5bb3b0c8 Merge pull request #18260 from ChepteaCatalin/fix-18196 The 9050 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/component/legend/LegendView.ts | 8 -- test/legend-style.html | 56 ++ 2 files changed, 61 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (1ea88856a -> cb5b9762e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 1ea88856a Merge pull request #18458 from cloydlau/master add 18752ca58 chore: add official editor link to issue template add cb5b9762e Merge pull request #18464 from apache/update-issue-template No new revisions were added by this update. Summary of changes: .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: chore: make reproduction link required
This is an automated email from the ASF dual-hosted git repository. ovilia 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 ae0dd0efe chore: make reproduction link required new 1ea88856a Merge pull request #18458 from cloydlau/master ae0dd0efe is described below commit ae0dd0efe5e0fc6572d5d00f339e929a610e27c1 Author: Cloyd Lau <253055...@qq.com> AuthorDate: Fri Mar 31 22:57:36 2023 +0800 chore: make reproduction link required --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index e1534227c..5a061858a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -42,9 +42,11 @@ body: label: Link to Minimal Reproduction description: | If the reproduction does not need a build setup, please provide a link to [JSFiddle](https://jsfiddle.net/plainheart/e46ozpqj/7/), [JSBin](https://jsbin.com/) or [CodePen](https://codepen.io/Ovilia/pen/dyYWXWM). If it requires a build setup, you can use [CodeSandbox](https://codesandbox.io/s/echarts-basic-example-template-mpfz1s) or provide a GitHub repo. + The reproduction should be **minimal** - i.e. it should contain only the bare minimum amount of code needed to show the bug. + Please do not just fill in a random link. The issue will be closed if no valid reproduction is provided. [Why?](https://antfu.me/posts/why-reproductions-are-required) validations: -required: false +required: true - type: textarea attributes: - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch ssr updated (f8b25f52b -> 27cc76986)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts.git from f8b25f52b style(ssr): remove console.log add 27cc76986 test(ssr): add test cases No new revisions were added by this update. Summary of changes: package.json | 2 +- test/ssr.html | 119 -- 2 files changed, 92 insertions(+), 29 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch ssr updated (8fb7ed09f -> f8b25f52b)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts.git from 8fb7ed09f Merge branch 'master' into ssr add f8b25f52b style(ssr): remove console.log No new revisions were added by this update. Summary of changes: src/component/legend/LegendView.ts | 3 --- 1 file changed, 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch ssr updated (c1a157ee9 -> 8fb7ed09f)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch ssr
in repository https://gitbox.apache.org/repos/asf/echarts.git
from c1a157ee9 WIP(ssr): add meta-data and test case #18334
add ed1c176d5 WIP
add 5f49fbb38 fix(i18n): fix the abbr of "March" for the DE language
("Mar" -> "Mrz) (#18387)
add b84493a7f fix(custom): add info in custom renderItem #15789
add fdda0254e fix(sankey): provide missing label value in formatter #18212
add 33b4b87aa Merge pull request #18338 from apache/master
add 5b74a2208 fix: `sunbrust` label abnormal
add 1e6f6a9cd Merge pull request #18341 from susiwen8/fix-sunbrust-book
add cfb3a8a54 chore: release v5.4.2 (#18374)
add c89565a14 Merge remote-tracking branch 'origin/release' into
fix/merge-release-to-master
add e450ae01f Merge pull request #18414 from
apache/fix/merge-release-to-master
add 99e0c4e33 chore: update KEYS
add 3e9bd24c8 Merge pull request #18415 from apache/update-keys
add ebe5a4e3c chore: update deprecated npm `prepublish` hook to `prepare`
add 59180fd7c Merge pull request #18416 from apache/update-script
add bb9d488a1 fix(src/chart/parall): fix datatype. close #18411
add f27b6154f Merge pull request #18425 from ManishDait/fix-18411
add 9caa5f8dd chore: update `prepublish` to `prepare` in build script.
(follow up ecomfe/zrender#998 & #18416)
add 6dbe25ca7 Merge pull request #18427 from apache/update-script
add 8fb7ed09f Merge branch 'master' into ssr
No new revisions were added by this update.
Summary of changes:
KEYS | 49 +
build/build.js | 4 +-
dist/echarts.common.js | 286 ---
dist/echarts.common.js.map | 2 +-
dist/echarts.common.min.js | 4 +-
dist/echarts.esm.js | 326 ++-
dist/echarts.esm.js.map | 2 +-
dist/echarts.esm.min.js | 4 +-
dist/echarts.js | 326 ++-
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 4 +-
dist/echarts.simple.js | 206 ---
dist/echarts.simple.js.map | 2 +-
dist/echarts.simple.min.js | 4 +-
i18n/langCS-obj.js | 1 +
i18n/langCS.js | 1 +
i18n/langDE-obj.js | 1 +
i18n/langDE.js | 1 +
i18n/langSI-obj.js | 1 +
i18n/langSI.js | 1 +
src/i18n/langTR.ts => i18n/langTR-obj.js | 65 --
src/i18n/langTR.ts => i18n/langTR.js | 61 --
src/i18n/langVI.ts => i18n/langVI-obj.js | 65 --
src/i18n/langVI.ts => i18n/langVI.js | 61 --
i18n/langZH-obj.js | 1 +
i18n/langZH.js | 1 +
package-lock.json| 18 +-
package.json | 6 +-
src/chart/parallel/ParallelSeries.ts | 2 +-
src/chart/sankey/SankeyView.ts | 1 +
src/chart/sunburst/SunburstPiece.ts | 2 +-
src/component/legend/LegendView.ts | 24 +++
src/core/echarts.ts | 6 +-
src/i18n/langDE.ts | 2 +-
src/label/labelStyle.ts | 6 +-
src/util/types.ts| 4 +-
test/sankey-labelValue.html | 98 ++
test/ssr.html| 126 +---
test/ut/spec/series/custom.test.ts | 42
39 files changed, 1237 insertions(+), 581 deletions(-)
copy src/i18n/langTR.ts => i18n/langTR-obj.js (73%)
copy src/i18n/langTR.ts => i18n/langTR.js (73%)
copy src/i18n/langVI.ts => i18n/langVI-obj.js (71%)
copy src/i18n/langVI.ts => i18n/langVI.js (71%)
create mode 100644 test/sankey-labelValue.html
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix(lines): symbolSize should be updated #18350
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 8abf36c2e fix(lines): symbolSize should be updated #18350
8abf36c2e is described below
commit 8abf36c2e509dc4a7cd7573abc026eb1f3964973
Author: cvSoldier <43463523+cvsold...@users.noreply.github.com>
AuthorDate: Fri Mar 31 10:01:28 2023 +0800
fix(lines): symbolSize should be updated #18350
---
src/chart/helper/Line.ts | 20 +++-
test/lines-symbolSize-update.html | 107 ++
test/runTest/actions/__meta__.json| 1 +
test/runTest/actions/lines-symbolSize-update.json | 1 +
4 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/src/chart/helper/Line.ts b/src/chart/helper/Line.ts
index 961502bda..bbfb774ba 100644
--- a/src/chart/helper/Line.ts
+++ b/src/chart/helper/Line.ts
@@ -64,6 +64,22 @@ interface InnerLineLabel extends LineLabel {
function makeSymbolTypeKey(symbolCategory: 'fromSymbol' | 'toSymbol') {
return '_' + symbolCategory + 'Type' as '_fromSymbolType' |
'_toSymbolType';
}
+function makeSymbolTypeValue(name: 'fromSymbol' | 'toSymbol', lineData:
LineList, idx: number) {
+const symbolType = lineData.getItemVisual(idx, name);
+if (!symbolType || symbolType === 'none') {
+return symbolType;
+}
+const symbolSize = lineData.getItemVisual(idx, name + 'Size' as
'fromSymbolSize' | 'toSymbolSize');
+const symbolRotate = lineData.getItemVisual(idx, name + 'Rotate' as
'fromSymbolRotate' | 'toSymbolRotate');
+const symbolOffset = lineData.getItemVisual(idx, name + 'Offset' as
'fromSymbolOffset' | 'toSymbolOffset');
+const symbolKeepAspect = lineData.getItemVisual(idx,
+name + 'KeepAspect' as 'fromSymbolKeepAspect' | 'toSymbolKeepAspect');
+const symbolSizeArr = symbolUtil.normalizeSymbolSize(symbolSize);
+
+const symbolOffsetArr = symbolUtil.normalizeSymbolOffset(symbolOffset ||
0, symbolSizeArr);
+
+return symbolType + symbolSizeArr + symbolOffsetArr + (symbolRotate || '')
+ (symbolKeepAspect || '');
+}
/**
* @inner
@@ -164,7 +180,7 @@ class Line extends graphic.Group {
// it will be updated after line#update.
// Or symbol position and rotation update in line#beforeUpdate
will be one frame slow
this.add(symbol);
-this[makeSymbolTypeKey(symbolCategory)] =
lineData.getItemVisual(idx, symbolCategory);
+this[makeSymbolTypeKey(symbolCategory)] =
makeSymbolTypeValue(symbolCategory, lineData, idx);
}, this);
this._updateCommonStl(lineData, idx, seriesScope);
@@ -184,7 +200,7 @@ class Line extends graphic.Group {
graphic.updateProps(line, target, seriesModel, idx);
each(SYMBOL_CATEGORIES, function (symbolCategory) {
-const symbolType = (lineData as LineList).getItemVisual(idx,
symbolCategory);
+const symbolType = makeSymbolTypeValue(symbolCategory, lineData as
LineList, idx);
const key = makeSymbolTypeKey(symbolCategory);
// Symbol changed
if (this[key] !== symbolType) {
diff --git a/test/lines-symbolSize-update.html
b/test/lines-symbolSize-update.html
new file mode 100644
index 0..2ed2fa7d3
--- /dev/null
+++ b/test/lines-symbolSize-update.html
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// See <<a rel="nofollow" href="https://github.com/apache/echarts/issues/18350">https://github.com/apache/echarts/issues/18350</a>>
+require([
+'echarts',
+], function (echarts) {
+var maxValue = 10;
+var linesData = Array.from(Array(maxValue).keys()).map((value) => {
+return {
+coords: [
+[value * Math.random(), value * Math.random()],
+[value * Math.random(), value * Math.random()]
+]
+};
+});
+
+var option = {
+xAxis: {
+type: 'value',
+min: 0,
+max: maxValue
+},
+yAxis: {
+type: 'value',
+min: 0,
+max: maxValue
+},
+series: [
+{
+id: '1
[echarts] 01/01: Merge pull request #18416 from apache/update-script
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 59180fd7c4aac8acd86c0183f59f50522ca1ed55 Merge: 3e9bd24c8 ebe5a4e3c Author: Wenli Zhang AuthorDate: Fri Mar 24 09:51:22 2023 +0800 Merge pull request #18416 from apache/update-script chore: update deprecated npm `prepublish` hook to `prepare` package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (3e9bd24c8 -> 59180fd7c)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 3e9bd24c8 Merge pull request #18415 from apache/update-keys add ebe5a4e3c chore: update deprecated npm `prepublish` hook to `prepare` new 59180fd7c Merge pull request #18416 from apache/update-script The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18415 from apache/update-keys
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 3e9bd24c8f7c892bf6685f721a7d6ca98d63ba96 Merge: e450ae01f 99e0c4e33 Author: Wenli Zhang AuthorDate: Fri Mar 24 09:50:51 2023 +0800 Merge pull request #18415 from apache/update-keys chore: update KEYS KEYS | 49 + 1 file changed, 49 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (e450ae01f -> 3e9bd24c8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from e450ae01f Merge pull request #18414 from apache/fix/merge-release-to-master add 99e0c4e33 chore: update KEYS new 3e9bd24c8 Merge pull request #18415 from apache/update-keys 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 | 49 + 1 file changed, 49 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix(sankey): provide missing label value in formatter #18212
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 fdda0254e fix(sankey): provide missing label value in formatter #18212
fdda0254e is described below
commit fdda0254e2a1594f71a44a2a0c30def700e58acb
Author: Tommy <98680646+tommys...@users.noreply.github.com>
AuthorDate: Thu Mar 23 11:15:42 2023 +0800
fix(sankey): provide missing label value in formatter #18212
---
src/chart/sankey/SankeyView.ts | 1 +
src/label/labelStyle.ts| 6 +--
test/sankey-labelValue.html| 98 ++
3 files changed, 102 insertions(+), 3 deletions(-)
diff --git a/src/chart/sankey/SankeyView.ts b/src/chart/sankey/SankeyView.ts
index d423f1e75..89e457d49 100644
--- a/src/chart/sankey/SankeyView.ts
+++ b/src/chart/sankey/SankeyView.ts
@@ -275,6 +275,7 @@ class SankeyView extends ChartView {
{
labelFetcher: seriesModel,
labelDataIndex: node.dataIndex,
+labelValue: layout.value,
defaultText: node.id
}
);
diff --git a/src/label/labelStyle.ts b/src/label/labelStyle.ts
index 007f080c4..cd5f8c4a6 100644
--- a/src/label/labelStyle.ts
+++ b/src/label/labelStyle.ts
@@ -94,6 +94,7 @@ interface SetLabelStyleOpt extends
TextCommonParams {
};
labelDataIndex?: TLabelDataIndex;
labelDimIndex?: number;
+labelValue?: number;
/**
* Inject a setter of text for the text animation case.
@@ -135,6 +136,7 @@ function getLabelText(
const labelFetcher = opt.labelFetcher;
const labelDataIndex = opt.labelDataIndex;
const labelDimIndex = opt.labelDimIndex;
+const labelValue = opt.labelValue;
const normalModel = stateModels.normal;
let baseText;
if (labelFetcher) {
@@ -143,9 +145,7 @@ function getLabelText(
null,
labelDimIndex,
normalModel && normalModel.get('formatter'),
-interpolatedValue != null ? {
-interpolatedValue: interpolatedValue
-} : null
+ {interpolatedValue: retrieve2(interpolatedValue, labelValue)}
);
}
if (baseText == null) {
diff --git a/test/sankey-labelValue.html b/test/sankey-labelValue.html
new file mode 100644
index 0..1608bd5fb
--- /dev/null
+++ b/test/sankey-labelValue.html
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+html, body, #main {
+margin: 0;
+width: 100%;
+height: 100vh;
+}
+
+
+
+
+
+require(['echarts'], function (echarts) {
+var chart = echarts.init(document.querySelector("#main"),
'dark');
+window.onresize = chart.resize;
+
+const sankeyData = [
+{source: 'EasyGrid Energy', target: 'Chip Industry',
value: 860},
+{source: 'EasyGrid Energy', target: 'Industrial Internet',
value: 1600},
+{source: 'EG Green Energy', target: 'Chip Industry',
value: 2600},
+{source: 'EG Green Energy', target: 'IOT', value: 500},
+
+{source: 'Industrial Internet', target: 'IOT', value: 800},
+{source: 'Industrial Internet', target: 'Intelligent
Manufacturing', value: 600},
+
+{source: 'Chip Industry', target: 'Chip Manufacturing',
value: 1600},
+{source: 'Chip Industry', target: 'Chip Package', value:
1200},
+{source: 'Chip Industry', target: 'Chip Design', value:
600},
+
+{source: 'Chip Manufacturing', target: '5mm', value: 600},
+{source: 'Chip Manufacturing', target: '10mm', value: 500},
+{source: 'Chip Manufacturing', target: '15mm', value: 500}
+];
+
+var option = {
+title: {text: 'The values of Label and Tooltip are the
same',padding: 20},
+series: [{
+type: 'sankey',
+layout: 'none',
+lineStyle: {color: 'gradient', curveness: 0.5},
+emphasis: {focus: 'adjacency'},
+data: getNames(),
+links: sankeyData
+}],
+tooltip: {trigger
[echarts] branch master updated: fix(custom): add info in custom renderItem #15789
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 b84493a7f fix(custom): add info in custom renderItem #15789
b84493a7f is described below
commit b84493a7f7b5343b68a9755dcda8f32492369afb
Author: Janusz Sobolewski
AuthorDate: Thu Mar 23 03:57:32 2023 +0100
fix(custom): add info in custom renderItem #15789
---
src/core/echarts.ts| 2 +-
src/util/types.ts | 4 +++-
test/ut/spec/series/custom.test.ts | 42 ++
3 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/core/echarts.ts b/src/core/echarts.ts
index ccd7d6084..d50fec494 100644
--- a/src/core/echarts.ts
+++ b/src/core/echarts.ts
@@ -1065,7 +1065,7 @@ class ECharts extends Eventful {
if (ecData && ecData.dataIndex != null) {
const dataModel = ecData.dataModel ||
ecModel.getSeriesByIndex(ecData.seriesIndex);
params = (
-dataModel &&
dataModel.getDataParams(ecData.dataIndex, ecData.dataType) || {}
+dataModel &&
dataModel.getDataParams(ecData.dataIndex, ecData.dataType, el) || {}
) as ECElementEvent;
return true;
}
diff --git a/src/util/types.ts b/src/util/types.ts
index 533844612..6f135e83a 100644
--- a/src/util/types.ts
+++ b/src/util/types.ts
@@ -143,7 +143,9 @@ export interface DataHost {
getData(dataType?: SeriesDataType): SeriesData;
}
-export interface DataModel extends Model, DataHost, DataFormatMixin {}
+export interface DataModel extends Model, DataHost, DataFormatMixin {
+getDataParams(dataIndex: number, dataType?: SeriesDataType, el?: Element):
CallbackDataParams;
+}
// Pick,
// Pick {}
diff --git a/test/ut/spec/series/custom.test.ts
b/test/ut/spec/series/custom.test.ts
index ec0af5769..76ecd099b 100644
--- a/test/ut/spec/series/custom.test.ts
+++ b/test/ut/spec/series/custom.test.ts
@@ -69,4 +69,46 @@ describe('custom_series', function () {
expect(resultPaletteColors).toEqual(colors);
});
+it('should pass user defined data to event handlers', async () => {
+const data = [
+[10, 16],
+[20, 18],
+[30, 26],
+[40, 32],
+[50, 56],
+ ];
+const option = {
+xAxis: { scale: true },
+yAxis: {},
+series: [
+{
+type: 'custom',
+renderItem: function (params: any, api:any) {
+const yValue = api.value(1);
+const start = api.coord([api.value(0), yValue]);
+const size = api.size([0, yValue]);
+return {
+type: 'rect',
+info: { foo: 'bar' },
+shape: {
+x: start[0],
+y: start[1],
+width: 50,
+height: size[1]
+}
+};
+},
+data: data
+}
+]
+};
+chart.setOption(option);
+let customInfo: any;
+chart.on('mousemove', param => customInfo = param.info);
+const el = chart.getDom().children.item(0);
+const e = new MouseEvent('mousemove');
+Object.assign(e, { zrX: 100, zrY: 270 });
+el.dispatchEvent(e)
+expect(customInfo).toEqual({ foo: 'bar' });
+})
});
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch ssr created (now c1a157ee9)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts.git at c1a157ee9 WIP(ssr): add meta-data and test case #18334 No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch pkg-size created (now 3c48f41b0)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch pkg-size in repository https://gitbox.apache.org/repos/asf/echarts.git at 3c48f41b0 chore: add package size change bot for pr This branch includes the following new commits: new 3c48f41b0 chore: add package size change bot for pr 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: add package size change bot for pr
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch pkg-size
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 3c48f41b05356f90697f6a56acedefef4d211f30
Author: Ovilia
AuthorDate: Thu Mar 9 16:33:34 2023 +0800
chore: add package size change bot for pr
---
.github/workflows/ci.yml | 7 +++
1 file changed, 7 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23981bcde..cb6f70ad1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,3 +89,10 @@ jobs:
- name: Unit Test
run: npm run test
+
+ - name: Package size report
+uses: pkg-size/action@v1
+env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+with:
+ hide-files: '*.js.map'
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: feat(sankey): support `trajectory` for emphasis state #17451
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 0be0cfcc0 feat(sankey): support `trajectory` for emphasis state #17451
0be0cfcc0 is described below
commit 0be0cfcc04287cbb8b868095d1c61bd7e6b8f20c
Author: Elay Gelbart <88675154+elaygelb...@users.noreply.github.com>
AuthorDate: Thu Mar 9 10:14:22 2023 +0200
feat(sankey): support `trajectory` for emphasis state #17451
---
src/chart/sankey/SankeySeries.ts | 2 +-
src/chart/sankey/SankeyView.ts | 10 -
src/data/Graph.ts| 86
test/sankey-emphasis.html| 62 +
test/sankey.html | 38 ++
5 files changed, 195 insertions(+), 3 deletions(-)
diff --git a/src/chart/sankey/SankeySeries.ts b/src/chart/sankey/SankeySeries.ts
index bc07d4500..9dca447ca 100644
--- a/src/chart/sankey/SankeySeries.ts
+++ b/src/chart/sankey/SankeySeries.ts
@@ -61,7 +61,7 @@ interface SankeyEdgeStyleOption extends LineStyleOption {
interface ExtraStateOption {
emphasis?: {
-focus?: DefaultEmphasisFocus | 'adjacency'
+focus?: DefaultEmphasisFocus | 'adjacency' | 'trajectory'
}
}
diff --git a/src/chart/sankey/SankeyView.ts b/src/chart/sankey/SankeyView.ts
index 5432908d4..d423f1e75 100644
--- a/src/chart/sankey/SankeyView.ts
+++ b/src/chart/sankey/SankeyView.ts
@@ -241,7 +241,9 @@ class SankeyView extends ChartView {
const focus = emphasisModel.get('focus');
toggleHoverEmphasis(
curve,
-focus === 'adjacency' ? edge.getAdjacentDataIndices() : focus,
+focus === 'adjacency' ? edge.getAdjacentDataIndices()
+: focus === 'trajectory' ? edge.getTrajectoryDataIndices()
+: focus,
emphasisModel.get('blurScope'),
emphasisModel.get('disabled')
);
@@ -293,7 +295,11 @@ class SankeyView extends ChartView {
const focus = emphasisModel.get('focus');
toggleHoverEmphasis(
rect,
-focus === 'adjacency' ? node.getAdjacentDataIndices() : focus,
+focus === 'adjacency'
+? node.getAdjacentDataIndices()
+: focus === 'trajectory'
+? node.getTrajectoryDataIndices()
+: focus,
emphasisModel.get('blurScope'),
emphasisModel.get('disabled')
);
diff --git a/src/data/Graph.ts b/src/data/Graph.ts
index c12350e70..3c6de5ca5 100644
--- a/src/data/Graph.ts
+++ b/src/data/Graph.ts
@@ -387,6 +387,51 @@ class GraphNode {
}
return dataIndices;
}
+
+getTrajectoryDataIndices(): {node: number[], edge: number[]} {
+const connectedEdgesMap = zrUtil.createHashMap();
+const connectedNodesMap = zrUtil.createHashMap();
+
+for (let i = 0; i < this.edges.length; i++) {
+const adjacentEdge = this.edges[i];
+if (adjacentEdge.dataIndex < 0) {
+continue;
+}
+
+connectedEdgesMap.set(adjacentEdge.dataIndex, true);
+
+const sourceNodesQueue = [adjacentEdge.node1];
+const targetNodesQueue = [adjacentEdge.node2];
+
+let nodeIteratorIndex = 0;
+while (nodeIteratorIndex < sourceNodesQueue.length) {
+const sourceNode = sourceNodesQueue[nodeIteratorIndex];
+nodeIteratorIndex++;
+connectedNodesMap.set(sourceNode.dataIndex, true);
+
+for (let j = 0; j < sourceNode.inEdges.length; j++) {
+connectedEdgesMap.set(sourceNode.inEdges[j].dataIndex,
true);
+sourceNodesQueue.push(sourceNode.inEdges[j].node1);
+}
+}
+
+nodeIteratorIndex = 0;
+while (nodeIteratorIndex < targetNodesQueue.length) {
+const targetNode = targetNodesQueue[nodeIteratorIndex];
+nodeIteratorIndex++;
+connectedNodesMap.set(targetNode.dataIndex, true);
+for (let j = 0; j < targetNode.outEdges.length; j++) {
+connectedEdgesMap.set(targetNode.outEdges[j].dataIndex,
true);
+targetNodesQueue.push(targetNode.outEdges[j].node2);
+}
+}
+}
+
+return {
+edge: connectedEdgesMap.keys(),
+node: connectedNodesMap.keys()
+};
+}
}
@@ -429,6 +474,47 @@ class GraphEdge {
node: [this.node1.dataIndex, this.node2
[echarts] branch release updated: fix: `sunbrust` label abnormal
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/release by this push:
new 5b74a2208 fix: `sunbrust` label abnormal
new 1e6f6a9cd Merge pull request #18341 from susiwen8/fix-sunbrust-book
5b74a2208 is described below
commit 5b74a2208d18e5cc22c3c2d8744efdfbd16dfbcc
Author: susiwen8
AuthorDate: Tue Mar 7 20:08:17 2023 +0800
fix: `sunbrust` label abnormal
---
src/chart/sunburst/SunburstPiece.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/chart/sunburst/SunburstPiece.ts
b/src/chart/sunburst/SunburstPiece.ts
index f4e1598dc..f937b59ab 100644
--- a/src/chart/sunburst/SunburstPiece.ts
+++ b/src/chart/sunburst/SunburstPiece.ts
@@ -253,7 +253,7 @@ class SunburstPiece extends graphic.Sector {
let rotate = 0;
if (rotateType === 'radial') {
rotate = normalizeRadian(-midAngle);
-if (((rotate > Math.PI / 2 && rotate <= Math.PI * 1.5))) {
+if (((rotate > Math.PI / 2 && rotate < Math.PI * 1.5))) {
rotate += Math.PI;
}
}
-
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 #18338 from apache/master
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 33b4b87aa90d1f341b1fdb5b5abea78592c2a22d
Merge: c308ec76f baa57b0ae
Author: Wenli Zhang
AuthorDate: Tue Mar 7 11:07:40 2023 +0800
Merge pull request #18338 from apache/master
chore: prepare to release v5.4.2
.npmignore | 4 +-
CONTRIBUTING.md| 24 +-
NOTICE | 2 +-
README.md | 8 +-
package-lock.json | 58 ++--
package.json | 2 +-
src/chart/bar/BarSeries.ts | 4 +-
src/chart/bar/BarView.ts | 30 +-
src/chart/bar/BaseBarSeries.ts | 73 -
src/chart/helper/{pieHelper.ts => sectorHelper.ts} | 0
src/chart/line/LineView.ts | 14 +-
src/chart/pie/PieView.ts | 2 +-
src/chart/sunburst/SunburstPiece.ts| 9 +-
src/chart/sunburst/SunburstSeries.ts | 16 +-
src/chart/tree/TreeSeries.ts | 2 +-
src/component/axis/AxisBuilder.ts | 4 +-
src/component/axisPointer/BaseAxisPointer.ts | 8 +-
src/component/axisPointer/axisTrigger.ts | 6 +-
src/component/axisPointer/modelHelper.ts | 8 +-
src/component/axisPointer/viewHelper.ts| 2 +-
src/component/dataZoom/SliderZoomView.ts | 4 +-
src/component/helper/BrushController.ts| 12 +-
src/component/helper/BrushTargetManager.ts | 4 +-
src/component/helper/MapDraw.ts| 8 +-
src/component/marker/markerHelper.ts | 6 +-
src/component/toolbox/ToolboxView.ts | 4 +-
src/component/tooltip/TooltipHTMLContent.ts| 6 +-
src/component/tooltip/TooltipRichContent.ts| 7 +-
src/component/tooltip/TooltipView.ts | 16 +-
src/component/tooltip/seriesFormatTooltip.ts | 4 +-
src/component/tooltip/tooltipMarkup.ts | 4 +-
src/component/transform/filterTransform.ts | 8 +-
src/component/visualMap/ContinuousModel.ts | 4 +-
src/component/visualMap/ContinuousView.ts | 8 +-
src/component/visualMap/PiecewiseModel.ts | 4 +-
src/component/visualMap/VisualMapModel.ts | 4 +-
src/data/DataStore.ts | 6 +-
src/data/Graph.ts | 2 +-
src/data/Source.ts | 8 +-
src/i18n/langCS.ts | 36 +--
src/i18n/langDE.ts | 36 +--
src/i18n/langEN.ts | 34 +--
src/i18n/langFR.ts | 34 +--
src/i18n/langHU.ts | 34 +--
src/i18n/langIT.ts | 34 +--
src/i18n/langJA.ts | 34 +--
src/i18n/langKO.ts | 34 +--
src/i18n/langPL.ts | 34 +--
src/i18n/langPT-br.ts | 34 +--
src/i18n/langRO.ts | 34 +--
src/i18n/langSI.ts | 36 +--
src/i18n/langTR.ts | 142 +
src/i18n/langVI.ts | 167 +++
src/i18n/langZH.ts | 2 +-
src/legacy/dataSelectAction.ts | 2 +-
src/model/Series.ts| 4 +-
src/util/types.ts | 4 +-
test/bar-markArea.html | 326 -
test/bar-polar-animation.html | 131 +
test/bar-polar-borderRadius.html | 192
test/dataset-category.html | 39 +++
test/gauge-distance.html | 14 +-
test/gauge-group-title-detail.html | 20 +-
test/gauge-simple.html | 8 +-
test/gauge.html| 22 +-
test/graph-grid.html | 2 +-
test/marker-case.html | 66 -
test/runTest/actions/__meta__.json | 2 +
test/runTest/actions/bar-polar-animation.json | 1 +
test/runTest/actions/svg-ssr.json | 1 +
test/sunburst-label.html | 120
test/svg-ssr.html | 122
test/tooltip-alwaysShowContent.html| 265 +
73 files changed, 2053 insertions(+),
[echarts] branch release updated (c308ec76f -> 33b4b87aa)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch release in repository https://gitbox.apache.org/repos/asf/echarts.git from c308ec76f Merge pull request #18002 from susiwen8/update add 4fad60848 fix(polar): polar bar animation should start from r0 rather than 0 add 02d11cd10 Merge pull request #17997 from apache/fix-polar-animation add d78340592 feat(i18n): add Turkish(TR) translation (#18012) add 45a068978 chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 add 6fdb47a02 Merge pull request #18015 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 add 2e1fbbefa Merge pull request #18047 from apache/release add 0707a15b4 chore(deps): bump qs from 6.5.2 to 6.5.3 add bc45cd308 Merge pull request #18048 from apache/dependabot/npm_and_yarn/qs-6.5.3 add b0eeb4192 chore(deps-dev): bump terser from 5.3.8 to 5.14.2 add a9330a130 chore: update package-lock.json add 88766b450 Merge pull request #18055 from neostfox/master add a29290ad7 chore: fix several typos add b76eff2b3 Merge pull request #18061 from striezel-stash/several-typos add 4b4a732ae fix(tree): change symbol type. close #17946 add 6be45ba66 Merge pull request #18070 from ChepteaCatalin/fix-17946 add 47b6407f9 fix(ssr): fix label doesn't show in line series when `ssr` is enabled.` add d6ab9d4c8 Merge pull request #18032 from apache/fix-ssr-line add 1c579089c chore: fix a few typos add c86e55841 Merge pull request #18103 from striezel-stash/fix-small-typos add c5eb4fa28 upload example add 843c1e841 Merge pull request #18115 from huangyulie/fix-auto-huangyulie add c91620ee3 chore: update notice year to 2023 add eaa332bb5 Merge pull request #18128 from apache/update-notice-year add 3e22c04d6 chore(deps): bump json5 from 2.1.3 to 2.2.3 add 27415e3b8 Merge pull request #18142 from apache/dependabot/npm_and_yarn/json5-2.2.3 add 2d8bc8f29 chore: fix few typos (#18203) add 8120aaba4 docs: fix a lot of grammatical errors in CONTRIBUTING.md (#18244) add fc2be1895 feat(i18n): add Vietnamese(vi_VN) translation (#18279) add da29a8d28 fix(dataset): object source contains `length` breaks render add 9191ab257 Merge pull request #18276 from susiwen8/18050 add 6d1f49149 chore: ignore files about 'contributing' when publishing to npm (#18301) add 9335a76cf fix(sunburst): `radial` rotation label might upside down add 3941fc9d2 fix(sunburst): adjust label rotation add c206dc33d chore: simplify code add dbec96f4a Merge pull request #18240 from susiwen8/#18023 add 6af586f69 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add 376e45580 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add ac64e3f1c (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add 19c3c9d45 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add 0e2954c6d Merge pull request #18221 from jianghaoran116/fix-18111 add a20820117 fix(type): fix `treePathInfo` is missing in the type of sunburst formatter callback & add missing type definition for the `data` option add 9c743bee2 Merge pull request #18310 from apache/fix/sunburst-types add 8401d1abe fix(markArea): markArea range in bar series #18130 add dc3a694cd chore: merge add d5ea9373c fix(markArea): fix situations when dims is not defined add 710e79d92 test: add test case for markers add e02ca3816 style(marker): improve code add 2752bea86 Merge pull request #18229 from apache/fix-18130 add bd767e20f fix(polar): support borderRadius for polar bars #17980 add 566743232 fix(polar): forgot to commit a new file add dca62c973 feat: support bar background borderRadius add 50641dba8 Merge branch 'master' into fix-17980 add baa57b0ae Merge pull request #17995 from apache/fix-17980 new 33b4b87aa Merge pull request #18338 from apache/master The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .npmignore | 4 +- CONTRIBUTING.md| 24 +- NOTICE | 2 +- README.md | 8 +- package-lock.json | 58 ++-- package.json | 2 +- src/chart/bar/BarSeries.ts | 4 +- src/chart/bar/BarView.ts | 30 +- src/chart/bar/BaseBarSeri
[echarts] branch master updated (9c743bee2 -> 2752bea86)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 9c743bee2 Merge pull request #18310 from apache/fix/sunburst-types add 8401d1abe fix(markArea): markArea range in bar series #18130 add dc3a694cd chore: merge add d5ea9373c fix(markArea): fix situations when dims is not defined add 710e79d92 test: add test case for markers add e02ca3816 style(marker): improve code new 2752bea86 Merge pull request #18229 from apache/fix-18130 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 | 73 +++- src/component/marker/markerHelper.ts | 6 +- test/bar-markArea.html | 326 ++- test/marker-case.html| 66 ++- 4 files changed, 457 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: Merge pull request #18229 from apache/fix-18130
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 2752bea86217b2579a8efd663424315ece582e7e Merge: 9c743bee2 e02ca3816 Author: Wenli Zhang AuthorDate: Mon Mar 6 16:13:35 2023 +0800 Merge pull request #18229 from apache/fix-18130 fix(markArea): markArea range in bar series #18130 src/chart/bar/BaseBarSeries.ts | 73 +++- src/component/marker/markerHelper.ts | 6 +- test/bar-markArea.html | 326 ++- test/marker-case.html| 66 ++- 4 files changed, 457 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-17980 updated (dca62c973 -> 50641dba8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-17980 in repository https://gitbox.apache.org/repos/asf/echarts.git from dca62c973 feat: support bar background borderRadius add 4fad60848 fix(polar): polar bar animation should start from r0 rather than 0 add 02d11cd10 Merge pull request #17997 from apache/fix-polar-animation add d78340592 feat(i18n): add Turkish(TR) translation (#18012) add 45a068978 chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 add 6fdb47a02 Merge pull request #18015 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 add d31e67623 Merge pull request #17922 from apache/master add 106907deb fix(stack): revert pr #17809 add b454ae2e4 Merge pull request #17944 from apache/release-dev add 26dab477a Create langHU.ts add 945df88b5 Merge pull request #17978 from ifjkovacsik/patch-1 add 8985de838 chore(log): use warn util instead of `console.warn` add b8f16efdc chore: use `hasGlobalWindow` constant from env util. add c0a9277cc fix(core): use `!=` to check if series is excluded as native map returns `undefined` rather than `null` add b99300b29 Merge pull request #17979 from apache/fix-null-check add 2a0af12f2 chore: update `zrender` add 6c7190631 chore: update package-lock add 89f118a1a Merge pull request #17984 from susiwen8/release add 5455aa9cf chore: update version add 9161e63a8 chore: build 5.4.1 add c179ab723 Merge pull request #17992 from susiwen8/release-dev add f7f8cfa7a chore: update version in package-lock add c308ec76f Merge pull request #18002 from susiwen8/update add 2e1fbbefa Merge pull request #18047 from apache/release add 0707a15b4 chore(deps): bump qs from 6.5.2 to 6.5.3 add bc45cd308 Merge pull request #18048 from apache/dependabot/npm_and_yarn/qs-6.5.3 add b0eeb4192 chore(deps-dev): bump terser from 5.3.8 to 5.14.2 add a9330a130 chore: update package-lock.json add 88766b450 Merge pull request #18055 from neostfox/master add a29290ad7 chore: fix several typos add b76eff2b3 Merge pull request #18061 from striezel-stash/several-typos add 4b4a732ae fix(tree): change symbol type. close #17946 add 6be45ba66 Merge pull request #18070 from ChepteaCatalin/fix-17946 add 47b6407f9 fix(ssr): fix label doesn't show in line series when `ssr` is enabled.` add d6ab9d4c8 Merge pull request #18032 from apache/fix-ssr-line add 1c579089c chore: fix a few typos add c86e55841 Merge pull request #18103 from striezel-stash/fix-small-typos add c5eb4fa28 upload example add 843c1e841 Merge pull request #18115 from huangyulie/fix-auto-huangyulie add c91620ee3 chore: update notice year to 2023 add eaa332bb5 Merge pull request #18128 from apache/update-notice-year add 3e22c04d6 chore(deps): bump json5 from 2.1.3 to 2.2.3 add 27415e3b8 Merge pull request #18142 from apache/dependabot/npm_and_yarn/json5-2.2.3 add 2d8bc8f29 chore: fix few typos (#18203) add 8120aaba4 docs: fix a lot of grammatical errors in CONTRIBUTING.md (#18244) add fc2be1895 feat(i18n): add Vietnamese(vi_VN) translation (#18279) add da29a8d28 fix(dataset): object source contains `length` breaks render add 9191ab257 Merge pull request #18276 from susiwen8/18050 add 6d1f49149 chore: ignore files about 'contributing' when publishing to npm (#18301) add 9335a76cf fix(sunburst): `radial` rotation label might upside down add 3941fc9d2 fix(sunburst): adjust label rotation add c206dc33d chore: simplify code add dbec96f4a Merge pull request #18240 from susiwen8/#18023 add 6af586f69 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add 376e45580 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add ac64e3f1c (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add 19c3c9d45 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 add 0e2954c6d Merge pull request #18221 from jianghaoran116/fix-18111 add a20820117 fix(type): fix `treePathInfo` is missing in the type of sunburst formatter callback & add missing type definition for the `data` option add 9c743bee2 Merge pull request #18310 from apache/fix/sunburst-types add 50641dba8 Merge branch 'master' into fix-17980 No new revisions were added by this update. Summary of changes: .npmignore |4 +- CONTRIBUTING.md| 24 +- NOTICE |2 +- README.md |8 +- dist/echarts.common.js | 898 +-- dist/echarts.comm
[echarts] branch fix-17980 updated (566743232 -> dca62c973)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-17980 in repository https://gitbox.apache.org/repos/asf/echarts.git from 566743232 fix(polar): forgot to commit a new file add dca62c973 feat: support bar background borderRadius No new revisions were added by this update. Summary of changes: src/chart/bar/BarView.ts | 9 +++-- test/bar-polar-borderRadius.html | 12 2 files changed, 19 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-18130 updated (710e79d92 -> e02ca3816)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-18130 in repository https://gitbox.apache.org/repos/asf/echarts.git from 710e79d92 test: add test case for markers add e02ca3816 style(marker): improve code No new revisions were added by this update. Summary of changes: src/component/marker/markerHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/02: Merge branch 'fix-16565' of github.com:jttry/echarts into fix-16565
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch fix-16565 in repository https://gitbox.apache.org/repos/asf/echarts.git commit 694048512463d8534e9e52a60abde3bd1ebcf918 Merge: 0e2954c6d 9f3fba171 Author: Ovilia AuthorDate: Fri Mar 3 16:49:53 2023 +0800 Merge branch 'fix-16565' of github.com:jttry/echarts into fix-16565 src/layout/barGrid.ts | 17 +++-- 1 file changed, 15 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-16565 created (now d09d65ba8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-16565 in repository https://gitbox.apache.org/repos/asf/echarts.git at d09d65ba8 WIP(bar): fix barMinHeight for stacked bars This branch includes the following new commits: new 694048512 Merge branch 'fix-16565' of github.com:jttry/echarts into fix-16565 new d09d65ba8 WIP(bar): fix barMinHeight for stacked bars 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. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 02/02: WIP(bar): fix barMinHeight for stacked bars
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-16565
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit d09d65ba8b20f1597b731fef7ab6d4893740bc21
Author: Ovilia
AuthorDate: Fri Mar 3 17:42:38 2023 +0800
WIP(bar): fix barMinHeight for stacked bars
---
src/layout/barGrid.ts | 36
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/layout/barGrid.ts b/src/layout/barGrid.ts
index ee43b304b..fb5d8802b 100644
--- a/src/layout/barGrid.ts
+++ b/src/layout/barGrid.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { each, defaults, keys } from 'zrender/src/core/util';
+import { each, defaults, keys, retrieve2 } from 'zrender/src/core/util';
import { parsePercent } from '../util/number';
import { isDimensionStacked } from '../data/helper/dataStackHelper';
import createRenderPlanner from '../chart/helper/createRenderPlanner';
@@ -463,7 +463,11 @@ export function layout(seriesType: string, ecModel:
GlobalModel) {
// TODO: Do not support stack in large mode yet.
export function createProgressiveLayout(seriesType: string): StageHandler {
-let lastStackCoords: number[] = [];
+// FIXME: if they are defined here, the stack coords are not inited when
+// a stacked series is shown in legend.
+const lastStackCoordsNonNegative: number[] = [];
+const lastStackCoordsNegative: number[] = [];
+
return {
seriesType,
@@ -474,6 +478,10 @@ export function createProgressiveLayout(seriesType:
string): StageHandler {
return;
}
+// FIXME: if lastStackCoordsNonNegative and lastStackCoordsNegative
+// are defined here, the stack coords are not preserved when click
+// magic stacked bars in the toolbox.
+
const data = seriesModel.getData();
const cartesian = seriesModel.coordinateSystem as Cartesian2D;
@@ -496,10 +504,6 @@ export function createProgressiveLayout(seriesType:
string): StageHandler {
const columnWidth = data.getLayout('size');
const columnOffset = data.getLayout('offset');
-if (!stacked) {
-lastStackCoords = [];
-}
-
return {
progress: function (params, data) {
const count = params.count;
@@ -532,13 +536,19 @@ export function createProgressiveLayout(seriesType:
string): StageHandler {
let width;
let height;
+const stackCoords = value >= 0
+? lastStackCoordsNonNegative
+: lastStackCoordsNegative;
+const base = stacked
+? retrieve2(stackCoords[baseValue], baseCoord)
+: baseCoord;
if (isValueAxisH) {
const coord = cartesian.dataToPoint([value,
baseValue]);
if (stacked) {
const startCoord =
cartesian.dataToPoint([startValue, baseValue]);
baseCoord = startCoord[0];
}
-x = lastStackCoords[baseValue] || baseCoord;
+x = base;
y = coord[1] + columnOffset;
width = coord[0] - baseCoord;
height = columnWidth;
@@ -546,10 +556,7 @@ export function createProgressiveLayout(seriesType:
string): StageHandler {
if (Math.abs(width) < barMinHeight) {
width = (width < 0 ? -1 : 1) * barMinHeight;
}
-if (!lastStackCoords[baseValue]) {
-lastStackCoords[baseValue] = baseCoord;
-}
-lastStackCoords[baseValue] += width;
+stackCoords[baseValue] = x + width;
}
else {
const coord = cartesian.dataToPoint([baseValue,
value]);
@@ -558,7 +565,7 @@ export function createProgressiveLayout(seriesType:
string): StageHandler {
baseCoord = startCoord[1];
}
x = coord[0] + columnOffset;
-y = lastStackCoords[baseValue] || baseCoord;
+y = base;
width = columnWidth;
height = coord[1] - baseCoord;
@@ -566,10 +573,7 @@ export function createProgressiveLayout(seriesType:
string): StageHandler {
// Include zero to has
[echarts] branch fix-18130 updated (d5ea9373c -> 710e79d92)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-18130 in repository https://gitbox.apache.org/repos/asf/echarts.git from d5ea9373c fix(markArea): fix situations when dims is not defined add 710e79d92 test: add test case for markers No new revisions were added by this update. Summary of changes: test/marker-case.html | 66 ++- 1 file changed, 65 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (dbec96f4a -> 0e2954c6d)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from dbec96f4a Merge pull request #18240 from susiwen8/#18023 new 6af586f69 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 new 376e45580 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 new ac64e3f1c (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 new 19c3c9d45 (tooltip): fix alwaysShowContent doesn't work after leaving the tooltip . close #18111 new 0e2954c6d Merge pull request #18221 from jianghaoran116/fix-18111 The 9011 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/component/tooltip/TooltipHTMLContent.ts | 6 +- src/component/tooltip/TooltipRichContent.ts | 7 +- src/component/tooltip/TooltipView.ts| 10 +- test/tooltip-alwaysShowContent.html | 265 4 files changed, 277 insertions(+), 11 deletions(-) create mode 100644 test/tooltip-alwaysShowContent.html - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-18130 updated (8401d1abe -> d5ea9373c)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-18130 in repository https://gitbox.apache.org/repos/asf/echarts.git from 8401d1abe fix(markArea): markArea range in bar series #18130 add 8120aaba4 docs: fix a lot of grammatical errors in CONTRIBUTING.md (#18244) add dc3a694cd chore: merge add d5ea9373c fix(markArea): fix situations when dims is not defined No new revisions were added by this update. Summary of changes: CONTRIBUTING.md | 24 README.md| 8 src/chart/bar/BaseBarSeries.ts | 4 ++-- src/component/marker/markerHelper.ts | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated (6d1f49149 -> dbec96f4a)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git from 6d1f49149 chore: ignore files about 'contributing' when publishing to npm (#18301) new 9335a76cf fix(sunburst): `radial` rotation label might upside down new 3941fc9d2 fix(sunburst): adjust label rotation new c206dc33d chore: simplify code new dbec96f4a Merge pull request #18240 from susiwen8/#18023 The 9006 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/sunburst/SunburstPiece.ts | 5 +- test/sunburst-label.html| 120 2 files changed, 123 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: fix(dataset): object source contains `length` breaks render
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 da29a8d28 fix(dataset): object source contains `length` breaks render
new 9191ab257 Merge pull request #18276 from susiwen8/18050
da29a8d28 is described below
commit da29a8d28cd096f1efe83006687a91c8501dd722
Author: susiwen8
AuthorDate: Thu Feb 16 00:13:03 2023 +0800
fix(dataset): object source contains `length` breaks render
---
src/data/Source.ts | 8 ++--
test/dataset-category.html | 39 +++
2 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/data/Source.ts b/src/data/Source.ts
index 7e27cc6aa..95a341041 100644
--- a/src/data/Source.ts
+++ b/src/data/Source.ts
@@ -19,7 +19,7 @@
import {
isTypedArray, HashMap, clone, createHashMap, isArray, isObject,
isArrayLike,
-hasOwn, assert, each, map, isNumber, isString
+hasOwn, assert, each, map, isNumber, isString, keys
} from 'zrender/src/core/util';
import {
SourceFormat, SeriesLayoutBy, DimensionDefinition,
@@ -405,11 +405,7 @@ function objectRowsCollectDimensions(data:
OptionSourceDataObjectRows): Dimensio
let obj;
while (firstIndex < data.length && !(obj = data[firstIndex++])) {} //
jshint ignore: line
if (obj) {
-const dimensions: DimensionDefinitionLoose[] = [];
-each(obj, function (value, key) {
-dimensions.push(key);
-});
-return dimensions;
+return keys(obj);
}
}
diff --git a/test/dataset-category.html b/test/dataset-category.html
index 175e4d121..6cee1d53f 100644
--- a/test/dataset-category.html
+++ b/test/dataset-category.html
@@ -47,6 +47,7 @@ under the License.
+
@@ -671,7 +672,45 @@ under the License.
+
+require([
+'echarts'
+], function (echarts) {
+var option = {
+"dataset": {
+"source": [
+{
+"elevation_above_sea_level": 4,
+"length": 1,
+"width": 4
+}
+]
+},
+
+"xAxis": {
+"type": "value"
+},
+"yAxis": {
+"type": "value"
+},
+"series": [
+{
+"type": "line",
+"encode": {
+"x": "length",
+"y": "elevation_above_sea_level"
+}
+}
+]
+};
+
+testHelper.create(echarts, 'object-source', {
+title: "object source that contains 'length' won't break
render",
+option: option
+});
+});
+
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: fix(markArea): markArea range in bar series #18130
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-18130
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 8401d1abedbea13206016898db2e8669b2e781c2
Author: Ovilia
AuthorDate: Thu Feb 2 18:23:54 2023 +0800
fix(markArea): markArea range in bar series #18130
---
src/chart/bar/BaseBarSeries.ts | 71 -
test/bar-markArea.html | 326 -
2 files changed, 388 insertions(+), 9 deletions(-)
diff --git a/src/chart/bar/BaseBarSeries.ts b/src/chart/bar/BaseBarSeries.ts
index bff11b883..d9349ac2e 100644
--- a/src/chart/bar/BaseBarSeries.ts
+++ b/src/chart/bar/BaseBarSeries.ts
@@ -94,20 +94,77 @@ class BaseBarSeriesModel = BaseBarSeri
const coordSys = this.coordinateSystem;
if (coordSys && coordSys.clampData) {
// PENDING if clamp ?
-const pt = coordSys.dataToPoint(coordSys.clampData(value));
+const clampData = coordSys.clampData(value);
+const pt = coordSys.dataToPoint(clampData);
if (startingAtTick) {
each(coordSys.getAxes(), function (axis: Axis2D, idx: number) {
// If axis type is category, use tick coords instead
if (axis.type === 'category') {
const tickCoords = axis.getTicksCoords();
-let tickIdx = coordSys.clampData(value)[idx];
+
+let targetTickId = clampData[idx];
// The index of rightmost tick of markArea is 1 larger
than x1/y1 index
-if (dims && (dims[idx] === 'x1' || dims[idx] ===
'y1')) {
-tickIdx += 1;
+const isEnd = dims[idx] === 'x1' || dims[idx] === 'y1';
+if (dims && isEnd) {
+targetTickId += 1;
+}
+
+// The only contains one tick, tickCoords is
+// like [{coord: 0, tickValue: 0}, {coord: 0}]
+// to the length should always be larger than 1
+if (tickCoords.length < 2) {
+return;
+}
+else if (tickCoords.length === 2) {
+// The left value and right value of the axis are
+// the same. coord is 0 in both items. Use the max
+// value of the axis as the coord
+pt[idx] = axis.toGlobalCoord(
+axis.getExtent()[isEnd ? 1 : 0]
+);
+return;
+}
+
+let leftCoord;
+let coord;
+let stepTickValue = 1;
+for (let i = 0; i < tickCoords.length; i++) {
+const tickCoord = tickCoords[i].coord;
+// The last item of tickCoords doesn't contain
+// tickValue
+const tickValue = i === tickCoords.length - 1
+? tickCoords[i - 1].tickValue + stepTickValue
+: tickCoords[i].tickValue;
+if (tickValue === targetTickId) {
+coord = tickCoord;
+break;
+}
+else if (tickValue < targetTickId) {
+leftCoord = tickCoord;
+}
+else if (leftCoord != null && tickValue >
targetTickId) {
+coord = (tickCoord + leftCoord) / 2;
+break;
+}
+if (i === 1) {
+// Here we assume the step of category axes is
+// the same
+stepTickValue = tickValue -
tickCoords[0].tickValue;
+}
+}
+if (coord == null) {
+if (!leftCoord) {
+// targetTickId is smaller than all tick ids
in the
+// visible area, use the leftmost tick coord
+coord = tickCoords[0].coord;
+}
+else if (leftCoord) {
+// targetTickId is larger than all tick ids in
the
+// visible area, use the rig
[echarts] branch fix-18130 created (now 8401d1abe)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-18130 in repository https://gitbox.apache.org/repos/asf/echarts.git at 8401d1abe fix(markArea): markArea range in bar series #18130 This branch includes the following new commits: new 8401d1abe fix(markArea): markArea range in bar series #18130 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-handbook] branch master updated: Optimized syntax
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 8552ea9 Optimized syntax
new 09c80bb Merge pull request #89 from balloon72/patch-2
8552ea9 is described below
commit 8552ea9d32c38289c09af5509bbb4b05ce00c3a8
Author: balloon72 <96562725+balloo...@users.noreply.github.com>
AuthorDate: Mon Jan 30 16:38:09 2023 +0800
Optimized syntax
---
contents/en/how-to/data/dynamic-data.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contents/en/how-to/data/dynamic-data.md
b/contents/en/how-to/data/dynamic-data.md
index bb38aa7..fa5ab54 100644
--- a/contents/en/how-to/data/dynamic-data.md
+++ b/contents/en/how-to/data/dynamic-data.md
@@ -2,7 +2,7 @@
## Asynchronous Loading
-Data in [Getting Started Example](${lang}/get-started) is directly updated by
using `setOption`. But in many cases, data need to be filled by asynchronous
loading frequently. `ECharts` can implement asynchronous loading in a simple
way. You can get data asynchronously through a function such as jQuery and use
`setOption` to fill in data and configs after the chart initialized.
+Data in [Getting Started Example](${lang}/get-started) is directly updated by
using `setOption`. But in many cases, the data needs to be filled by
asynchronous loading frequently. `ECharts` can implement asynchronous loading
in a simple way. You can get data asynchronously through a function such as
jQuery and use `setOption` to fill in data and configs after the chart
initialized.
```js
var myChart = echarts.init(document.getElementById('main'));
@@ -106,7 +106,7 @@ Here is the effect:
ECharts was driven by data, change in data will drive changes in the
presentation of the chart. Therefore, It's surprisingly simple to implement a
dynamic update.
-All data's update was implemented by
[setOption](${mainSitePath}/api.html#echartsInstance.setOption). You only need
to fetch the data periodically. ECharts will find the difference between two
groups of data to use the proper way to choose the animation.
+All data's updates were implemented by
[setOption](${mainSitePath}/api.html#echartsInstance.setOption). You only need
to fetch the data periodically. ECharts will find the difference between two
groups of data to use the proper way to choose the animation.
Check the following example.
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] 01/01: Merge pull request #86 from apache/ssr
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git commit 2eb9248e65cfa1c2dcb1991769e6933ff79b631c Merge: 3bc79cb d3110a8 Author: Wenli Zhang AuthorDate: Tue Jan 17 15:46:01 2023 +0800 Merge pull request #86 from apache/ssr doc: add ssr+csr solution contents/en/how-to/cross-platform/server.md | 38 +++-- contents/zh/how-to/cross-platform/server.md | 38 +++-- 2 files changed, 72 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] branch master updated (3bc79cb -> 2eb9248)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git from 3bc79cb use window.addEventListener instead of window.onresize add 6667967 doc: add ssr+csr solution add e9ee0f1 doc: update ssr add d3110a8 doc: update typo new 2eb9248 Merge pull request #86 from apache/ssr 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: contents/en/how-to/cross-platform/server.md | 38 +++-- contents/zh/how-to/cross-platform/server.md | 38 +++-- 2 files changed, 72 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] branch ssr updated (e9ee0f1 -> d3110a8)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git from e9ee0f1 doc: update ssr add d3110a8 doc: update typo No new revisions were added by this update. Summary of changes: contents/en/how-to/cross-platform/server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] branch ssr updated (6667967 -> e9ee0f1)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git from 6667967 doc: add ssr+csr solution add e9ee0f1 doc: update ssr No new revisions were added by this update. Summary of changes: contents/en/how-to/cross-platform/server.md | 6 +++--- contents/zh/how-to/cross-platform/server.md | 8 2 files changed, 7 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-handbook] branch ssr created (now 6667967)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch ssr in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git at 6667967 doc: add ssr+csr solution This branch includes the following new commits: new 6667967 doc: add ssr+csr solution 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-handbook] 01/01: doc: add ssr+csr solution
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch ssr
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
commit 6667967e50c9e300fad9905d62dcaf07b466ffe3
Author: Ovilia
AuthorDate: Tue Jan 17 12:06:41 2023 +0800
doc: add ssr+csr solution
---
contents/en/how-to/cross-platform/server.md | 38 +++--
contents/zh/how-to/cross-platform/server.md | 38 +++--
2 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/contents/en/how-to/cross-platform/server.md
b/contents/en/how-to/cross-platform/server.md
index 7468720..30b15bf 100644
--- a/contents/en/how-to/cross-platform/server.md
+++ b/contents/en/how-to/cross-platform/server.md
@@ -5,9 +5,18 @@ Normally, Apache EChartsTM renders the chart
dynamically in the brows
- Reducing the FCP time and ensuring the chart is displayed immediately.
- Embedding charts in the environments such as Markdown, PDF that do not
support scripts.
-In these scenarios, ECharts also offers a variety of server-side rendering
options.
+In these scenarios, ECharts offers both SVG and Canvas rendering solutions.
-## Server-Side String based SVG Rendering
+| Solution | Rendering Result | Pros |
+| - | - | - |
+| Serverside SVG Rendering | SVG string | Smaller than Canvas
images;Vector SVG images are not blurred;Support for initial animation |
+| Serverside Canvas Rendering | Image | The image format is available
for a wider range of scenarios, and is optional for scenarios that do not
support SVG |
+
+In general, the server-side SVG rendering solution should be preferred, or if
SVG is not applicable, the Canvas rendering solution can be considered.
+
+Server-side rendering also has some limitations, especially some operations
related to interaction cannot be supported. Therefore, if you have interaction
requirements, you can refer to "Server-Side Rendering + Client-Side Secondary
Rendering" below.
+
+## Server-Side SVG Rendering
If you are using 5.3.0 and newer, we strongly recommend that you use the new
zero-dependency server-side string based SVG rendering solution introduced in
5.3.0.
@@ -142,3 +151,28 @@ echarts.setPlatformAPI({
```
If your are using image from remote, we recommend that you prefetch the image
via an http request to get `base64` before passing it in as the URL of the
image, to ensure that the image is loaded when render.
+
+## Server-Side Rendering + Client-Side Secondary Rendering
+
+Features that cannot be supported by server-side rendering include
+
+- Dynamically changing data
+- Highlighting the data item where the mouse is hovered
+- Clicking on a legend to toggle whether the series is displayed or not
+- Moving the mouse to show a tooltip
+- Other interaction-related features
+
+If you have such requirements, you can consider using server-side rendering to
quickly output the first screen chart, then wait for `echarts.js` to finish
loading and re-render the same chart on the client side, so that you can
achieve normal interaction effects and dynamically change the data. Note that
when rendering on the client side, you should turn on interactive components
like `tooltip: { show: true }` and turn off the initial animation with
`animation: 0` (the initial animation [...]
+
+Here is an example of building a CodeSandbox with SVG for server-side
rendering and Canvas for client-side rendering. It is recommended to click
"Open Sandbox" to learn the code implementation.
+
+> If you want to use Canvas for server-side rendering or SVG for client-side
rendering, it's similar, so I won't go over it again.
+
+https://codesandbox.io/embed/apache-echarts-5-3-ssr-csr-0jvsdu?fontsize=14&hidenavigation=1&theme=dark";
+ style="width:100%; height:400px; border:0; border-radius: 4px;
overflow:hidden;"
+ title="Apache ECharts 5.3 SSR + CSR"
+ allow="accelerometer; ambient-light-sensor; camera; encrypted-media;
geolocation; gyroscope; hid; microphone; midi; payment; usb; vr;
xr-spatial-tracking"
+ sandbox="allow-forms allow-modals allow-popups allow-presentation
allow-same-origin allow-scripts"
+ >
+
+As we can see, from the user experience point of view, there is almost no
secondary rendering process, and the whole switching effect is very seamless.
You can also use a library like
[space-js](https://www.npmjs.com/package/pace-js) to display the loading
progress bar during the loading of `echarts.js` as in the above example to
solve the problem of no interactive feedback before the ECharts are fully
loaded.
diff --git a/contents/zh/how-to/cross-platform/server.md
b/contents/zh/how-to/cross-platform/server.md
index 0fba4bd..efabf66 100644
--- a/contents/zh/how-to/cross-platform/server.md
+++ b/contents/zh/how-to/cross-plat
[echarts-doc] branch master updated: doc: add animation options for axes apache/echarts#18153
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 7a30c841 doc: add animation options for axes apache/echarts#18153
7a30c841 is described below
commit 7a30c8414fc9eae5b1214693eb57342769fbdc30
Author: Ovilia
AuthorDate: Thu Jan 12 10:49:00 2023 +0800
doc: add animation options for axes apache/echarts#18153
---
en/option/component/axis-common.md | 5 -
zh/option/component/axis-common.md | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/en/option/component/axis-common.md
b/en/option/component/axis-common.md
index c553b655..b0ab413d 100644
--- a/en/option/component/axis-common.md
+++ b/en/option/component/axis-common.md
@@ -716,6 +716,10 @@ axisPointer settings on the axis.
) }}
{{ /if }}
+{{ use: partial-animation(
+prefix = ${prefix}
+) }}
+
{{ target: partial-axis-interval }}
@@ -908,4 +912,3 @@ xAxis: {
}
},
```
-
diff --git a/zh/option/component/axis-common.md
b/zh/option/component/axis-common.md
index 36229a91..ce693a02 100644
--- a/zh/option/component/axis-common.md
+++ b/zh/option/component/axis-common.md
@@ -711,6 +711,10 @@ data: [{
) }}
{{ /if }}
+{{ use: partial-animation(
+prefix = ${prefix}
+) }}
+
{{ target: partial-axis-interval }}
@@ -904,4 +908,3 @@ xAxis: {
}
},
```
-
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch master updated: fix(tree): change symbol type. close #17946
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 4b4a732ae fix(tree): change symbol type. close #17946
new 6be45ba66 Merge pull request #18070 from ChepteaCatalin/fix-17946
4b4a732ae is described below
commit 4b4a732aea9771e59fc9b1d84ac258dae33949e8
Author: Catalin Cheptea
AuthorDate: Thu Dec 15 22:43:38 2022 +0200
fix(tree): change symbol type. close #17946
---
src/chart/tree/TreeSeries.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/chart/tree/TreeSeries.ts b/src/chart/tree/TreeSeries.ts
index 245bf91dc..820c3c99b 100644
--- a/src/chart/tree/TreeSeries.ts
+++ b/src/chart/tree/TreeSeries.ts
@@ -82,7 +82,7 @@ export interface TreeSeriesLeavesOption
export interface TreeSeriesOption extends
SeriesOption,
TreeSeriesStateOption,
-SymbolOptionMixin, BoxLayoutOptionMixin, RoamOptionMixin {
+SymbolOptionMixin, BoxLayoutOptionMixin,
RoamOptionMixin {
type?: 'tree'
layout?: 'orthogonal' | 'radial'
-
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 several typos
This is an automated email from the ASF dual-hosted git repository.
ovilia 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 a29290ad7 chore: fix several typos
new b76eff2b3 Merge pull request #18061 from striezel-stash/several-typos
a29290ad7 is described below
commit a29290ad7748d9e3e864445ab81629c3279187b5
Author: Dirk Stolle
AuthorDate: Wed Dec 14 01:21:49 2022 +0100
chore: fix several typos
---
src/component/axisPointer/BaseAxisPointer.ts | 8
src/component/axisPointer/axisTrigger.ts | 6 +++---
src/component/axisPointer/modelHelper.ts | 8
src/component/axisPointer/viewHelper.ts | 2 +-
src/component/dataZoom/SliderZoomView.ts | 4 ++--
src/component/helper/BrushController.ts | 12 ++--
src/component/helper/BrushTargetManager.ts | 4 ++--
src/component/helper/MapDraw.ts | 8
src/component/toolbox/ToolboxView.ts | 4 ++--
src/component/tooltip/TooltipView.ts | 6 +++---
src/component/tooltip/seriesFormatTooltip.ts | 4 ++--
src/component/tooltip/tooltipMarkup.ts | 4 ++--
src/component/visualMap/ContinuousModel.ts | 4 ++--
src/component/visualMap/ContinuousView.ts| 8
src/component/visualMap/PiecewiseModel.ts| 4 ++--
src/component/visualMap/VisualMapModel.ts| 4 ++--
16 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/component/axisPointer/BaseAxisPointer.ts
b/src/component/axisPointer/BaseAxisPointer.ts
index 003fa2849..5b91847b1 100644
--- a/src/component/axisPointer/BaseAxisPointer.ts
+++ b/src/component/axisPointer/BaseAxisPointer.ts
@@ -135,7 +135,7 @@ class BaseAxisPointer implements AxisPointer {
this._axisPointerModel = axisPointerModel;
this._api = api;
-// Optimize: `render` will be called repeatly during mouse move.
+// Optimize: `render` will be called repeatedly during mouse move.
// So it is power consuming if performing `render` each time,
// especially on mobile device.
if (!forceRender
@@ -251,7 +251,7 @@ class BaseAxisPointer implements AxisPointer {
axisPointerModel: AxisPointerModel,
api: ExtensionAPI
) {
-// Shoule be implemenented by sub-class.
+// Should be implemenented by sub-class.
}
/**
@@ -360,7 +360,7 @@ class BaseAxisPointer implements AxisPointer {
cursor: 'move',
draggable: true,
onmousemove(e) {
-// Fot mobile devicem, prevent screen slider on the
button.
+// For mobile device, prevent screen slider on the
button.
eventTool.stop(e.event);
},
onmousedown: bind(this._onHandleDragMove, this, 0, 0),
@@ -576,4 +576,4 @@ function updateMandatoryProps(
});
}
-export default BaseAxisPointer;
\ No newline at end of file
+export default BaseAxisPointer;
diff --git a/src/component/axisPointer/axisTrigger.ts
b/src/component/axisPointer/axisTrigger.ts
index bae5d0938..810108d86 100644
--- a/src/component/axisPointer/axisTrigger.ts
+++ b/src/component/axisPointer/axisTrigger.ts
@@ -425,8 +425,8 @@ function dispatchTooltipActually(
}
// In most case only one axis (or event one series is used). It is
-// convinient to fetch payload.seriesIndex and payload.dataIndex
-// dirtectly. So put the first seriesIndex and dataIndex of the first
+// convenient to fetch payload.seriesIndex and payload.dataIndex
+// directly. So put the first seriesIndex and dataIndex of the first
// axis on the payload.
const sampleItem = ((dataByCoordSys.list[0].dataByAxis[0] ||
{}).seriesDataIndices || [])[0] || {} as DataIndex;
@@ -450,7 +450,7 @@ function dispatchHighDownActually(
api: ExtensionAPI
) {
// FIXME
-// highlight status modification shoule be a stage of main process?
+// highlight status modification should be a stage of main process?
// (Consider confilct (e.g., legend and axisPointer) and setOption)
const zr = api.getZr();
diff --git a/src/component/axisPointer/modelHelper.ts
b/src/component/axisPointer/modelHelper.ts
index c991ae0c2..81c856874 100644
--- a/src/component/axisPointer/modelHelper.ts
+++ b/src/component/axisPointer/modelHelper.ts
@@ -130,8 +130,8 @@ function collectAxesInfo(result: CollectionResult, ecModel:
GlobalModel, api: Ex
result.coordSysAxesInfo[coordSysKey] = {};
result.coordSysMap[coordSysKey] = coordSys;
-// Set tooltip (like 'cross') is a convienent way to show axisPointer
-// for user. So we enable seting tooltip on coordSys model.
+// Set tooltip (like 'cross') is a convenient way to show axisPointer
+// for user. So we enab
[echarts-bot] 01/01: Merge pull request #13 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-bot.git commit 957395a96740c1c815c8b5a9e167700c0e7162de Merge: 05d16a4 8c08ef0 Author: Wenli Zhang AuthorDate: Mon Dec 5 13:52:19 2022 +0800 Merge pull request #13 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-bot] branch master updated (05d16a4 -> 957395a)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-bot.git from 05d16a4 tweak logic add 8c08ef0 chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 new 957395a Merge pull request #13 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (30783e85 -> 7a426b3e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 30783e85 Merge pull request #320 from apache/dev add c330d4f8 chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 new 7a426b3e Merge pull request #325 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge pull request #325 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit 7a426b3e4ba221937190715ca584589cd45b233f Merge: 30783e85 c330d4f8 Author: Wenli Zhang AuthorDate: Mon Dec 5 13:51:49 2022 +0800 Merge pull request #325 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 chore(deps): bump decode-uri-component from 0.2.0 to 0.2.2 package-lock.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (db41093e -> 8cfb6cab)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from db41093e Merge pull request #319 from apache/feat-doji add 8cfb6cab chore: changelog for `5.4.1` (#318) No new revisions were added by this update. Summary of changes: en/changelog.md | 29 + 1 file changed, 29 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch master updated (37665834 -> db41093e)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git from 37665834 fix(graphic): add missing `opacity` option for graphic element style. add f5fdfcaa feat(candlestick): add doc for borderColorDoji apache/echarts#17717 new db41093e Merge pull request #319 from apache/feat-doji The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: en/option/series/candlestick.md | 16 ++-- zh/option/series/candlestick.md | 16 ++-- 2 files changed, 28 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: Merge pull request #319 from apache/feat-doji
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts-doc.git commit db41093ed4f21601c0d2bdf86ef0491b052fc363 Merge: 37665834 f5fdfcaa Author: Wenli Zhang AuthorDate: Thu Dec 1 10:26:44 2022 +0800 Merge pull request #319 from apache/feat-doji feat(candlestick): add doc for borderColorDoji apache/echarts#17717 en/option/series/candlestick.md | 16 ++-- zh/option/series/candlestick.md | 16 ++-- 2 files changed, 28 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] 01/01: feat(candlestick): add doc for borderColorDoji apache/echarts#17717
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch feat-doji
in repository https://gitbox.apache.org/repos/asf/echarts-doc.git
commit f5fdfcaa97096c6e23b79f103f49d33074c053f2
Author: Ovilia
AuthorDate: Thu Dec 1 10:20:09 2022 +0800
feat(candlestick): add doc for borderColorDoji apache/echarts#17717
---
en/option/series/candlestick.md | 16 ++--
zh/option/series/candlestick.md | 16 ++--
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/en/option/series/candlestick.md b/en/option/series/candlestick.md
index 934882e8..44d5cb29 100644
--- a/en/option/series/candlestick.md
+++ b/en/option/series/candlestick.md
@@ -22,7 +22,8 @@ We use red to represent increasing and blue decreasing by
default. If you want t
+ [series-candlestick.itemStyle.color](~series-candlestick.itemStyle.color):
fill color for bullish candle stick (namely, increase)
+ [series-candlestick.itemStyle.color0](~series-candlestick.itemStyle.color0):
fill color for bearish candle stick (namely, decrease)
+
[series-candlestick.itemStyle.borderColor](~series-candlestick.itemStyle.borderColor):
border color for bullish candle stick (namely, increase)
-+
[series-candlestick.itemStyle.borderColor0](series-candlestick.itemStyle.borderColor0):
border color for bearish candle stick (namely, decrease)
++
[series-candlestick.itemStyle.borderColor0](~series-candlestick.itemStyle.borderColor0):
border color for bearish candle stick (namely, decrease)
++
[series-candlestick.itemStyle.borderColorDoji](~series-candlestick.itemStyle.borderColorDoji):
border color for doji (when the open price is the same as the close price)
@@ -334,6 +335,18 @@ Border color of bearish candle stick.
{{ use: partial-color-desc() }}
+#${prefix} borderColorDoji(Color) = null
+
+
+
+{{ use: partial-version(
+version = "5.4.1"
+) }}
+
+Border color of doji (when the open price is the same as the close price).
+
+{{ use: partial-color-desc() }}
+
#${prefix} borderWidth(number) = ${defaultBorderWidth}
@@ -348,4 +361,3 @@ Border width of candlestick. There is no border when it is
`0`.
defaultShadowOffsetX = ${defaultShadowOffsetX},
defaultShadowOffsetY = ${defaultShadowOffsetY}
) }}
-
diff --git a/zh/option/series/candlestick.md b/zh/option/series/candlestick.md
index b08c1e0e..3a61f44f 100644
--- a/zh/option/series/candlestick.md
+++ b/zh/option/series/candlestick.md
@@ -22,7 +22,8 @@
+
[series-candlestick.itemStyle.color](~series-candlestick.itemStyle.color)：阳线填充色（即『涨』）
+
[series-candlestick.itemStyle.color0](~series-candlestick.itemStyle.color0)：阴线填充色（即『跌』）
+
[series-candlestick.itemStyle.borderColor](~series-candlestick.itemStyle.borderColor)：阳线边框色（即『涨』）
-+
[series-candlestick.itemStyle.borderColor0](series-candlestick.itemStyle.borderColor0)：阴线边框色（即『跌』）
++
[series-candlestick.itemStyle.borderColor0](~series-candlestick.itemStyle.borderColor0)：阴线边框色（即『跌』）
++
[series-candlestick.itemStyle.borderColorDoji](~series-candlestick.itemStyle.borderColorDoji)：十字星边框色（即开盘价等于收盘价时候的边框色）
@@ -521,6 +522,18 @@ K 线图的选中状态。开启
[selectedMode](~series-candlestick.selectedMode
{{ use: partial-color-desc() }}
+#${prefix} borderColorDoji(Color) = null
+
+
+
+{{ use: partial-version(
+version = "5.4.1"
+) }}
+
+十字星（开盘价等于收盘价）的描边颜色。
+
+{{ use: partial-color-desc() }}
+
#${prefix} borderWidth(number) = ${defaultBorderWidth}
@@ -535,4 +548,3 @@ candlestick 描边线宽。为 0 时无描边。
defaultShadowOffsetX = ${defaultShadowOffsetX},
defaultShadowOffsetY = ${defaultShadowOffsetY}
) }}
-
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts-doc] branch feat-doji created (now f5fdfcaa)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch feat-doji in repository https://gitbox.apache.org/repos/asf/echarts-doc.git at f5fdfcaa feat(candlestick): add doc for borderColorDoji apache/echarts#17717 This branch includes the following new commits: new f5fdfcaa feat(candlestick): add doc for borderColorDoji apache/echarts#17717 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 master updated (f68e1f13c -> 02d11cd10)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git
from f68e1f13c Merge pull request #17963 from
apache/dependabot/npm_and_yarn/engine.io-3.6.1
add 4fad60848 fix(polar): polar bar animation should start from r0 rather
than 0
new 02d11cd10 Merge pull request #17997 from apache/fix-polar-animation
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/BarView.ts | 2 +-
src/chart/sunburst/SunburstPiece.ts| 2 +-
...bel-formatter.html => bar-polar-animation.html} | 114 ++---
test/runTest/actions/__meta__.json | 1 +
test/runTest/actions/bar-polar-animation.json | 1 +
5 files changed, 58 insertions(+), 62 deletions(-)
copy test/{label-formatter.html => bar-polar-animation.html} (50%)
create mode 100644 test/runTest/actions/bar-polar-animation.json
-
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 #17997 from apache/fix-polar-animation
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/echarts.git commit 02d11cd10c4be5bca3d7641a1664c51534075d5c Merge: f68e1f13c 4fad60848 Author: Wenli Zhang AuthorDate: Thu Dec 1 09:48:40 2022 +0800 Merge pull request #17997 from apache/fix-polar-animation fix(polar): polar bar animation should start from r0 rather than 0 src/chart/bar/BarView.ts | 2 +- src/chart/sunburst/SunburstPiece.ts | 2 +- test/bar-polar-animation.html | 131 ++ test/runTest/actions/__meta__.json| 1 + test/runTest/actions/bar-polar-animation.json | 1 + 5 files changed, 135 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-polar-animation created (now 4fad60848)
This is an automated email from the ASF dual-hosted git repository. ovilia pushed a change to branch fix-polar-animation in repository https://gitbox.apache.org/repos/asf/echarts.git at 4fad60848 fix(polar): polar bar animation should start from r0 rather than 0 No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] branch fix-17980 updated (bd767e20f -> 566743232)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch fix-17980
in repository https://gitbox.apache.org/repos/asf/echarts.git
from bd767e20f fix(polar): support borderRadius for polar bars #17980
add 566743232 fix(polar): forgot to commit a new file
No new revisions were added by this update.
Summary of changes:
.../helper/sectorHelper.ts}| 34 --
1 file changed, 18 insertions(+), 16 deletions(-)
copy src/{processor/negativeDataFilter.ts => chart/helper/sectorHelper.ts}
(50%)
-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
[echarts] 01/01: fix(polar): support borderRadius for polar bars #17980
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch fix-17980
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit bd767e20f0fc8ba227e3c430ac529d107ab6fe32
Author: Ovilia
AuthorDate: Wed Nov 30 16:46:33 2022 +0800
fix(polar): support borderRadius for polar bars #17980
---
src/chart/bar/BarSeries.ts | 4 +-
src/chart/bar/BarView.ts| 23 -
src/chart/helper/pieHelper.ts | 41
src/chart/pie/PieView.ts| 2 +-
src/chart/sunburst/SunburstPiece.ts | 2 +-
test/bar-polar-borderRadius.html| 180
6 files changed, 204 insertions(+), 48 deletions(-)
diff --git a/src/chart/bar/BarSeries.ts b/src/chart/bar/BarSeries.ts
index eb838c11f..de03a19ea 100644
--- a/src/chart/bar/BarSeries.ts
+++ b/src/chart/bar/BarSeries.ts
@@ -53,8 +53,8 @@ interface BarStatesMixin {
}
export interface BarItemStyleOption extends
ItemStyleOption {
-// Border radius is not supported for bar on polar
-borderRadius?: number | number[]
+// for polar bars, this is used for sector's cornerRadius
+borderRadius?: (number | string)[] | number | string
}
export interface BarDataItemOption extends BarStateOption,
StatesOptionMixin,
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 0de06c481..346f3d9da 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -21,6 +21,8 @@ import Path, {PathProps} from 'zrender/src/graphic/Path';
import Group from 'zrender/src/graphic/Group';
import {extend, each, map} from 'zrender/src/core/util';
import {BuiltinTextPosition} from 'zrender/src/core/types';
+import {SectorProps} from 'zrender/src/graphic/shape/Sector';
+import {RectProps} from 'zrender/src/graphic/shape/Rect';
import {
Rect,
Sector,
@@ -66,6 +68,7 @@ import { warn } from '../../util/log';
import {createSectorCalculateTextPosition, SectorTextPosition,
setSectorTextRotation} from '../../label/sectorLabel';
import { saveOldStyle } from '../../animation/basicTransition';
import Element from 'zrender/src/Element';
+import { getSectorCornerRadius } from '../helper/sectorHelper';
const mathMax = Math.max;
const mathMin = Math.min;
@@ -338,7 +341,7 @@ class BarView extends ChartView {
}
const bgLayout = getLayout[coord.type](data, newIndex);
const shape = createBackgroundShape(isHorizontalOrRadial,
bgLayout, coord);
-updateProps(bgEl, { shape }, animationModel, newIndex);
+updateProps(bgEl, { shape },
animationModel, newIndex);
}
let el = oldData.getItemGraphicEl(oldIndex) as BarPossiblePath;
@@ -971,7 +974,8 @@ function createPolarPositionMapping(isRadial: boolean)
function updateStyle(
el: BarPossiblePath,
-data: SeriesData, dataIndex: number,
+data: SeriesData,
+dataIndex: number,
itemModel: Model,
layout: RectLayout | SectorLayout,
seriesModel: BarSeriesModel,
@@ -981,7 +985,20 @@ function updateStyle(
const style = data.getItemVisual(dataIndex, 'style');
if (!isPolar) {
-(el as Rect).setShape('r', itemModel.get(['itemStyle',
'borderRadius']) || 0);
+const borderRadius = itemModel
+.get(['itemStyle', 'borderRadius']) as number | number[] || 0;
+(el as Rect).setShape('r', borderRadius);
+}
+else if (!seriesModel.get('roundCap')) {
+const sector = el as Sector;
+const sectorShape = (el as Sector).shape;
+const cornerRadius = getSectorCornerRadius(
+itemModel.getModel('itemStyle'),
+sectorShape,
+true
+);
+extend(sectorShape, cornerRadius);
+sector.setShape(sectorShape);
}
el.useStyle(style);
diff --git a/src/chart/helper/pieHelper.ts b/src/chart/helper/pieHelper.ts
deleted file mode 100644
index e55ded398..0
--- a/src/chart/helper/pieHelper.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or
