You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by wa...@apache.org on 2020/07/02 08:17:55 UTC
[incubator-echarts-doc] branch master updated (28bef84 -> d5df68e)
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git.
from 28bef84 Merge pull request #121 from plainheart/feat-layout-switch-for-option-preview
new 19e5702 fix(tree): fixed the issue reported in apache/incubator-echarts#12865.
new 9d135b3 Merge branch 'master' of https://github.com/apache/incubator-echarts-doc into upstream-master
new ef3c439 Merge branch 'master' of https://github.com/apache/incubator-echarts-doc into upstream-master
new d5df68e fix(tree): fixed the issue reported in apache/incubator-echarts#12896.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
en/option/series/tree.md | 2 +-
zh/option/series/tree.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts-doc] 04/04: fix(tree): fixed the issue reported
in apache/incubator-echarts#12896.
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
commit d5df68e5f674a6b1f5b63bcf2d801431a1502159
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Thu Jul 2 16:17:15 2020 +0800
fix(tree): fixed the issue reported in apache/incubator-echarts#12896.
---
en/option/series/tree.md | 2 +-
zh/option/series/tree.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/en/option/series/tree.md b/en/option/series/tree.md
index 5afb15f..466faa7 100644
--- a/en/option/series/tree.md
+++ b/en/option/series/tree.md
@@ -74,7 +74,7 @@ The shape of the edge which is under the tree `orthogonal layout`. There are two
This is the position where the polyline branches in the subtree when the shape of the edge is a polyline in the `orthogonal layout`. The position here refers to the percentage of the distance between the bifurcation point and the parent node of the subtree to the height of the entire subtree. The default value is `'50%'`, which can be between ['0', '100%'].
-** Note: This configuration item is only valid when `edgeShape = 'curve'`. **
+** Note: This configuration item is only valid when `edgeShape = 'polyline'`. **
## roam(boolean|string) = false
diff --git a/zh/option/series/tree.md b/zh/option/series/tree.md
index 6efa25f..281e5be 100644
--- a/zh/option/series/tree.md
+++ b/zh/option/series/tree.md
@@ -126,7 +126,7 @@ const option = {
正交布局下当边的形状是折线时，子树中折线段分叉的位置。这里的位置指的是分叉点与子树父节点的距离占整个子树高度的百分比。默认取值是 `'50%'`，可以是 ['0', '100%'] 之间。
-**注意：该配置项只有在 `edgeShape = 'curve'` 时才有效。**
+**注意：该配置项只有在 `edgeShape = 'polyline'` 时才有效。**
## roam(boolean|string) = false
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts-doc] 02/04: Merge branch 'master' of
https://github.com/apache/incubator-echarts-doc into upstream-master
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
commit 9d135b30bdc4956dff59ed9c1c176701dba3cc5a
Merge: 19e5702 e387a74
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Tue Jun 30 09:38:25 2020 +0800
Merge branch 'master' of https://github.com/apache/incubator-echarts-doc into upstream-master
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts-doc] 03/04: Merge branch 'master' of
https://github.com/apache/incubator-echarts-doc into upstream-master
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
commit ef3c439730362890dfa33d94420df3d72b89452c
Merge: 9d135b3 28bef84
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Thu Jul 2 16:14:14 2020 +0800
Merge branch 'master' of https://github.com/apache/incubator-echarts-doc into upstream-master
build.js | 86 +-
en/coding-standard.md | 6 +-
en/option-gl/partial/shading.md | 2 +-
en/option-gl/partial/temporal-super-sampling.md | 2 +-
en/option/component/radar.md | 4 -
en/option/partial/line-style.md | 2 +-
en/option/series/bar.md | 4 +-
en/option/series/graph.md | 2 -
en/option/series/sunburst.md | 2 +-
en/option/series/treemap.md | 2 +-
package-lock.json | 5095 +++++++++++++----------
package.json | 55 +-
src/App.vue | 40 +-
src/asset/SourceCodePro-Regular.woff | Bin 0 -> 89796 bytes
src/asset/SourceCodePro-Regular.woff2 | Bin 0 -> 62136 bytes
src/asset/icon.eot | Bin 0 -> 1440 bytes
src/asset/icon.svg | 11 +
src/asset/icon.ttf | Bin 0 -> 1276 bytes
src/asset/icon.woff | Bin 0 -> 1352 bytes
src/components/DocContent.vue | 183 +-
src/components/DocContentItemCard.vue | 112 +-
src/components/DocNav.vue | 2 +-
src/components/LiveExample.vue | 535 +++
src/components/OptionControl.vue | 123 +
src/controls/ControlBoolean.vue | 31 +
src/controls/ControlColor.vue | 53 +
src/controls/ControlColorStops.vue | 0
src/controls/ControlEnum.vue | 58 +
src/controls/ControlIcon.vue | 108 +
src/controls/ControlNumber.vue | 46 +
src/controls/ControlPercent.vue | 105 +
src/controls/ControlPercentVector.vue | 79 +
src/controls/ControlText.vue | 32 +
src/controls/ControlVector.vue | 92 +
src/dep/flatten.js | 1175 ++++++
src/directive/highlight.js | 3 +-
src/docHelper.js | 2 +-
src/i18n.js | 64 +
src/main.js | 22 +-
src/store.js | 173 +-
src/style/mixin.scss | 12 +-
tool/extractDesc.js | 17 +-
tool/md2json.js | 165 +-
{en => zh}/coding-standard.md | 223 +-
zh/option/component/angle-axis.md | 71 +
zh/option/component/axis-common.md | 118 +-
zh/option/component/axisPointer.md | 111 +
zh/option/component/calendar.md | 102 +
zh/option/component/data-zoom-inside.md | 48 +-
zh/option/component/data-zoom-slider.md | 52 +-
zh/option/component/data-zoom.md | 21 +-
zh/option/component/grid.md | 41 +
zh/option/component/legend.md | 122 +
zh/option/component/parallel-axis.md | 185 +-
zh/option/component/parallel.md | 457 +-
zh/option/component/polar.md | 58 +
zh/option/component/radar.md | 54 +-
zh/option/component/radius-axis.md | 67 +
zh/option/component/timeline.md | 432 +-
zh/option/component/title.md | 30 +
zh/option/component/toolbox.md | 152 +
zh/option/component/tooltip.md | 130 +
zh/option/component/visual-map-continuous.md | 29 +-
zh/option/component/visual-map-piecewise.md | 33 +
zh/option/component/visual-map.md | 5 -
zh/option/component/x-axis.md | 43 +
zh/option/component/y-axis.md | 87 +
zh/option/partial/animation.md | 10 +
zh/option/partial/area-style.md | 2 +
zh/option/partial/axisPointer-common.md | 20 +
zh/option/partial/barGrid.md | 11 +
zh/option/partial/circular-layout.md | 4 +
zh/option/partial/clip.md | 2 +
zh/option/partial/component-common-style.md | 9 +
zh/option/partial/cursor.md | 2 +
zh/option/partial/item-style.md | 9 +-
zh/option/partial/label.md | 43 +-
zh/option/partial/large.md | 6 +
zh/option/partial/legend-hover-link.md | 3 +
zh/option/partial/line-style.md | 9 +
zh/option/partial/mark-area.md | 12 +
zh/option/partial/mark-line.md | 12 +
zh/option/partial/mark-point.md | 13 +-
zh/option/partial/padding.md | 2 +
zh/option/partial/rect-layout-width-height.md | 4 +
zh/option/partial/rect-layout.md | 8 +
zh/option/partial/roam.md | 3 +
zh/option/partial/show.md | 2 +
zh/option/partial/silent.md | 2 +
zh/option/partial/style-shadow-opacity.md | 12 +-
zh/option/partial/symbol.md | 10 +
zh/option/partial/text-style.md | 46 +
zh/option/partial/tooltip-common.md | 12 +
zh/option/series/bar.md | 93 +
zh/option/series/boxplot.md | 47 +
zh/option/series/candlestick.md | 203 +
zh/option/series/effectScatter.md | 35 +
zh/option/series/funnel.md | 43 +
zh/option/series/gauge.md | 124 +
zh/option/series/graph.md | 53 +-
zh/option/series/heatmap.md | 51 +
zh/option/series/line.md | 42 +
zh/option/series/parallel.md | 178 +
zh/option/series/pictorialBar.md | 72 +
zh/option/series/pie.md | 82 +
zh/option/series/radar.md | 36 +
zh/option/series/sankey.md | 20 +
zh/option/series/scatter.md | 72 +
zh/option/series/sunburst.md | 173 +-
zh/option/series/themeRiver.md | 72 +
zh/option/series/tree.md | 63 +
zh/option/series/treemap.md | 222 +-
zh/tutorial/renderer.md | 8 +-
zh/tutorial/weixin-application.md | 4 +-
114 files changed, 10500 insertions(+), 2637 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts-doc] 01/04: fix(tree): fixed the issue reported
in apache/incubator-echarts#12865.
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
commit 19e5702fb437d002e55a55dd3e766be5e2942842
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Tue Jun 30 09:35:15 2020 +0800
fix(tree): fixed the issue reported in apache/incubator-echarts#12865.
---
en/option/series/tree.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/en/option/series/tree.md b/en/option/series/tree.md
index 5e81f6a..5afb15f 100644
--- a/en/option/series/tree.md
+++ b/en/option/series/tree.md
@@ -62,7 +62,7 @@ The direction of the `orthogonal` layout in the tree diagram. That means this co
) }}
-# edgeShape(string) = 'curve'
+## edgeShape(string) = 'curve'
{{ use: partial-version(version = "4.7.0") }}
The shape of the edge which is under the tree `orthogonal layout`. There are two types of shape, curve and polyline, the corresponding values are `'curve'` and `'polyline'`.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org