You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2020/02/25 06:12:55 UTC
[incubator-echarts-doc] branch master updated (7132df1 -> 166b6ca)
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/incubator-echarts-doc.git.
from 7132df1 fix missing seriesType
new 7760524 add doc for apache/incubator-echarts#11843
new 727f7f2 add doc for apache/incubator-echarts#11951
new 166b6ca Merge branch 'master' of github.com:apache/incubator-echarts-doc
The 3 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:
config/env.dev.js | 4 ++--
en/option/partial/mark-line.md | 21 ++++++++++++++++++++-
en/option/series/bar.md | 24 ++++++++++++++++++++++--
zh/option/partial/mark-line.md | 15 ++++++++++++++-
zh/option/series/bar.md | 22 +++++++++++++++++++++-
5 files changed, 79 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts-doc] 02/03: add doc for
apache/incubator-echarts#11951
Posted by ov...@apache.org.
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/incubator-echarts-doc.git
commit 727f7f2e63bef5ab2ad6dabb757b625cebe310b0
Author: Ovilia <zw...@gmail.com>
AuthorDate: Tue Feb 25 14:01:50 2020 +0800
add doc for apache/incubator-echarts#11951
---
config/env.dev.js | 4 ++--
en/option/series/bar.md | 24 ++++++++++++++++++++++--
zh/option/series/bar.md | 22 +++++++++++++++++++++-
3 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/config/env.dev.js b/config/env.dev.js
index 74bc11d..8595648 100644
--- a/config/env.dev.js
+++ b/config/env.dev.js
@@ -1,8 +1,8 @@
const path = require('path');
module.exports = {
- galleryViewPath: 'https://www.echartsjs.com/examples/zh/view.html?c=',
- galleryEditorPath: 'https://www.echartsjs.com/examples/zh/editor.html?c=',
+ galleryViewPath: 'http://localhost/incubator-echarts-website/examples/en/view.html?c=',
+ galleryEditorPath: 'http://localhost/incubator-echarts-website/examples/en/editor.html?c=',
websitePath: './',
imagePath: 'asset/img/',
diff --git a/en/option/series/bar.md b/en/option/series/bar.md
index 9751368..4798b5c 100644
--- a/en/option/series/bar.md
+++ b/en/option/series/bar.md
@@ -45,6 +45,26 @@ If to add round caps at the end of the bar sectors. Valid only for bar series on
barBorderRadius=true
)}}
+## showBackground(boolean) = false
+
+Whether to show background behind each bar. Use [backgroundStyle](~series-bar.backgroundStyle) to set background style.
+
+~[800x400](${galleryViewPath}bar-background&reset=1&edit=1)
+
+## backgroundStyle(Object)
+
+Background style of each bar if [showBackground](~series-bar.showBackground) is set to be `true`.
+
+~[800x400](${galleryViewPath}bar-background&reset=1&edit=1)
+
+{{use:partial-bar-item-style(
+ prefix="##",
+ useColorPalatte=false,
+ hasCallback=true,
+ barBorderRadius=true,
+ defaultColor="'rgba(180, 180, 180, 0.2)'"
+)}}
+
## emphasis(Object)
### label(Object)
@@ -158,9 +178,9 @@ The style setting of the text label in a single bar.
{{ target:partial-bar-item-style }}
-#${prefix} color(Color) = 'auto'
+#${prefix} color(Color) = ${defaultColor|default('auto')}
-Bar color.{{ if: ${useColorPalatte} }} defaults to acquire colors from global palette [option.color](~color) {{/if}}.
+Bar color. {{ if: ${useColorPalatte} }} By default, colors from global palette [option.color](~color) is used. {{/if}}
#${prefix} barBorderColor(Color) = '#000'
diff --git a/zh/option/series/bar.md b/zh/option/series/bar.md
index 5261f95..c9c1b47 100644
--- a/zh/option/series/bar.md
+++ b/zh/option/series/bar.md
@@ -47,6 +47,26 @@
barBorderRadius=true
)}}
+## showBackground(boolean) = false
+
+是否显示柱条的背景色。通过 [backgroundStyle](~series-bar.backgroundStyle) 配置背景样式。
+
+~[800x400](${galleryViewPath}bar-background&reset=1&edit=1)
+
+## backgroundStyle(Object)
+
+每一个柱条的背景样式。需要将 [showBackground](~series-bar.showBackground) 设置为 `true` 时才有效。
+
+~[800x400](${galleryViewPath}bar-background&reset=1&edit=1)
+
+{{use:partial-bar-item-style(
+ prefix="##",
+ useColorPalatte=false,
+ hasCallback=true,
+ barBorderRadius=true,
+ defaultColor="'rgba(180, 180, 180, 0.2)'"
+)}}
+
## emphasis(Object)
高亮的图形样式和标签样式。
@@ -172,7 +192,7 @@
{{ target:partial-bar-item-style }}
-#${prefix} color(Color) = 自适应
+#${prefix} color(Color) = ${defaultColor|default('自适应')}
柱条的颜色。{{ if: ${useColorPalatte} }} 默认从全局调色盘 [option.color](~color) 获取颜色 {{/if}}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts-doc] 01/03: add doc for
apache/incubator-echarts#11843
Posted by ov...@apache.org.
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/incubator-echarts-doc.git
commit 7760524065033036f928b6a3e850daea959bfaaf
Author: Ovilia <zw...@gmail.com>
AuthorDate: Mon Feb 24 16:56:39 2020 +0800
add doc for apache/incubator-echarts#11843
---
en/option/partial/mark-line.md | 21 ++++++++++++++++++++-
zh/option/partial/mark-line.md | 15 ++++++++++++++-
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/en/option/partial/mark-line.md b/en/option/partial/mark-line.md
index 4ded112..1a8947d 100644
--- a/en/option/partial/mark-line.md
+++ b/en/option/partial/mark-line.md
@@ -138,6 +138,18 @@ Positions of labels can be:
+ `'start'` starting point of the line.
+ `'middle'` middle point of the line.
+ `'end'` ending point of the line.
+
+Since version 4.7.0, more label positions are supported: `'start'`, `'middle'`, `'end'`, `'insideStartTop'`, `'insideStartBottom'`, `'insideMiddleTop'`, `'insideMiddleBottom'`, `'insideEndTop'`, `'insideEndBottom'`.
+
+`'insideMiddleBottom'` is the same as `'middle'`. Position is as the following chart.
+
+The distance between labels and mark lines can be set with [label.distance](~series-${seriesType}.markLine.label.distance).
+
+~[800x500](${galleryViewPath}bar-markline&reset=1&edit=1)
+
+#${prefix} distance(number|Array)
+The distance between labels and mark lines. If it's an array, then the first element is the horizontal distance, and the second element is the vertical distance. If it's a number, then the horizontal and vertical disntances are the same.
+
#${prefix} formatter(string|Function)
{{ use: partial-1d-data-label-formatter }}
@@ -201,7 +213,14 @@ Label of this data item, which will be merged with `label` of starting point and
{{ use: mark-line-label(
prefix='#'+${prefix}
) }}
-##${prefix} emphasis(Object)
+
+#${prefix} emphasis(Object)
+##${prefix} lineStyle(Object)
+{{ use: partial-line-style(
+ prefix="##"+${prefix},
+ hasCurveness=true
+) }}
+##${prefix} label(Object)
{{ use: mark-line-label(
prefix='##'+${prefix}
) }}
diff --git a/zh/option/partial/mark-line.md b/zh/option/partial/mark-line.md
index f72e02e..cbabdb6 100644
--- a/zh/option/partial/mark-line.md
+++ b/zh/option/partial/mark-line.md
@@ -137,11 +137,24 @@ data: [
{{ target: mark-line-label }}
#${prefix} show(boolean) = ${defaultShowLabel|default(true)}
是否显示标签。
+
#${prefix} position(string) = 'end'
标签位置，可选：
+ `'start'` 线的起始点。
+ `'middle'` 线的中点。
-+ `'end'` 线的结束点。
++ `'end'` 线的结束点。
+
+4.7.0 版本起，支持更多标签位置：`'start'`, `'middle'`, `'end'`, `'insideStartTop'`, `'insideStartBottom'`, `'insideMiddleTop'`, `'insideMiddleBottom'`, `'insideEndTop'`, `'insideEndBottom'`。
+
+其中，`'insideMiddleBottom'` 等同于 `'middle'`。具体位置参见下图。
+
+文字与线的间距可以通过 [label.distance](~series-${seriesType}.markLine.label.distance) 调整。
+
+~[800x500](${galleryViewPath}bar-markline&reset=1&edit=1)
+
+#${prefix} distance(number|Array)
+标签与线之间的间距。如果是数组，第一项为横向间距，第二项为纵向间距。如果是数字，则表示横向纵向使用相同的间距。
+
#${prefix} formatter(string|Function)
{{ use: partial-1d-data-label-formatter }}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts-doc] 03/03: Merge branch 'master' of
github.com:apache/incubator-echarts-doc
Posted by ov...@apache.org.
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/incubator-echarts-doc.git
commit 166b6ca080060613865a2a10437d83cddaee402e
Merge: 727f7f2 7132df1
Author: Ovilia <zw...@gmail.com>
AuthorDate: Tue Feb 25 14:07:22 2020 +0800
Merge branch 'master' of github.com:apache/incubator-echarts-doc
en/option/partial/mark-area.md | 2 ++
en/option/partial/mark-line.md | 2 ++
zh/option/partial/mark-area.md | 2 ++
zh/option/partial/mark-line.md | 2 ++
4 files changed, 8 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org