You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/09/01 10:01:24 UTC
[incubator-echarts-doc] branch next updated: remove unexpected
space after formatted.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
The following commit(s) were added to refs/heads/next by this push:
new 7d1e87a remove unexpected space after formatted.
7d1e87a is described below
commit 7d1e87a304892578dd42016c13a61762adb06c6c
Author: pissang <bm...@gmail.com>
AuthorDate: Tue Sep 1 18:01:09 2020 +0800
remove unexpected space after formatted.
---
.gitignore | 1 +
editor/common/blockHelper.js | 22 +++++++++------
en/option/component/axis-common.md | 34 +++++++++++------------
en/option/component/timeline.md | 8 +++---
en/option/partial/component-common-style.md | 2 +-
en/option/partial/formatter.md | 2 +-
en/option/partial/label.md | 12 ++++-----
en/option/partial/mark-line.md | 2 +-
en/option/partial/mark-point.md | 2 +-
en/option/partial/rect-layout.md | 4 +--
en/option/partial/text-style.md | 20 +++++++-------
en/option/partial/tooltip-common.md | 2 +-
en/option/partial/zr-graphic.md | 42 ++++++++++++++---------------
en/option/series/funnel.md | 4 +--
en/option/series/pie.md | 4 +--
en/option/series/treemap.md | 6 ++---
zh/option/component/axis-common.md | 34 +++++++++++------------
zh/option/component/timeline.md | 8 +++---
zh/option/partial/component-common-style.md | 2 +-
zh/option/partial/focus-blur-scope.md | 2 +-
zh/option/partial/formatter.md | 2 +-
zh/option/partial/label.md | 12 ++++-----
zh/option/partial/mark-line.md | 2 +-
zh/option/partial/mark-point.md | 2 +-
zh/option/partial/rect-layout.md | 4 +--
zh/option/partial/selected-mode.md | 2 +-
zh/option/partial/text-style.md | 20 +++++++-------
zh/option/partial/tooltip-common.md | 2 +-
zh/option/partial/zr-graphic.md | 42 ++++++++++++++---------------
zh/option/series/bar.md | 4 +--
zh/option/series/funnel.md | 4 +--
zh/option/series/pie.md | 4 +--
zh/option/series/treemap.md | 10 +++----
33 files changed, 165 insertions(+), 158 deletions(-)
diff --git a/.gitignore b/.gitignore
index b28f93f..943dbf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -183,6 +183,7 @@ slides/webgl
# Editor temporal files
/editor/common/blocks.json
+/editor/server/blocks.json
/editor/server/test
/zh-src
\ No newline at end of file
diff --git a/editor/common/blockHelper.js b/editor/common/blockHelper.js
index cdd880a..d5a1d18 100644
--- a/editor/common/blockHelper.js
+++ b/editor/common/blockHelper.js
@@ -196,23 +196,29 @@ module.exports.buildBlockHierarchy = function (blocks) {
module.exports.blockCompositors = {
header(block) {
/* eslint-disable-next-line */
- const prefix = '#'.repeat(block.level) + (block.prefixCode ? block.prefixCode : '');
- let ret = `${prefix} ${block.propertyName}(${block.propertyType || '*'})`;
- if (block.propertyDefault) {
- ret = ret + ' = ' + block.propertyDefault;
+ const prefix = '#'.repeat(block.level) + (block.prefixCode.trim() ? block.prefixCode.trim() : '');
+ let ret = `${prefix} ${block.propertyName.trim()}(${(block.propertyType || '*').trim()})`;
+ const propertyDefault = block.propertyDefault && block.propertyDefault.trim();
+ if (propertyDefault) {
+ ret = ret + ' = ' + propertyDefault;
}
return ret + '\n';
},
use(block) {
// Do some format and code indention
- let argsStr = block.args.map(item => item.join(' = ')).join(',\n ');
+ block.args.forEach(item => {
+ item[0].trim();
+ item[1].trim();
+ })
+ let argsStr = block.args.filter(item => !!item[0])
+ .map(item => item.join(' = ')).join(',\n ');
if (argsStr) {
argsStr = `\n ${argsStr}\n`;
}
- return `{{ use: ${block.target}(${argsStr}) }}\n`;
+ return `{{ use: ${block.target.trim()}(${argsStr}) }}\n`;
},
content(block) {
- return `${block.value}\n`;
+ return `${block.value.trim()}\n`;
}
};
@@ -223,7 +229,7 @@ module.exports.compositeBlocks = function (blocks) {
module.exports.compositeTargets = function (targets) {
return targets.map(target => `
-{{ target: ${target.name} }}
+{{ target: ${target.name.trim()} }}
${module.exports.compositeBlocks(target.blocks)}
`).join('\n\n');
diff --git a/en/option/component/axis-common.md b/en/option/component/axis-common.md
index ea4be0e..07853e6 100644
--- a/en/option/component/axis-common.md
+++ b/en/option/component/axis-common.md
@@ -87,11 +87,11 @@ Set this to `false` to prevent the axis label from appearing.
##${prefix} interval(number|Function) = 'auto'
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="Axis label",
isAxisLabel=true,
componentType=${componentType}
-) }}
+) }}
{{ /if }}
{{ if: ${hasInside|default(true)} }}
@@ -178,10 +178,10 @@ Align axis tick with label, which is available only when `boundaryGap` is set to
##${prefix} interval(number|Function) = 'auto'
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="axisTick",
componentType=${componentType}
-) }}
+) }}
{{ /if }}
{{ if: ${hasInside|default(true)} }}
@@ -279,10 +279,10 @@ Set this to `false` to prevent the splitLine from showing.
##${prefix} interval(number|Function) = 'auto'
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="Axis splitLine",
componentType=${componentType}
-) }}
+) }}
{{ /if }}
##${prefix} lineStyle(Object)
@@ -354,10 +354,10 @@ Split area of axis in [grid](~grid) area, not shown by default.
##${prefix} interval(number|Function) = 'auto'
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="Axis splitArea",
componentType=${componentType}
-) }}
+) }}
{{ /if }}
##${prefix} show(boolean) = ${defaultShow|default(false)}
@@ -427,7 +427,7 @@ Location of axis name.
Text style of axis name.
-{{ use: partial-text-style(prefix='#' + ${prefix}, name="axis name") }}
+{{ use: partial-text-style(prefix='#' + ${prefix}, name="axis name") }}
<!-- Overwrite color -->
##${prefix} color(Color)
@@ -575,20 +575,20 @@ Base of logarithm, which is valid only for numeric axes with [type](~${component
{{ if: ${hasSplitLineAndArea} }}
-{{ use: partial-axis-common-split-line(
+{{ use: partial-axis-common-split-line(
prefix=${prefix},
componentType=${componentType}
-) }}
+) }}
-{{ use: partial-axis-common-minor-split-line(
+{{ use: partial-axis-common-minor-split-line(
prefix=${prefix},
componentType=${componentType}
-) }}
+) }}
-{{ use: partial-axis-common-split-area(
+{{ use: partial-axis-common-split-area(
prefix=${prefix},
componentType=${componentType}
-) }}
+) }}
{{ /if }}
@@ -636,11 +636,11 @@ Text style of the category.
axisPointer settings on the axis.
-{{ use: partial-axisPointer-common(
+{{ use: partial-axisPointer-common(
prefix="#" + ${prefix},
galleryViewPath=${galleryViewPath},
galleryEditorPath=${galleryEditorPath}
-) }}
+) }}
{{ /if }}
diff --git a/en/option/component/timeline.md b/en/option/component/timeline.md
index 007bf68..6d64031 100644
--- a/en/option/component/timeline.md
+++ b/en/option/component/timeline.md
@@ -437,16 +437,16 @@ Rotation angle of `label`, in which positive values refer to counter clockwise r
{{ use: axis-common-formatter-desc() }}
{{ if: ${state} }}
-{{ use: partial-text-style(
+{{ use: partial-text-style(
prefix=${prefix},
name="timeline.lable." + ${state},
defaultColor=${textStyleDefaultColor}
-) }}
+) }}
{{ else }}
-{{ use: partial-text-style(
+{{ use: partial-text-style(
prefix=${prefix},
name="timeline.lable",
defaultColor=${textStyleDefaultColor}
-) }}
+) }}
{{ /if }}
diff --git a/en/option/partial/component-common-style.md b/en/option/partial/component-common-style.md
index 4a2061a..4af6f5e 100644
--- a/en/option/partial/component-common-style.md
+++ b/en/option/partial/component-common-style.md
@@ -28,7 +28,7 @@ Border width of ${componentName}.
{{ /if }}
{{ if: ${hasBorderRadius} }}
-{{ use: partial-border-radius(prefix=${prefix}) }}
+{{ use: partial-border-radius(prefix=${prefix}) }}
{{ /if }}
{{ use: partial-style-shadow(
diff --git a/en/option/partial/formatter.md b/en/option/partial/formatter.md
index 0cef67d..3dc7bc4 100644
--- a/en/option/partial/formatter.md
+++ b/en/option/partial/formatter.md
@@ -34,7 +34,7 @@
dimensionIndex: number,
// Color of data
color: string,
-{{ for: ${extra} as ${obj}, ${name} }}{{ if: ${extra}.hasOwnProperty(${name}) }}
+{{ for: ${extra} as ${obj}, ${name} }}{{ if: ${extra}.hasOwnProperty(${name}) }}
// ${obj.desc}
${name}: ${obj.type},
{{ /if }}{{ /for }}
diff --git a/en/option/partial/label.md b/en/option/partial/label.md
index e8f08de..6d55aaf 100644
--- a/en/option/partial/label.md
+++ b/en/option/partial/label.md
@@ -16,7 +16,7 @@ Whether to show label.
#${prefix} position(string|Array) = ${defaultPosition}
-{{ use: partial-label-position }}
+{{ use: partial-label-position }}
{{ /if }}
#${prefix} distance(number) = 5
@@ -41,17 +41,17 @@ Whether to move text slightly. For example: `[30, 40]` means move `30` horizonta
#${prefix} formatter(string|Function)
-{{ use: partial-2d-data-label-formatter }}
-{{ elif: ${formatter1d} }}
+{{ use: partial-2d-data-label-formatter }}
+{{ elif:${formatter1d} }}
#${prefix} formatter(string|Function)
-{{ use: partial-1d-data-label-formatter }}
+{{ use: partial-1d-data-label-formatter }}
{{ /if }}
{{ if: !${noTextStyle} }}
-{{ use: partial-text-style(
+{{ use: partial-text-style(
prefix=${prefix},
noAlign=${noAlign},
noVerticalAlign=${noVerticalAlign},
@@ -61,7 +61,7 @@ Whether to move text slightly. For example: `[30, 40]` means move `30` horizonta
noRich=${noRich},
noBox=${noBox},
enableAutoColor=true
-) }}
+) }}
{{ /if }}
diff --git a/en/option/partial/mark-line.md b/en/option/partial/mark-line.md
index 2ade5cb..91d41d9 100644
--- a/en/option/partial/mark-line.md
+++ b/en/option/partial/mark-line.md
@@ -214,7 +214,7 @@ Works only when [type](~series-${seriesType}.markLine.data.type) is assigned. It
Coordinates of the starting point or ending point, whose format depends on the coordinate of the series. It can be `x`, and `y` for [rectangular coordinates](~grid), or `radius`, and `angle` for [polar coordinates](~polar).
-{{ use: marker-coord-explain }}
+{{ use: marker-coord-explain }}
{{ /if }}
diff --git a/en/option/partial/mark-point.md b/en/option/partial/mark-point.md
index 9ebc67b..a62fcb6 100644
--- a/en/option/partial/mark-point.md
+++ b/en/option/partial/mark-point.md
@@ -112,7 +112,7 @@ Works only when [type](~series-${seriesType}.markPoint.data.type) is assigned. I
Coordinates of the starting point or ending point, whose format depends on the coordinate of the series. It can be `x`, and `y` for [rectangular coordinates](~grid), or `radius`, and `angle` for [polar coordinates](~polar).
-{{ use: marker-coord-explain }}
+{{ use: marker-coord-explain }}
{{ /if }}
diff --git a/en/option/partial/rect-layout.md b/en/option/partial/rect-layout.md
index f63f88e..a271ffb 100644
--- a/en/option/partial/rect-layout.md
+++ b/en/option/partial/rect-layout.md
@@ -2,11 +2,11 @@
{{ target: partial-rect-layout }}
{{ if: !${noZ} }}
-{{ use: partial-z-zlevel(
+{{ use: partial-z-zlevel(
prefix=${prefix},
defaultZLevel=${defaultZLevel},
defaultZ=${defaultZ}
-) }}
+) }}
{{ /if }}
#${prefix|default("#")} left(string|number) = ${defaultLeft|default("'auto'")}
diff --git a/en/option/partial/text-style.md b/en/option/partial/text-style.md
index 28c2648..40e8875 100644
--- a/en/option/partial/text-style.md
+++ b/en/option/partial/text-style.md
@@ -74,10 +74,10 @@ For more details, see [Rich Text](tutorial.html#Rich%20Text) please.
##${prefix} <style_name>(Object)
-{{ use: partial-text-style-base-item(
+{{ use: partial-text-style-base-item(
prefix=${prefix} + '##',
enableAutoColor=${enableAutoColor}
-) }}
+) }}
{{ /if }}
@@ -92,7 +92,7 @@ ${name} text color.
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} fontStyle(string) = 'normal'
@@ -137,10 +137,10 @@ Options are:
+ `'center'`
+ `'right'`
-{{ use: partial-text-style-rich-inherit(
+{{ use: partial-text-style-rich-inherit(
name='align',
value='right'
-) }}
+) }}
{{ /if }}
@@ -155,10 +155,10 @@ Options are:
+ `'middle'`
+ `'bottom'`
-{{ use: partial-text-style-rich-inherit(
+{{ use: partial-text-style-rich-inherit(
name='verticalAlign',
value='bottom'
-) }}
+) }}
{{ /if }}
@@ -195,7 +195,7 @@ backgroundColor: {
auto adapted by default.
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} borderColor(Color) = 'transparent'
@@ -203,7 +203,7 @@ auto adapted by default.
Border color of the text fragment.
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} borderWidth(number) = 0
@@ -266,7 +266,7 @@ Notice, `width` and `height` only work when `rich` specified.
Storke color of the text.
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} textBorderWidth(number) = 0
diff --git a/en/option/partial/tooltip-common.md b/en/option/partial/tooltip-common.md
index 24e06ea..dd3cfcb 100644
--- a/en/option/partial/tooltip-common.md
+++ b/en/option/partial/tooltip-common.md
@@ -74,7 +74,7 @@ tooltip settings in this series data.
{{ if: ${scope} === 'series' }}
<br>
> **Notice：**series.tooltip only works when [tooltip.trigger](~tooltip.trigger) is `'item'`.<br>
-{{ elif: ${scope} === 'seriesData' }}
+{{ elif:${scope} === 'seriesData' }}
> **Notice：**series.data.tooltip only works when [tooltip.trigger](~tooltip.trigger) is `'item'`.<br>
{{ /if }}
diff --git a/en/option/partial/zr-graphic.md b/en/option/partial/zr-graphic.md
index 9f9326a..4eb92f9 100644
--- a/en/option/partial/zr-graphic.md
+++ b/en/option/partial/zr-graphic.md
@@ -82,7 +82,7 @@ About width/height, cover/contain, see
[layout](~${optionPath}.${hostName}${symbolVisit}path.shape.layout).
-{{ use: partial-graphic-cpt-common-props(
+{{ use: partial-graphic-cpt-common-props(
type='path',
prefix=${prefix},
optionPath=${optionPath},
@@ -90,7 +90,7 @@ About width/height, cover/contain, see
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} shape(Object)
@@ -122,51 +122,51 @@ Optional value:
+ `'cover'`: Transform the path according to the aspect ratio of the rect, fill the rect and do not overflow.
-{{ use: partial-graphic-cpt-sub-prop-xy(
+{{ use: partial-graphic-cpt-sub-prop-xy(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
-{{ use: partial-graphic-cpt-sub-prop-wh(
+) }}
+{{ use: partial-graphic-cpt-sub-prop-wh(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} style(Object)
-{{ use: partial-graphic-cpt-style-prop-common(
+{{ use: partial-graphic-cpt-style-prop-common(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
-{{ use: partial-graphic-cpt-style-emphasis(
+{{ use: partial-graphic-cpt-style-emphasis(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
-{{ use: partial-graphic-cpt-event-handlers(
+{{ use: partial-graphic-cpt-event-handlers(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
{{ /if }}
@@ -967,7 +967,7 @@ Optional values:
##${prefix} left(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'h',
prefix=${prefix},
optionPath=${optionPath},
@@ -975,11 +975,11 @@ Optional values:
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} right(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'h',
prefix=${prefix},
optionPath=${optionPath},
@@ -987,11 +987,11 @@ Optional values:
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} top(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'v',
prefix=${prefix},
optionPath=${optionPath},
@@ -999,11 +999,11 @@ Optional values:
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} bottom(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'v',
prefix=${prefix},
optionPath=${optionPath},
@@ -1011,7 +1011,7 @@ Optional values:
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} bounding(strin) = 'all'
@@ -1079,7 +1079,7 @@ Whether the element is totally ignored (neither render nor listen events).
{{ if: ${usageType} === 'graphicComponent' }}
-{{ use: partial-cursor(prefix="##") }}
+{{ use: partial-cursor(prefix="##") }}
##${prefix} draggable(boolean) = false
diff --git a/en/option/series/funnel.md b/en/option/series/funnel.md
index 016334f..22deea0 100644
--- a/en/option/series/funnel.md
+++ b/en/option/series/funnel.md
@@ -252,12 +252,12 @@ Label position.
#${prefix} formatter(string|Function)
-{{ use: partial-1d-data-label-formatter(extra = {
+{{ use: partial-1d-data-label-formatter(extra = {
percent: {
desc: 'percentage',
type: 'number'
}
-}) }}
+}) }}
{{ /if }}
{{ use: partial-text-style(
diff --git a/en/option/series/pie.md b/en/option/series/pie.md
index ec9284d..78ae8b6 100644
--- a/en/option/series/pie.md
+++ b/en/option/series/pie.md
@@ -331,12 +331,12 @@ The position of label.
#${prefix} formatter(string|Function)
-{{ use: partial-1d-data-label-formatter(extra = {
+{{ use: partial-1d-data-label-formatter(extra = {
percent: {
desc: 'percentage',
type: 'number'
}
-}) }}
+}) }}
{{ /if }}
#${prefix} rotate(boolean|number) = null
diff --git a/en/option/series/treemap.md b/en/option/series/treemap.md
index 2bfa9a4..a59c470 100644
--- a/en/option/series/treemap.md
+++ b/en/option/series/treemap.md
@@ -417,8 +417,8 @@ When [colorMappingBy](~series-treemap.levels.colorMappingBy) is set to `'value'`
A color list for a level. Each node in the level will obtain a color from the color list (the rule see [colorMappingBy](~series-treemap.levels.colorMappingBy)). It is empty by default, which means the global color list will be used.
-{{ use: partial-treemap-visual-detial }}
-{{ use: partial-treemap-prop-location-desc(name="color") }}
+{{ use: partial-treemap-visual-detial }}
+{{ use: partial-treemap-prop-location-desc(name="color") }}
{{ /if }}
@@ -650,7 +650,7 @@ When `borderColorSaturation` is set, the `borderColor` is disabled, and, instead
In this way, a effect can be implemented: different sections have different hue of gap color repectively, which makes users easy to distinguish both sections and levels.
<br>
-{{ use: partial-treemap-borderColor-setting(galleryEditorPath=${galleryEditorPath}) }}
+{{ use: partial-treemap-borderColor-setting(galleryEditorPath=${galleryEditorPath}) }}
#${prefix} strokeColor(Color) = null
diff --git a/zh/option/component/axis-common.md b/zh/option/component/axis-common.md
index 4063fcd..d1f4224 100644
--- a/zh/option/component/axis-common.md
+++ b/zh/option/component/axis-common.md
@@ -98,11 +98,11 @@ X 轴或者 Y 轴的轴线是否在另一个轴的 0 刻度上，只有在另一
<ExampleUIControlNumber min="0" step="1" />
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="坐标轴刻度标签",
isAxisLabel=true,
componentType=${componentType}
-) }}
+) }}
{{ /if }}
{{ if: ${hasInside|default(true)} }}
@@ -206,10 +206,10 @@ textStyle: {
<ExampleUIControlNumber min="0" step="1" />
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="坐标轴刻度",
componentType=${componentType}
-) }}
+) }}
{{ /if }}
{{ if: ${hasInside|default(true)} }}
@@ -323,10 +323,10 @@ textStyle: {
<ExampleUIControlNumber min="0" step="1" />
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="坐标轴分隔线",
componentType=${componentType}
-) }}
+) }}
{{ /if }}
##${prefix} lineStyle(Object)
@@ -402,10 +402,10 @@ splitLine: {
<ExampleUIControlNumber min="0" step="1" />
-{{ use: partial-axis-interval(
+{{ use: partial-axis-interval(
name="坐标轴分隔区域",
componentType=${componentType}
-) }}
+) }}
{{ /if }}
##${prefix} show(boolean) = ${defaultShow|default(false)}
@@ -480,7 +480,7 @@ splitLine: {
坐标轴名称的文字样式。
-{{ use: partial-text-style(prefix='#' + ${prefix}, name="坐标轴名称") }}
+{{ use: partial-text-style(prefix='#' + ${prefix}, name="坐标轴名称") }}
<!-- Overwrite color -->
##${prefix} color(Color)
@@ -655,20 +655,20 @@ max: function (value) {
{{ if: ${hasSplitLineAndArea} }}
-{{ use: partial-axis-common-split-line(
+{{ use: partial-axis-common-split-line(
prefix=${prefix},
componentType=${componentType}
-) }}
+) }}
-{{ use: partial-axis-common-minor-split-line(
+{{ use: partial-axis-common-minor-split-line(
prefix=${prefix},
componentType=${componentType}
-) }}
+) }}
-{{ use: partial-axis-common-split-area(
+{{ use: partial-axis-common-split-area(
prefix=${prefix},
componentType=${componentType}
-) }}
+) }}
{{ /if }}
@@ -714,11 +714,11 @@ data: [{
坐标轴指示器配置项。
-{{ use: partial-axisPointer-common(
+{{ use: partial-axisPointer-common(
prefix="#" + ${prefix},
galleryViewPath=${galleryViewPath},
galleryEditorPath=${galleryEditorPath}
-) }}
+) }}
{{ /if }}
diff --git a/zh/option/component/timeline.md b/zh/option/component/timeline.md
index 792eca7..4561cd7 100644
--- a/zh/option/component/timeline.md
+++ b/zh/option/component/timeline.md
@@ -857,16 +857,16 @@ const option = {
{{ use: axis-common-formatter-desc() }}
{{ if: ${state} }}
-{{ use: partial-text-style(
+{{ use: partial-text-style(
prefix=${prefix},
name="timeline.lable." + ${state},
defaultColor=${textStyleDefaultColor}
-) }}
+) }}
{{ else }}
-{{ use: partial-text-style(
+{{ use: partial-text-style(
prefix=${prefix},
name="timeline.lable",
defaultColor=${textStyleDefaultColor}
-) }}
+) }}
{{ /if }}
diff --git a/zh/option/partial/component-common-style.md b/zh/option/partial/component-common-style.md
index 70ffcae..3e83db9 100644
--- a/zh/option/partial/component-common-style.md
+++ b/zh/option/partial/component-common-style.md
@@ -34,7 +34,7 @@ ${componentName}的边框线宽。
{{ /if }}
{{ if: ${hasBorderRadius} }}
-{{ use: partial-border-radius(prefix=${prefix}) }}
+{{ use: partial-border-radius(prefix=${prefix}) }}
{{ /if }}
{{ use: partial-style-shadow(
diff --git a/zh/option/partial/focus-blur-scope.md b/zh/option/partial/focus-blur-scope.md
index 7951c4c..76b0b25 100644
--- a/zh/option/partial/focus-blur-scope.md
+++ b/zh/option/partial/focus-blur-scope.md
@@ -14,7 +14,7 @@
+ `'series'` 聚焦当前高亮的数据所在的系列的所有图形。
{{ if: ${isGraph} }}
+ `'adjacency'` 聚焦关系图中的邻接点和边的图形
-{{ elif: ${isTree} }}
+{{ elif:${isTree} }}
+ `'ancestor'` 聚焦所有祖先节点
+ `'descendant'` 聚焦所有子孙节点
{{ /if }}
diff --git a/zh/option/partial/formatter.md b/zh/option/partial/formatter.md
index 6c01fa6..75aae0e 100644
--- a/zh/option/partial/formatter.md
+++ b/zh/option/partial/formatter.md
@@ -34,7 +34,7 @@
dimensionIndex: number,
// 数据图形的颜色
color: string,
-{{ for: ${extra} as ${obj}, ${name} }}{{ if: ${extra}.hasOwnProperty(${name}) }}
+{{ for: ${extra} as ${obj}, ${name} }}{{ if: ${extra}.hasOwnProperty(${name}) }}
// ${obj.desc}
${name}: ${obj.type},
{{ /if }}{{ /for }}
diff --git a/zh/option/partial/label.md b/zh/option/partial/label.md
index 08e1c13..dbde1df 100644
--- a/zh/option/partial/label.md
+++ b/zh/option/partial/label.md
@@ -20,7 +20,7 @@ ${name}图形上的文本标签，可用于说明图形的一些数据信息，
<ExampleUIControlEnum options="top,left,right,bottom,inside,insideLeft,insideRight,insideTop,insideBottom,insideTopLeft,insideBottomLeft,insideTopRight,insideBottomRight,outside" />
-{{ use: partial-label-position }}
+{{ use: partial-label-position }}
{{ /if }}
#${prefix} distance(number) = 5
@@ -53,17 +53,17 @@ ${name}图形上的文本标签，可用于说明图形的一些数据信息，
#${prefix} formatter(string|Function)
-{{ use: partial-2d-data-label-formatter }}
-{{ elif: ${formatter1d} }}
+{{ use: partial-2d-data-label-formatter }}
+{{ elif:${formatter1d} }}
#${prefix} formatter(string|Function)
-{{ use: partial-1d-data-label-formatter }}
+{{ use: partial-1d-data-label-formatter }}
{{ /if }}
{{ if: !${noTextStyle} }}
-{{ use: partial-text-style(
+{{ use: partial-text-style(
prefix=${prefix},
noAlign=${noAlign},
noVerticalAlign=${noVerticalAlign},
@@ -73,7 +73,7 @@ ${name}图形上的文本标签，可用于说明图形的一些数据信息，
noRich=${noRich},
noBox=${noBox},
enableAutoColor=true
-) }}
+) }}
{{ /if }}
diff --git a/zh/option/partial/mark-line.md b/zh/option/partial/mark-line.md
index e2046c5..2d1f25e 100644
--- a/zh/option/partial/mark-line.md
+++ b/zh/option/partial/mark-line.md
@@ -221,7 +221,7 @@ data: [
起点或终点的坐标。坐标格式视系列的坐标系而定，可以是[直角坐标系](~grid)上的 `x`, `y`，也可以是[极坐标系](~polar)上的 `radius`, `angle`。
-{{ use: marker-coord-explain }}
+{{ use: marker-coord-explain }}
{{ /if }}
diff --git a/zh/option/partial/mark-point.md b/zh/option/partial/mark-point.md
index 08a556c..01e0bfc 100644
--- a/zh/option/partial/mark-point.md
+++ b/zh/option/partial/mark-point.md
@@ -121,7 +121,7 @@ data: [{{ if: ${hasType} }}
标注的坐标。坐标格式视系列的坐标系而定，可以是[直角坐标系](~grid)上的 `x`, `y`，也可以是[极坐标系](~polar)上的 `radius`, `angle`。例如 [121, 2323]、['aa', 998]。
-{{ use: marker-coord-explain }}
+{{ use: marker-coord-explain }}
{{ /if }}
diff --git a/zh/option/partial/rect-layout.md b/zh/option/partial/rect-layout.md
index ba9ad2c..f427d87 100644
--- a/zh/option/partial/rect-layout.md
+++ b/zh/option/partial/rect-layout.md
@@ -2,11 +2,11 @@
{{ target: partial-rect-layout }}
{{ if: !${noZ} }}
-{{ use: partial-z-zlevel(
+{{ use: partial-z-zlevel(
prefix=${prefix},
defaultZLevel=${defaultZLevel},
defaultZ=${defaultZ}
-) }}
+) }}
{{ /if }}
#${prefix|default("#")} left(string|number) = ${defaultLeft|default("'auto'")}
diff --git a/zh/option/partial/selected-mode.md b/zh/option/partial/selected-mode.md
index 4a34cf0..11619a0 100644
--- a/zh/option/partial/selected-mode.md
+++ b/zh/option/partial/selected-mode.md
@@ -4,7 +4,7 @@
## selectedMode(boolean|string) = false
{{ if: ${version} }}
-{{ use: partial-version(version = ${version}) }}
+{{ use: partial-version(version = ${version}) }}
{{ /if }}
<ExampleUIControlEnum options="true,false,single,multiple" />
diff --git a/zh/option/partial/text-style.md b/zh/option/partial/text-style.md
index 7866b7b..4bc6e45 100644
--- a/zh/option/partial/text-style.md
+++ b/zh/option/partial/text-style.md
@@ -104,10 +104,10 @@ label: {
##${prefix} <style_name>(Object)
-{{ use: partial-text-style-base-item(
+{{ use: partial-text-style-base-item(
prefix=${prefix} + '##',
enableAutoColor=${enableAutoColor}
-) }}
+) }}
{{ /if }}
@@ -124,7 +124,7 @@ ${name}文字的颜色。
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} fontStyle(string) = 'normal'
@@ -179,10 +179,10 @@ ${name}文字的字体大小。
+ `'center'`
+ `'right'`
-{{ use: partial-text-style-rich-inherit(
+{{ use: partial-text-style-rich-inherit(
name='align',
value='right'
-) }}
+) }}
{{ /if }}
@@ -199,10 +199,10 @@ ${name}文字的字体大小。
+ `'middle'`
+ `'bottom'`
-{{ use: partial-text-style-rich-inherit(
+{{ use: partial-text-style-rich-inherit(
name='verticalAlign',
value='bottom'
-) }}
+) }}
{{ /if }}
@@ -242,7 +242,7 @@ backgroundColor: {
当使用图片的时候，可以使用 `width` 或 `height` 指定高宽，也可以不指定自适应。
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} borderColor(Color) = 'transparent'
@@ -252,7 +252,7 @@ backgroundColor: {
文字块边框颜色。
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} borderWidth(number) = 0
@@ -330,7 +330,7 @@ backgroundColor: {
文字本身的描边颜色。
{{ if: ${enableAutoColor} }}
-{{ use: partial-text-style-auto-color-desc }}
+{{ use: partial-text-style-auto-color-desc }}
{{ /if }}
#${prefix} textBorderWidth(number) = 0
diff --git a/zh/option/partial/tooltip-common.md b/zh/option/partial/tooltip-common.md
index b4a2c6c..d142b38 100644
--- a/zh/option/partial/tooltip-common.md
+++ b/zh/option/partial/tooltip-common.md
@@ -74,7 +74,7 @@
{{ if: ${scope} === 'series' }}
<br>
> **注意：**`series.tooltip` 仅在 [tooltip.trigger](~tooltip.trigger) 为 `'item'` 时有效。<br>
-{{ elif: ${scope} === 'seriesData' }}
+{{ elif:${scope} === 'seriesData' }}
> **注意：**`series.data.tooltip` 仅在 [tooltip.trigger](~tooltip.trigger) 为 `'item'` 时有效。<br>
{{ /if }}
diff --git a/zh/option/partial/zr-graphic.md b/zh/option/partial/zr-graphic.md
index eefe4ba..9ab4812 100644
--- a/zh/option/partial/zr-graphic.md
+++ b/zh/option/partial/zr-graphic.md
@@ -73,7 +73,7 @@ group 是唯一的可以有子节点的容器。group 可以用来整体定位
关于制定尺寸、拉伸还是平铺，参见 [layout](~${optionPath}.${hostName}${symbolVisit}path.shape.layout)。
-{{ use: partial-graphic-cpt-common-props(
+{{ use: partial-graphic-cpt-common-props(
type='path',
prefix=${prefix},
optionPath=${optionPath},
@@ -81,7 +81,7 @@ group 是唯一的可以有子节点的容器。group 可以用来整体定位
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} shape(Object)
@@ -113,51 +113,51 @@ group 是唯一的可以有子节点的容器。group 可以用来整体定位
+ `'cover'`：PathData 拉伸为矩形的长宽比，完全填满矩形，不会超出矩形。
-{{ use: partial-graphic-cpt-sub-prop-xy(
+{{ use: partial-graphic-cpt-sub-prop-xy(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
-{{ use: partial-graphic-cpt-sub-prop-wh(
+) }}
+{{ use: partial-graphic-cpt-sub-prop-wh(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} style(Object)
-{{ use: partial-graphic-cpt-style-prop-common(
+{{ use: partial-graphic-cpt-style-prop-common(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
-{{ use: partial-graphic-cpt-style-emphasis(
+{{ use: partial-graphic-cpt-style-emphasis(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
-{{ use: partial-graphic-cpt-event-handlers(
+{{ use: partial-graphic-cpt-event-handlers(
prefix=${prefix},
optionPath=${optionPath},
usageType=${usageType},
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
{{ /if }}
@@ -948,7 +948,7 @@ setOption 时指定本次对该图形元素的操作行为。
##${prefix} left(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'h',
prefix=${prefix},
optionPath=${optionPath},
@@ -956,11 +956,11 @@ setOption 时指定本次对该图形元素的操作行为。
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} right(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'h',
prefix=${prefix},
optionPath=${optionPath},
@@ -968,11 +968,11 @@ setOption 时指定本次对该图形元素的操作行为。
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} top(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'v',
prefix=${prefix},
optionPath=${optionPath},
@@ -980,11 +980,11 @@ setOption 时指定本次对该图形元素的操作行为。
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} bottom(number|string) = undefined
-{{ use: partial-graphic-cpt-location-prop-desc-common (
+{{ use: partial-graphic-cpt-location-prop-desc-common (
hv = 'v',
prefix=${prefix},
optionPath=${optionPath},
@@ -992,7 +992,7 @@ setOption 时指定本次对该图形元素的操作行为。
hostName=${hostName},
symbolVisit=${symbolVisit},
symbolDeclare=${symbolDeclare}
-) }}
+) }}
##${prefix} bounding(strin) = 'all'
@@ -1061,7 +1061,7 @@ chart.on('click', function (params) {
{{ if: ${usageType} === 'graphicComponent' }}
-{{ use: partial-cursor(prefix="##") }}
+{{ use: partial-cursor(prefix="##") }}
##${prefix} draggable(boolean) = false
diff --git a/zh/option/series/bar.md b/zh/option/series/bar.md
index 7465b31..2a2b353 100644
--- a/zh/option/series/bar.md
+++ b/zh/option/series/bar.md
@@ -301,7 +301,7 @@ option = {
#${prefix} label(Object)
{{ if: ${topLevel} }}
-{{ use: partial-label-desc }}
+{{ use: partial-label-desc }}
{{ else }}
单个数据的文本配置。
{{ /if }}
@@ -315,7 +315,7 @@ option = {
#${prefix} itemStyle(Object)
{{ if: ${topLevel} }}
-{{ use: partial-item-style-desc }}
+{{ use: partial-item-style-desc }}
{{ else }}
单个数据的图形样式设置。
{{ /if }}
diff --git a/zh/option/series/funnel.md b/zh/option/series/funnel.md
index a4d978e..152da6a 100644
--- a/zh/option/series/funnel.md
+++ b/zh/option/series/funnel.md
@@ -326,12 +326,12 @@ option = {
#${prefix} formatter(string|Function)
-{{ use: partial-1d-data-label-formatter(extra = {
+{{ use: partial-1d-data-label-formatter(extra = {
percent: {
desc: '百分比',
type: 'number'
}
-}) }}
+}) }}
{{ /if }}
{{ use: partial-text-style(
diff --git a/zh/option/series/pie.md b/zh/option/series/pie.md
index ee0a0f1..631a869 100644
--- a/zh/option/series/pie.md
+++ b/zh/option/series/pie.md
@@ -392,12 +392,12 @@ const option = {
#${prefix} formatter(string|Function)
-{{ use: partial-1d-data-label-formatter(extra = {
+{{ use: partial-1d-data-label-formatter(extra = {
percent: {
desc: '百分比',
type: 'number'
}
-}) }}
+}) }}
{{ /if }}
#${prefix} rotate(boolean|number) = null
diff --git a/zh/option/series/treemap.md b/zh/option/series/treemap.md
index 2eaa721..44874ac 100644
--- a/zh/option/series/treemap.md
+++ b/zh/option/series/treemap.md
@@ -581,8 +581,8 @@ treemap 默认把第一个维度（Array 第一项）映射到『面积』上。
表示同一层级的节点的 颜色 选取列表（选择规则见 [colorMappingBy](~series-treemap.colorMappingBy)）。默认为空时，选取系统color列表。
-{{ use: partial-treemap-visual-detial }}
-{{ use: partial-treemap-prop-location-desc(name="color") }}
+{{ use: partial-treemap-visual-detial }}
+{{ use: partial-treemap-prop-location-desc(name="color") }}
{{ /if }}
@@ -826,11 +826,11 @@ treemap 默认把第一个维度（Array 第一项）映射到『面积』上。
如果设置此属性，则 `borderColor` 的设置无效，而是：取当前节点计算出的颜色（比如从父节点遗传而来），在此颜色值上设置 `borderColorSaturation` 得到最终颜色。这种方式，能够做出『不同区块有不同色调的矩形间隔线』的效果，能够便于区分层级。
<br>
-{{ use: partial-treemap-borderColor-setting(galleryEditorPath=${galleryEditorPath}) }}
+{{ use: partial-treemap-borderColor-setting(galleryEditorPath=${galleryEditorPath}) }}
-{{ use: partial-style-shadow-opacity(
+{{ use: partial-style-shadow-opacity(
prefix=${prefix}
-) }}
+) }}
{{ /if }}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org