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/07/16 09:50:17 UTC
[incubator-echarts-doc] 02/03: Merge branch 'master' of
github.com:apache/incubator-echarts-doc
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 643621574cc88ee9ba14bb7f61dda77555fa3db4
Merge: 0f93871 cb3235c
Author: Ovilia <zw...@gmail.com>
AuthorDate: Thu Jul 16 16:01:05 2020 +0800
Merge branch 'master' of github.com:apache/incubator-echarts-doc
asset/img/basic-concepts-overview/components.jpg | Bin 71677 -> 71127 bytes
build.js | 86 +-
en/api/action.md | 39 +-
en/api/echarts-instance.md | 31 +-
en/api/echarts.md | 14 +-
en/api/events.md | 36 +-
en/api/version.md | 5 +
en/changelog.md | 44 +-
en/coding-standard.md | 6 +-
en/option-gl/partial/shading.md | 2 +-
en/option-gl/partial/temporal-super-sampling.md | 2 +-
en/option/component/angle-axis.md | 2 +-
en/option/component/aria.md | 6 +-
en/option/component/axis-common.md | 26 +-
en/option/component/axisPointer.md | 2 +-
en/option/component/brush.md | 10 +-
en/option/component/calendar.md | 2 +-
en/option/component/data-zoom.md | 14 +-
en/option/component/dataset.md | 2 +-
en/option/component/geo-common.md | 6 +-
en/option/component/graphic.md | 4 +-
en/option/component/legend.md | 20 +-
en/option/component/radar.md | 1 +
en/option/component/toolbox.md | 13 +-
en/option/component/tooltip.md | 2 +-
en/option/component/visual-map-continuous.md | 4 +-
en/option/component/visual-map-piecewise.md | 4 +-
en/option/component/visual-map.md | 12 +-
en/option/partial/1d-data.md | 2 +-
en/option/partial/2d-data.md | 14 +-
en/option/partial/data-id-desc.md | 2 +-
en/option/partial/line-style.md | 2 +-
en/option/partial/mark-line.md | 4 +-
en/option/partial/mark-point.md | 6 +-
en/option/partial/marker.md | 3 +-
en/option/partial/parallel.md | 2 +-
en/option/partial/symbol.md | 14 +-
en/option/partial/text-style.md | 8 +-
en/option/partial/tooltip-common.md | 2 +-
en/option/partial/version.md | 4 +-
en/option/partial/zr-graphic.md | 4 +-
en/option/series/bar.md | 13 +-
en/option/series/boxplot.md | 3 +-
en/option/series/candlestick.md | 9 +-
en/option/series/custom.md | 8 +-
en/option/series/effectScatter.md | 10 +-
en/option/series/funnel.md | 3 +-
en/option/series/gauge.md | 9 +-
en/option/series/graph.md | 15 +-
en/option/series/heatmap.md | 3 +-
en/option/series/line.md | 6 +-
en/option/series/lines.md | 3 +-
en/option/series/map.md | 7 +-
en/option/series/pictorialBar.md | 11 +-
en/option/series/pie.md | 10 +-
en/option/series/radar.md | 1 +
en/option/series/sankey.md | 26 +-
en/option/series/scatter.md | 5 +-
en/option/series/sunburst.md | 2 +-
en/option/series/themeRiver.md | 2 +
en/option/series/tree.md | 10 +-
en/option/series/treemap.md | 6 +-
en/tutorial/custom-build.md | 6 +-
en/tutorial/custom-series.md | 28 +-
en/tutorial/data-zoom.md | 9 +-
en/tutorial/dataset.md | 111 +-
en/tutorial/drag-example.md | 11 +-
en/tutorial/getting-started.md | 4 +-
en/tutorial/media-query.md | 19 +-
en/tutorial/npm-webpack.md | 2 +-
en/tutorial/renderer.md | 6 +-
en/tutorial/rich-text.md | 53 +-
en/tutorial/style-overview.md | 6 +-
en/tutorial/styling.md | 2 +-
en/tutorial/visual-map.md | 19 +-
package-lock.json | 5095 ++++++++++++----------
package.json | 55 +-
slides/ani/asset/common/echarts.min.js | 10 +-
slides/arch-brief/asset/common/echarts.min.js | 10 +-
slides/custom/asset/common/echarts.js | 12 +-
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 | 214 +-
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 | 10 +-
src/i18n.js | 64 +
src/main.js | 27 +-
src/store.js | 173 +-
src/style/mixin.scss | 12 +-
tool/extractDesc.js | 17 +-
tool/md2json.js | 165 +-
zh/api/action.md | 36 +-
zh/api/echarts-instance.md | 19 +-
zh/api/echarts.md | 14 +-
zh/api/events.md | 34 +-
zh/api/version.md | 5 +
zh/changelog.md | 43 +-
{en => zh}/coding-standard.md | 223 +-
zh/option/component/angle-axis.md | 71 +
zh/option/component/axis-common.md | 141 +-
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/geo-common.md | 16 +
zh/option/component/grid.md | 41 +
zh/option/component/legend.md | 134 +
zh/option/component/parallel-axis.md | 185 +-
zh/option/component/parallel.md | 457 +-
zh/option/component/polar.md | 58 +
zh/option/component/radar.md | 51 +
zh/option/component/radius-axis.md | 67 +
zh/option/component/timeline.md | 432 +-
zh/option/component/title.md | 30 +
zh/option/component/toolbox.md | 165 +-
zh/option/component/tooltip.md | 132 +-
zh/option/component/visual-map-continuous.md | 29 +-
zh/option/component/visual-map-piecewise.md | 33 +
zh/option/component/visual-map.md | 9 +-
zh/option/component/x-axis.md | 43 +
zh/option/component/y-axis.md | 87 +
zh/option/option.md | 2 +-
zh/option/partial/2d-data.md | 4 +-
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/color-desc.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 | 20 +-
zh/option/partial/marker.md | 3 +-
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 | 24 +-
zh/option/partial/text-style.md | 58 +-
zh/option/partial/tooltip-common.md | 16 +-
zh/option/partial/version.md | 4 +-
zh/option/series/bar.md | 95 +-
zh/option/series/boxplot.md | 47 +
zh/option/series/candlestick.md | 203 +
zh/option/series/custom.md | 2 +-
zh/option/series/effectScatter.md | 41 +-
zh/option/series/funnel.md | 43 +
zh/option/series/gauge.md | 128 +-
zh/option/series/graph.md | 63 +-
zh/option/series/heatmap.md | 51 +
zh/option/series/line.md | 42 +
zh/option/series/parallel.md | 178 +
zh/option/series/pictorialBar.md | 74 +
zh/option/series/pie.md | 83 +
zh/option/series/radar.md | 36 +
zh/option/series/sankey.md | 26 +-
zh/option/series/scatter.md | 73 +
zh/option/series/sunburst.md | 169 +-
zh/option/series/themeRiver.md | 74 +
zh/option/series/tree.md | 66 +-
zh/option/series/treemap.md | 218 +-
zh/tutorial/custom-build.md | 6 +-
zh/tutorial/custom-series.md | 27 +-
zh/tutorial/data-zoom.md | 7 +-
zh/tutorial/dataset.md | 133 +-
zh/tutorial/drag-example.md | 9 +-
zh/tutorial/echarts-gl.md | 70 +-
zh/tutorial/getting-started.md | 4 +-
zh/tutorial/graphic.md | 3 +-
zh/tutorial/media-query.md | 10 +-
zh/tutorial/renderer.md | 8 +-
zh/tutorial/rich-text.md | 50 +-
zh/tutorial/style-overview.md | 4 +-
zh/tutorial/visual-map.md | 10 +-
zh/tutorial/weixin-application.md | 4 +-
207 files changed, 11331 insertions(+), 3304 deletions(-)
diff --cc zh/option/series/bar.md
index 1644c1f,543f9a5..ccd2635
--- a/zh/option/series/bar.md
+++ b/zh/option/series/bar.md
@@@ -2,10 -2,87 +2,87 @@@
# series.bar(Object)
-**柱状/条形图**
+**柱状图**
-柱状/条形图 通过 柱形的高度/条形的宽度 来表现数据的大小，用于有至少一个类目轴或时间轴的[直角坐标系](~grid)上。
+柱状图（或称条形图）是一种通过柱形的高度（横向的情况下则是宽度）来表现数据大小的一种常用图表类型。
+
+ <ExampleBaseOption name="cartesian-bar" title="直角坐标系上的柱状图" title-en="Bar on Cartesian">
+ const option = {
+ tooltip: {},
+ legend: {},
+ xAxis: {
+ data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ },
+ yAxis: {},
+ series: [{
+ name: 'Sale',
+ type: 'bar',
+ data: [5, 20, 36, 10, 10, 20, 4]
+ }]
+ };
+ </ExampleBaseOption>
+
+ <ExampleBaseOption name="polar-bar" title="极坐标系上的柱状图" title-en="Bar on Polar">
+ const option = {
+ angleAxis: {
+ max: 30
+ },
+ radiusAxis: {
+ type: 'category',
+ data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+ z: 10
+ },
+ polar: {},
+ series: [{
+ name: 'Sale',
+ type: 'bar',
+ data: [5, 20, 36, 10, 10, 20, 4],
+ coordinateSystem: 'polar'
+ }],
+ legend: {},
+ };
+ </ExampleBaseOption>
+
+ <ExampleBaseOption name="cartesian-bar-multiple-series" title="多系列柱状图" title-en="Multiple Series">
+ option = {
+ legend: {
+ data: ['Food', 'Cloth', 'Book']
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ name: 'Food',
+ type: 'bar',
+ data: [320, 302, 301, 334, 390, 330, 320]
+ },
+ {
+ name: 'Cloth',
+ type: 'bar',
+ data: [150, 212, 201, 154, 190, 330, 410]
+ },
+ {
+ name: 'Book',
+ type: 'bar',
+ data: [820, 832, 901, 934, 1290, 1330, 1320]
+ }
+ ]
+ };
+ </ExampleBaseOption>
+
+
## type(string) = 'bar'
{{use: partial-component-id(prefix="#")}}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org