This is an automated email from the ASF dual-hosted git repository.
shenyi 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 bb52b39 sync en doc
bb52b39 is described below
commit bb52b39f4b1bf96c33ccf76315cae0555b9083c5
Author: pissang <bm2736...@gmail.com>
AuthorDate: Fri Feb 5 10:45:39 2021 +0800
sync en doc
---
en/option/component/aria.md | 3 +--
en/option/component/axis-common.md | 1 +
en/option/component/timeline.md | 7 +++----
en/option/component/tooltip.md | 2 +-
en/option/component/visual-map.md | 10 ++++++++++
en/option/partial/decal.md | 4 ++--
en/option/partial/item-style.md | 3 +--
en/option/partial/label-line.md | 2 +-
en/option/partial/parallel.md | 1 -
en/option/partial/text-style.md | 4 ++--
en/option/series/bar.md | 3 +--
en/option/series/boxplot.md | 8 ++++----
en/option/series/funnel.md | 4 ++--
en/option/series/pie.md | 4 ++--
en/option/series/radar.md | 3 ++-
en/option/series/sankey.md | 6 +++---
en/option/series/sunburst.md | 10 +++++-----
en/option/series/themeRiver.md | 2 +-
en/option/series/treemap.md | 1 -
zh/option/component/visual-map.md | 9 ---------
20 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/en/option/component/aria.md b/en/option/component/aria.md
index 8658910..c6d8250 100644
--- a/en/option/component/aria.md
+++ b/en/option/component/aria.md
@@ -197,8 +197,6 @@ The delimiter after the last data.
Note that usually the last series is followed by the series `separator.end`,
so `data.separator.end` is an empty string in most cases.
-
-
## decal(Object)
Decal patterns are added to series data as an additional hint other than
colors to help differentiate the data. It is easy to enabled the default decal
patterns by enabling it:
@@ -227,3 +225,4 @@ The style of the decal pattern. If it is an `Object` type,
it means all data wil
{{ use: partial-decal(
prefix = "###"
) }}
+
diff --git a/en/option/component/axis-common.md
b/en/option/component/axis-common.md
index 60b4e14..59d0cb3 100644
--- a/en/option/component/axis-common.md
+++ b/en/option/component/axis-common.md
@@ -898,3 +898,4 @@ xAxis: {
}
},
```
+
diff --git a/en/option/component/timeline.md b/en/option/component/timeline.md
index 7914a1b..588c4a9 100644
--- a/en/option/component/timeline.md
+++ b/en/option/component/timeline.md
@@ -85,7 +85,7 @@ myChart.setOption({
<br>
**How the `finalOption` calculated?**
-{{ use: partial-timeline-merge-strategy }}
+{{ use: partial-timeline-merge-strategy() }}
<br>
**Compatibility with ECharts 4:**
@@ -102,7 +102,6 @@ option = {
};
```
-
## show(boolean) = true
<ExampleUIControlBoolean default="true" />
@@ -162,7 +161,7 @@ Whether the view updates in real time during dragging the
control dot.
## replaceMerge(Array|string) = undefined
-{{ use: partial-timeline-merge-strategy }}
+{{ use: partial-timeline-merge-strategy() }}
<br>
@@ -172,7 +171,6 @@ The value of `replaceMerge` can be a `mainType` of a
component, like `replaceMer
See this
[example](${galleryEditorPath}doc-example/timeline-dynamic-series&edit=1&reset=1).
-
## controlPosition(string) = 'left'
<ExampleUIControlEnum options="left,right" />
@@ -545,3 +543,4 @@ When initializing, a `switchableOption` corresponding to
the current time tick a
There are two merging strategy.
+ By default, use `NORMAL_MERGE`.
+ If [timeline.replaceMerge](~option.html#timeline.replaceMerge) is set, use
`REPLACE_MERGE`. See [setOption](~api.html#echartsInstance.setOption) for more
details of `REPLACE_MERGE`.
+
diff --git a/en/option/component/tooltip.md b/en/option/component/tooltip.md
index 09b8260..d6e4c29 100644
--- a/en/option/component/tooltip.md
+++ b/en/option/component/tooltip.md
@@ -237,7 +237,6 @@ The transition duration of tooltip's animation, in seconds.
When it is set to be
<ExampleUIControlEnum options="seriesAsc,seriesDesc,valueAsc,valueDesc"
default="seriesAsc" />
-
{{ use: partial-version(
version = "5.0.0"
) }}
@@ -261,3 +260,4 @@ Conditions to order tooltip. Options:
+ `'valueDesc'`
Base on value, descending order tooltip, only for numberic value.
+
diff --git a/en/option/component/visual-map.md
b/en/option/component/visual-map.md
index 468d5fd..47e0cba 100644
--- a/en/option/component/visual-map.md
+++ b/en/option/component/visual-map.md
@@ -341,6 +341,11 @@ Define visual channels that will mapped from dataValues
that are **out of select
See available configurations in
[${visualMapName}.inRange](~${visualMapName}.inRange)
+{{ use: partial-visual-map-inRange-outOfRange(
+ prefix = "",
+ visualMapName = ${visualMapName}
+) }}
+
## controller(Object)
Property `inRange` and `outOfRange` can be set within property `controller`,
which means those `inRange` and `outOfRange` are only used on the controller
(`visualMap` component itself), but are not used on chart (series). This
property is useful in some scenarios when the view of controller needs to be
customized in detail.
@@ -357,6 +362,11 @@ Define visual channels that will mapped from dataValues
that are **out of select
See available configurations in
[${visualMapName}.inRange](~${visualMapName}.inRange)
+{{ use: partial-visual-map-inRange-outOfRange(
+ prefix = "",
+ visualMapName = ${visualMapName}
+) }}
+
{{ use: partial-rect-layout(
componentName = "visualMap ",
defaultZ = "4",
diff --git a/en/option/partial/decal.md b/en/option/partial/decal.md
index 0f3e8db..e5514d8 100644
--- a/en/option/partial/decal.md
+++ b/en/option/partial/decal.md
@@ -1,3 +1,4 @@
+
{{ target: partial-decal-desc }}
The style of the decal pattern. It works only if [aria.enabled](~aria.enabled)
and [aria.decal.show](~aria.decal.show) are both set to be `true`.
@@ -5,9 +6,7 @@ The style of the decal pattern. It works only if
[aria.enabled](~aria.enabled) a
If it is set to be `'none'`, no decal will be used.
{{ if: ${onlyWithAreaStyle} }}
-
It works only if `areaStyle` is set.
-
{{ /if }}
@@ -77,3 +76,4 @@ The upper limit of the width of the generated pattern before
it is duplicated. U
#${prefix|default('#')} maxTileHeight(number) = 512
The upper limit of the height of the generated pattern before it repeats. This
value is usually not necessary to set, but you can try to increase it if you
find that the pattern has discontinuous seams when it is repeated.
+
diff --git a/en/option/partial/item-style.md b/en/option/partial/item-style.md
index 5b14e3a..9c2369b 100644
--- a/en/option/partial/item-style.md
+++ b/en/option/partial/item-style.md
@@ -51,7 +51,6 @@ Border type, which can be `'solid'`, `'dashed'`, or
`'dotted'`. `'solid'` by def
) }}
{{ if: ${useDecal} }}
-
#${prefix} decal(Object | 'none')
{{ use: partial-decal-desc(
@@ -61,5 +60,5 @@ Border type, which can be `'solid'`, `'dashed'`, or
`'dotted'`. `'solid'` by def
{{ use: partial-decal(
prefix = '#' + ${prefix}
) }}
-
{{ /if }}
+
diff --git a/en/option/partial/label-line.md b/en/option/partial/label-line.md
index e82a612..b3479d3 100644
--- a/en/option/partial/label-line.md
+++ b/en/option/partial/label-line.md
@@ -4,6 +4,7 @@
Configuration of label guide line.
+
{{ target: partial-label-line }}
#${prefix} show(boolean)
@@ -48,7 +49,6 @@ Whether to smooth the guide line. It defaults to be `false`
and can be set as `t
Minimum turn angle between two segments of guide line to prevent unaesthetic
display when angle is too small.
Can be 0 - 180 degree.
-
{{ /if }}
#${prefix} lineStyle(Object)
diff --git a/en/option/partial/parallel.md b/en/option/partial/parallel.md
index 0d190ad..0d6ab84 100644
--- a/en/option/partial/parallel.md
+++ b/en/option/partial/parallel.md
@@ -1,7 +1,6 @@
{{ target: partial-parallel-introduce }}
-
**Introduction about Parallel coordinates**
[Parallel Coordinates](https://en.wikipedia.org/wiki/Parallel_coordinates) is
a common way of visualizing high-dimensional geometry and analyzing
multivariate data.
diff --git a/en/option/partial/text-style.md b/en/option/partial/text-style.md
index bf51e00..bb3d73b 100644
--- a/en/option/partial/text-style.md
+++ b/en/option/partial/text-style.md
@@ -35,13 +35,13 @@
#${prefix} width(number)
-<ExampleUIControlNumber default="50" min="1" max="200" step="1" />
+<ExampleUIControlNumber default="100" min="1" max="500" step="1" />
Width of text block.
#${prefix} height(number)
-<ExampleUIControlNumber default="50" min="1" max="200" step="1" />
+<ExampleUIControlNumber default="50" min="1" max="500" step="1" />
Height of text block.
diff --git a/en/option/series/bar.md b/en/option/series/bar.md
index ae0ca09..c0eead9 100644
--- a/en/option/series/bar.md
+++ b/en/option/series/bar.md
@@ -326,7 +326,6 @@ Border type. Can be `'dashed'`, `'dotted'`.
) }}
{{ if: ${useDecal} }}
-
#${prefix} decal(Object | 'none')
{{ use: partial-decal-desc() }}
@@ -334,5 +333,5 @@ Border type. Can be `'dashed'`, `'dotted'`.
{{ use: partial-decal(
prefix = '#' + ${prefix}
) }}
-
{{ /if }}
+
diff --git a/en/option/series/boxplot.md b/en/option/series/boxplot.md
index 32e6cb4..7d18539 100644
--- a/en/option/series/boxplot.md
+++ b/en/option/series/boxplot.md
@@ -180,7 +180,9 @@ Style of a single data.
{{ use: partial-item-style(
prefix = "###",
- name = "boxplot"
+ name = "boxplot",
+ useDecal = true,
+ decalOnlyWithAreaStyle = true
) }}
### emphasis(Object)
@@ -221,9 +223,7 @@ Select state of single data.
{{ use: partial-item-style(
prefix = "####",
- name = "boxplot",
- useDecal = true,
- decalOnlyWithAreaStyle = true
+ name = "boxplot"
) }}
{{ use: partial-tooltip-in-series-data() }}
diff --git a/en/option/series/funnel.md b/en/option/series/funnel.md
index d3b5a1e..1e92ed0 100644
--- a/en/option/series/funnel.md
+++ b/en/option/series/funnel.md
@@ -184,12 +184,12 @@ data value.
### itemStyle(Object)
+{{ use: partial-item-style-desc() }}
+
#### height(string|number)
Height of this data item. By default, the height is evenly divided for all
data items. The height can be set to percentage (e.g.: '10%') or pixel value
(e.g.: 20). Please make sure that the total height of all data items is 100%.
-{{ use: partial-item-style-desc() }}
-
{{ use: partial-item-style(
prefix = "###",
useDecal = true
diff --git a/en/option/series/pie.md b/en/option/series/pie.md
index 3d2c7c1..6a01cf1 100644
--- a/en/option/series/pie.md
+++ b/en/option/series/pie.md
@@ -444,7 +444,6 @@ Label rotation.
-
{{ target: partial-pie-border-radius }}
#${prefix} borderRadius(number|string|Array)
@@ -460,4 +459,5 @@ To specify the roundness for corners of the sectors of the
pie chart. It can be
+ `borderRadius: 10`: means that both inner corner radius and outer corner
radius are `10px`.
+ `borderRadius: '20%'`: means that both inner corner radius is `20%` of the
inner radius of the pie and outer corner radius is `20%` of the outer radius of
the pie.
+ `borderRadius: [10, 20]`: means that the inner corner radius is `10px` and
the outer corner radius is `20px`.
-+ `borderRadius: ['20%', '50%']`: means that the inner corner radius is `20%`
of the inner radius of the pie and the outer corner radius is `50%` of the
outer radius of the pie.
\ No newline at end of file
++ `borderRadius: ['20%', '50%']`: means that the inner corner radius is `20%`
of the inner radius of the pie and the outer corner radius is `50%` of the
outer radius of the pie.
+
diff --git a/en/option/series/radar.md b/en/option/series/radar.md
index 59c8b61..36ca6b8 100644
--- a/en/option/series/radar.md
+++ b/en/option/series/radar.md
@@ -55,7 +55,8 @@ Item style of the inflection point of the lines.
prefix = "##",
useColorPalatte = true,
hasCallback = true,
- useDecal = true
+ useDecal = true,
+ decalOnlyWithAreaStyle = true
) }}
## lineStyle(Object)
diff --git a/en/option/series/sankey.md b/en/option/series/sankey.md
index 8f9556e..3ff642c 100644
--- a/en/option/series/sankey.md
+++ b/en/option/series/sankey.md
@@ -432,7 +432,8 @@ The curveness of the edge in Sankey diagram.
#${prefix} itemStyle(Object)
{{ use: partial-item-style(
- prefix = "#" + ${prefix}
+ prefix = "#" + ${prefix},
+ useDecal = true
) }}
@@ -449,8 +450,7 @@ The curveness of the edge in Sankey diagram.
#${prefix} itemStyle(Object)
{{ use: partial-item-style(
- prefix = "#" + ${prefix},
- useDecal = true
+ prefix = "#" + ${prefix}
) }}
#${prefix} lineStyle(Object)
diff --git a/en/option/series/sunburst.md b/en/option/series/sunburst.md
index 112b635..61a6a47 100644
--- a/en/option/series/sunburst.md
+++ b/en/option/series/sunburst.md
@@ -208,8 +208,8 @@ Like `target` attribute of HTML `<a>`, which can either be
`'blank'` or `'self'`
## labelLayout(Object|Function)
-{{ use: partial-label-layout(
- prefix = "##",
+{{ use: partial-sunburst-state(
+ prefix = "#",
isNormal = true
) }}
@@ -275,7 +275,8 @@ If there is no `name`, whether need to render it.
) }}
{{ use: partial-sunburst-itemStyle-props(
- prefix = "#"
+ prefix = "#",
+ isNormal = true
) }}
## emphasis
@@ -287,8 +288,7 @@ Configurations of emphasis state.
) }}
{{ use: partial-sunburst-state(
- prefix = "##",
- isNormal = true
+ prefix = "##"
) }}
## blur
diff --git a/en/option/series/themeRiver.md b/en/option/series/themeRiver.md
index dfdda9a..48bf85d 100644
--- a/en/option/series/themeRiver.md
+++ b/en/option/series/themeRiver.md
@@ -91,7 +91,7 @@ style of each ribbon-shape river branch in theme river.
{{ use: partial-item-style(
prefix = "##",
- isNormal = true
+ useDecal = true
) }}
## emphasis(Object)
diff --git a/en/option/series/treemap.md b/en/option/series/treemap.md
index 14ade86..78d6ca7 100644
--- a/en/option/series/treemap.md
+++ b/en/option/series/treemap.md
@@ -730,7 +730,6 @@ In this way, a effect can be implemented: different
sections have different hue
{{ use: partial-decal(
prefix = '#' + ${prefix}
) }}
-
{{ /if }}
diff --git a/zh/option/component/visual-map.md
b/zh/option/component/visual-map.md
index adc1a69..8f6e5c3 100644
--- a/zh/option/component/visual-map.md
+++ b/zh/option/component/visual-map.md
@@ -316,11 +316,6 @@ chart.setOption(option); // option设置回 ${componentMainType}
配置参考 [${visualMapName}.inRange](~${visualMapName}.inRange)
-{{ use: partial-visual-map-inRange-outOfRange(
- prefix = "",
- visualMapName = ${visualMapName}
-) }}
-
## controller(Object)
visualMap 组件中，`控制器` 的 `inRange` `outOfRange` 设置。如果没有这个 `controller` 设置，`控制器`
会使用外层的 `inRange` `outOfRange` 设置；如果有这个 `controller`
设置，则会采用这个设置。适用于一些控制器视觉效果需要特殊定制或调整的场景。
@@ -337,10 +332,6 @@ visualMap 组件中，`控制器` 的 `inRange` `outOfRange` 设置。如果没
配置参考 [${visualMapName}.inRange](~${visualMapName}.inRange)
-{{ use: partial-visual-map-inRange-outOfRange(
- prefix = "",
- visualMapName = ${visualMapName}
-) }}
{{ use: partial-rect-layout(
componentName = "visualMap ",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
