feat(funnel): add funnel new styles and props

en/option/component/x-axis.md

@@ -59,3 +59,4 @@ Notice: Set `xAxis.axisLine.onZero` to `false` to activate this option.
     componentName = "x axis",
     defaultZ = 0
 ) }}
+

en/option/component/y-axis.md

@@ -59,3 +59,4 @@ Notice: Set `yAxis.axisLine.onZero` to `false` to activate this option.
     componentName = "y axis",
     defaultZ = 0
 ) }}
+

en/option/partial/emphasis-common.md

@@ -45,6 +45,7 @@ When the data is highlighted, whether to fade out of other data to focus the hig
 + `'ancestor'` Focus on all ancestor nodes.
 + `'descendant'` Focus on all descendants nodes.
 {{ /if }}
+
 {{ if: ${hasRelative} }}
 + `'relative'` Focus on all ancestor and descendants nodes. (Since `v${version}`)
 {{ /if }}

en/option/partial/sector-border-radius.md

@@ -1,3 +1,4 @@
+
 {{ target: partial-sector-border-radius }}
 
 #${prefix} borderRadius(number|string|Array)
@@ -27,4 +28,5 @@ Since `v5.3.0`:
 + `borderRadius: '20%'`: means that both inner corner radius is `20%` of the inner radius and outer corner radius is `20%` of the outer radius.
 + `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 difference between the inner sector and the outer sector, and the outer corner radius is `50%` of the difference.
-+ `borderRadius: [5, 10, 15, 20]`: means the two inner corner radii are `5px` and `10px`, and the two outer corner radii are `15px` and `20px`.
++ `borderRadius: [5, 10, 15, 20]`: means the two inner corner radii are `5px` and `10px`, and the two outer corner radii are `15px` and `20px`.
+

en/option/partial/selected-mode.md

@@ -16,3 +16,4 @@ Selected mode. It is enabled by default, and you may set it to be `false` to dis
 Besides, it can be set to `'single'`, `'multiple'` or `'series'`, for single selection, multiple selections and whole series selection.
 
 > `'series'` is supported since v5.3.0
+

en/option/partial/zr-graphic.md

@@ -1548,6 +1548,7 @@ Whether use progressive render to improve performance. Usually used when number
 {{ /if }}
 
 
+
 {{ target: partial-graphic-cpt-style-prop-common }}
 
 More attributes in `style` (for example, [rich text](tutorial.html#Rich%20Text)), see the `style` related attributes in [zrender/graphic/Displayable](https://ecomfe.github.io/zrender-doc/public/api.html#zrenderdisplayable).

en/option/series/bar.md

@@ -445,3 +445,4 @@ Border type. Can be `'dashed'`, `'dotted'`.
     prefix = '#' + ${prefix}
 ) }}
 {{ /if }}
+

en/option/series/funnel.md

@@ -24,27 +24,27 @@
 
 <ExampleUIControlNumber default="0" step="1" />
 
-The specified minimum value.
+The specified minimum value. Invalid if dynamicHeight is `true`.
 
 ## max(number) = 100
 
 <ExampleUIControlNumber default="100" step="1" />
 
-The specified maximum value.
+The specified maximum value. Invalid if dynamicHeight is `true`.
 
 ## minSize(number|string) = '0%'
 
 <ExampleUIControlPercent default="0%" />
 
-The mapped width from minimum data value [min](~series-funnel.min).
+The mapped width from minimum data value [min](~series-funnel.min). Invalid if dynamicHeight is `true`.
 
 It can be absolute pixel and also the percentage of [layout width](~series-funnel.width). If you don't want the graph of minimum value to be a triangle, you can set up this property larger than 0.
 
 ## maxSize(number|string) = '100%'
 
 <ExampleUIControlPercent default="100%" />
 
-The mapped width from maximum data value [max](~series-funnel.max).
+The mapped width from maximum data value [max](~series-funnel.max). Invalid if dynamicHeight is `true`.
 
 It can be absolute pixel and also the percentage of [layout width](~series-funnel.width).
 
@@ -64,6 +64,18 @@ Orient of funnel，Can be `'vertical'` or `'horizontal'`.
 
 Data sorting, which can be whether `'ascending'`, `'descending'`, `'none'`(in data order) or a function, which is the same as `Array.prototype.sort(function (a, b) { ... })`;
 
+## exitShape(string) = 'none'
+
+<ExampleUIControlEnum options="none,rect" default="none" />
+
+Funnel exit shape, set it `'rect'` to flatten the top.
+
+## dynamicHeight(boolean) = 'false'
+
+<ExampleUIControlEnum options="true,false" default="false" />
+
+Set to `true` so that the height of each funnel block in the funnel plot is proportional to the corresponding value in the dataset.
+
 ## gap(number) = 0
 
 <ExampleUIControlNumber default="0" min="0" step="0.5" />

en/option/series/gauge.md

@@ -591,3 +591,4 @@ formatter: function (value) {
     return value.toFixed(0);
 }
 ```
+

en/option/series/graph.md

@@ -699,3 +699,4 @@ Label position, options：
     prefix = "####",
     defaultShow = true
 ) }}
+

en/option/series/line.md

@@ -491,3 +491,4 @@ Select state of specified single data.
     prefix = "####",
     hasInherit = ${state} === 'emphasis'
 ) }}
+

en/option/series/map.md

@@ -221,3 +221,4 @@ The color of the map area.
 {{ use: partial-label-line(
     prefix = '####'
 ) }}
+

en/option/series/sunburst.md

@@ -106,6 +106,7 @@ You can specify the style of all sectors with [series.itemStyle](~series-sunburs
 ) }}
 
 
+
 {{ target: partial-sunburst-state }}
 
 {{ use: partial-sunburst-label-props(

en/option/series/tree.md

@@ -472,3 +472,4 @@ Defines the style of the tree edge.
     prefix = ${prefix},
     state = ${state}
 ) }}
+

zh/option/component/x-axis.md

@@ -96,3 +96,4 @@ X 轴相对于默认位置的偏移，在相同的 `position` 上有多个 X 轴
     componentName = "X 轴",
     defaultZ = 0
 ) }}
+

zh/option/component/y-axis.md

@@ -142,3 +142,4 @@ Y 轴相对于默认位置的偏移，在相同的 `position` 上有多个 Y 轴
     componentName = "Y 轴",
     defaultZ = 0
 ) }}
+

zh/option/partial/axisPointer-common.md

@@ -68,7 +68,6 @@ axisPointer 的 label 默认不显示（也就是默认只显示指示线），
 
 
 
-
 {{ target: partial-axisPointer-common }}
 
 #${prefix} show(boolean) = false

zh/option/partial/emphasis-common.md

@@ -45,6 +45,7 @@
 + `'ancestor'` 聚焦所有祖先节点
 + `'descendant'` 聚焦所有子孙节点
 {{ /if }}
+
 {{ if: ${hasRelative} }}
 + `'relative'` 聚焦所有子孙和祖先节点（从 `v${version}`开始支持）
 {{ /if }}

zh/option/partial/sector-border-radius.md

@@ -1,3 +1,4 @@
+
 {{ target: partial-sector-border-radius }}
 
 #${prefix} borderRadius(number|string|Array)

zh/option/partial/zr-graphic.md

@@ -1165,7 +1165,6 @@ Transform 相关的属性：`'x'`、 `'y'`、`'scaleX'`、`'scaleY'`、`'rotatio
     prefix = ${prefix}
 ) }}
 
-
 ##${prefix} updateAnimation(Object)
 
 更新属性的动画配置。
@@ -1251,7 +1250,6 @@ interface Keyframe {
 是否开启形变动画。
 
 开启 [universalTransition](~series-custom.universalTransition) 后如果前后两次更新图形类型不一样，比如从`rect`变为了`circle`，会通过形变动画过渡。如果想要关闭可以设置该属性为`false`。
-
 {{ /if }}
 
 {{ if: ${usageType} === 'graphicComponent' }}
@@ -1530,6 +1528,7 @@ Position of `textContent`.
 {{ /if }}
 
 
+
 {{ target: partial-graphic-cpt-style-prop-common }}
 
 注：关于图形元素中更多的样式设置（例如 [富文本标签](tutorial.html#%E5%AF%8C%E6%96%87%E6%9C%AC%E6%A0%87%E7%AD%BE)），参见 [zrender/graphic/Displayable](https://ecomfe.github.io/zrender-doc/public/api.html#zrenderdisplayable) 中的 style 相关属性。
@@ -1654,6 +1653,8 @@ Position of `textContent`.
 }
 ```
 
+
+
 {{ target: partial-graphic-cpt-animation }}
 
 ###${prefix} duration(number)
@@ -1668,6 +1669,8 @@ Position of `textContent`.
 
 动画延迟时长，单位 ms
 
+
+
 {{ target: partial-graphic-cpt-sub-prop-xy }}
 
 ###${prefix} x(number) = 0
@@ -1830,6 +1833,7 @@ Position of `textContent`.
 元素旋转和缩放原点的 y 像素位置。
 
 
+
 {{ target: partial-graphic-cpt-focus-blur }}
 
 ##${prefix} focus(string) = 'none'

zh/option/series/bar.md

@@ -513,3 +513,4 @@ option = {
     prefix = '#' + ${prefix}
 ) }}
 {{ /if }}
+

zh/option/series/funnel.md

@@ -46,27 +46,27 @@ option = {
 
 <ExampleUIControlNumber default="0" step="1" />
 
-指定的数据最小值。
+指定的数据最小值。dynamicHeight为`true`时无效。
 
 ## max(number) = 100
 
 <ExampleUIControlNumber default="100" step="1" />
 
-指定的数据最大值。
+指定的数据最大值。dynamicHeight为`true`时无效。
 
 ## minSize(number|string) = '0%'
 
 <ExampleUIControlPercent default="0%" />
 
-数据最小值 [min](~series-funnel.min) 映射的宽度。
+数据最小值 [min](~series-funnel.min) 映射的宽度。dynamicHeight为`true`时无效。
 
 可以是绝对的像素大小，也可以是相对[布局宽度](~series-funnel.width)的百分比，如果需要最小值的图形并不是尖端三角，可通过设置该属性实现。
 
 ## maxSize(number|string) = '100%'
 
 <ExampleUIControlPercent default="100%" />
 
-数据最大值 [max](~series-funnel.max) 映射的宽度。
+数据最大值 [max](~series-funnel.max) 映射的宽度。dynamicHeight为`true`时无效。
 
 可以是绝对的像素大小，也可以是相对[布局宽度](~series-funnel.width)的百分比。
 
@@ -86,6 +86,18 @@ option = {
 
 数据排序， 可以取 `'ascending'`，`'descending'`，`'none'`（表示按 data 顺序），或者一个函数（即 `Array.prototype.sort(function (a, b) { ... })`）。
 
+## exitShape(string) = 'none'
+
+<ExampleUIControlEnum options="none,rect" default="none" />
+
+漏斗出口形状, 设为 `'rect'` 来展平顶部。
+
+## dynamicHeight(boolean) = 'false'
+
+<ExampleUIControlEnum options="true,false" default="false" />
+
+设置为`true`使得漏斗图每个漏斗块的高度和数据集对应数值成正比。
+
 ## gap(number) = 0
 
 <ExampleUIControlNumber default="0" min="0" step="0.5" />

zh/option/series/gauge.md

@@ -604,3 +604,4 @@ formatter: function (value) {
     return value.toFixed(0);
 }
 ```
+

zh/option/series/graph.md

@@ -707,3 +707,4 @@ links: [{
     prefix = "####",
     defaultShow = true
 ) }}
+

zh/option/series/line.md

@@ -520,3 +520,4 @@ const option = {
     prefix = "####",
     hasInherit = ${state} === 'emphasis'
 ) }}
+

zh/option/series/map.md

@@ -218,3 +218,4 @@ center: [115.97, '30%']
 {{ use: partial-label-line(
     prefix = '####'
 ) }}
+

zh/option/series/sunburst.md

@@ -102,6 +102,7 @@
 ) }}
 
 
+
 {{ target: partial-sunburst-state }}
 
 {{ use: partial-sunburst-label-props(

zh/option/series/tree.md

@@ -92,7 +92,6 @@ center: [115.97, '30%']
 
 当前视角的缩放比例。
 
-
 ## layout(string) = 'orthogonal'
 
 <ExampleUIControlEnum options="orthogonal,radial" default="orthogonal" />
@@ -515,3 +514,4 @@ center: [115.97, '30%']
     prefix = ${prefix},
     state = ${state}
 ) }}
+