Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
plainheart committed Sep 19, 2023
2 parents 8efd12f + 95b341a commit fab1f6a
Show file tree
Hide file tree
Showing 71 changed files with 243 additions and 153 deletions.
6 changes: 3 additions & 3 deletions editor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions en/api/action.md
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,10 @@ myChart.dispatchAction({
// If "areas" is empty, all of the select-boxes will be deleted.
{ // The first area.

// Indicate that this area is a "coodinate system area", belonging
// Indicate that this area is a "coordinate system area", belonging
// to a geo coordinate system with getIndex: 0.
// We can also use xAxisIndex or yAxisIndex to indicate that
// this area belongs to a catesian coodinate system.
// this area belongs to a catesian coordinate system.
// If no coordinate system is specified, this area is a
// "global area", which does not belong to any coordinate system.
// If an area belongs to a coordinate system, this area moves
Expand Down
2 changes: 1 addition & 1 deletion en/api/echarts-instance.md
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ Resizes chart, which should be called manually when container size changes.

**Tip:**

Sometimes charts may be placed in multiple tabs. Those in hidden labels may fail to initialize due to the ignorance of container width and height. So `resize` should be called manually to get the correct width and height when switching to the corresponding tabs, or specify width/heigth in `opts` explicitly.
Sometimes charts may be placed in multiple tabs. Those in hidden labels may fail to initialize due to the ignorance of container width and height. So `resize` should be called manually to get the correct width and height when switching to the corresponding tabs, or specify width/height in `opts` explicitly.

## renderToSVGString(Function)

Expand Down
2 changes: 1 addition & 1 deletion en/api/echarts.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ echarts.use(
);
```

See [Use ECharts with bundler and NPM](${handbookPath}basics/import) for more detailed explaination.
See [Use ECharts with bundler and NPM](${handbookPath}basics/import) for more detailed explanation.

## registerMap(Function)

Expand Down
22 changes: 22 additions & 0 deletions en/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## v5.4.3
<div class="time">2023-07-18</div>

+ [Feature] [axisPointer] Add `triggerEmphasis` option to disable emphasis. [#18524](https://github.com/apache/echarts/issues/18524) ([juliepagano](https://github.com/juliepagano))
+ [Feature] [sankey] Support `trajectory` for emphasis state. [#17451](https://github.com/apache/echarts/issues/17451) ([ElayGelbart](https://github.com/ElayGelbart))
+ [Fix] [sankey] Fix sankey line color `'target'/'source'/'gradient'` doesn't work in non-normal state. [#18834](https://github.com/apache/echarts/issues/18834) ([linghaoSu](https://github.com/linghaoSu))
+ [Fix] [sankey] Fix `value` is undefined in label/edgeLabel formatter. [#18733](https://github.com/apache/echarts/issues/18733) ([plainheart](https://github.com/plainheart))
+ [Fix] [sunburst] Fix sunburst label may rotate when `labelLayout.hideOverlap` is enabled. [#18808](https://github.com/apache/echarts/issues/18808) ([linghaoSu](https://github.com/linghaoSu))
+ [Fix] [graph] Fix graph chart can't be hidden by legend due to edgeLabel NPE. [#18624](https://github.com/apache/echarts/issues/18624) ([plainheart](https://github.com/plainheart))
+ [Fix] [state] Fix focus self doesn't work when item emphasis by other component. [#18511](https://github.com/apache/echarts/issues/18511) ([linghaoSu](https://github.com/linghaoSu))
+ [Fix] [axis] Fix last tick doesn't show for single data. [#18469](https://github.com/apache/echarts/issues/18469) ([Ovilia](https://github.com/Ovilia))
+ [Fix] [pie] Fix incorrect response area of pie piece when `selectedOffset` is enabled and `animation` is disabled. [#1011](https://github.com/ecomfe/zrender/pull/1011) ([plainheart](https://github.com/plainheart))
+ [Fix] [custom] Fix user-defined `info` property was not available in the event handler. [#18400](https://github.com/apache/echarts/issues/18400) ([sobolewsk](https://github.com/sobolewsk))
+ [Fix] [legend] Inherit legend rich text color from legend's options. [#18260](https://github.com/apache/echarts/issues/18260) ([ChepteaCatalin](https://github.com/ChepteaCatalin))
+ [Fix] [label] Fix `ellipsis` was not working. [#18525](https://github.com/apache/echarts/issues/18525) ([Ovilia](https://github.com/Ovilia))
+ [Fix] [label] Fix `endLabel` fails with null data. [#18841](https://github.com/apache/echarts/issues/18841) ([Ovilia](https://github.com/Ovilia))
+ [Fix] [util] Fix `{yy}` pattern has no zero padding in time format util. [#18535](https://github.com/apache/echarts/issues/18535) ([linghaoSu](https://github.com/linghaoSu))
+ [Fix] [api] Only deprecate `disConnect` but not `disconnect`. [#18758](https://github.com/apache/echarts/issues/18758) ([Justineo](https://github.com/Justineo))
+ [Fix] [i18n] Fix the abbr of "March" for the DE language ("Mar" -> "Mrz"). [#18387](https://github.com/apache/echarts/issues/18387) ([Stebeber](https://github.com/Stebeber))
+ [Fix] [type] Fix wrong type for data item value of the `parallel` series. [#18425](https://github.com/apache/echarts/issues/18425) ([ManishDait](https://github.com/ManishDait))
+ [Fix] [type] Allow passing `null` to the parameters of `init` function. [#18575](https://github.com/apache/echarts/issues/18575) ([zhuscat](https://github.com/zhuscat))

## v5.4.2
<div class="time">2023-03-23</div>

Expand Down
2 changes: 1 addition & 1 deletion en/option-gl/component/axis3D-common.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ formatter: function (value, index) {
var date = new Date(value);
var texts = [(date.getMonth() + 1), date.getDate()];
if (index === 0) {
texts.unshift(date.getYear());
texts.unshift(date.getFullYear());
}
return texts.join('/');
}
Expand Down
2 changes: 1 addition & 1 deletion en/option-gl/series/bar3D.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ The label setting of a single data item.
) }}

### emphasis(Object)
Configure labels and styles for a sigle data item highlighting.
Configure labels and styles for a single data item highlighting.

#### itemStyle(Object)
{{ use: partial-item-style(
Expand Down
14 changes: 11 additions & 3 deletions en/option/component/axis-common.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ Settings related to axis line.

Set this to `false` to prevent the axis line from showing.

{{ if: ${componentType} == 'xAxis' || ${componentType} == 'yAxis' }}
> The **value** axis doesn't show the axis line by default since `v5.0.0`, you need to explicitly set `axisLine.show` as `true` to enable it.
{{ /if }}

{{ if: ${componentType} == 'xAxis' || ${componentType} == 'yAxis' }}
##${prefix} onZero(boolean) = true

Expand All @@ -44,7 +48,7 @@ Specifies whether X or Y axis lies on the other's origin position, where value i

##${prefix} onZeroAxisIndex(number)

When mutiple axes exists, this option can be used to specify which axis can be "onZero" to.
When multiple axes exists, this option can be used to specify which axis can be "onZero" to.
{{ /if }}

##${prefix} symbol(string|Array) = 'none'
Expand Down Expand Up @@ -194,6 +198,10 @@ Settings related to axis tick.

Set this to `false` to prevent the axis tick from showing.

{{ if: ${componentType} == 'xAxis' || ${componentType} == 'yAxis' }}
> The **value** axis doesn't show the axis ticks by default since `v5.0.0`, you need to explicitly set `axisTick.show` as `true` to enable it.
{{ /if }}

{{ if: ${hasAlignWithLabel|default(true)} }}
##${prefix} alignWithLabel(boolean) = false

Expand Down Expand Up @@ -527,7 +535,7 @@ boundaryGap: ['20%', '20%']

<ExampleUIControlNumber />

The minimun value of axis.
The minimum value of axis.

It can be set to a special value `'dataMin'` so that the minimum value on this axis is set to be the minimum label.

Expand Down Expand Up @@ -813,7 +821,7 @@ formatter: function (value, index) {
var date = new Date(value);
var texts = [(date.getMonth() + 1), date.getDate()];
if (index === 0) {
texts.unshift(date.getYear());
texts.unshift(date.getFullYear());
}
return texts.join('/');
}
Expand Down
4 changes: 2 additions & 2 deletions en/option/component/axisPointer.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ axisPointers can be linked to each other. The term "link" represents that axes a

See [sampleA](${galleryViewPath}candlestick-brush&edit=1&reset=1) and [sampleB](${galleryViewPath}scatter-nutrients-matrix&edit=1&reset=1).

link is an array, where each item represents a "link group". Axes will be linked when they are refered in the same link group. For example:
link is an array, where each item represents a "link group". Axes will be linked when they are referred in the same link group. For example:

```ts
link: [
Expand All @@ -44,7 +44,7 @@ link: [
]
```

As illustrated above, axes can be refered in these approaches in a link group:
As illustrated above, axes can be referred in these approaches in a link group:

```ts
{
Expand Down
4 changes: 2 additions & 2 deletions en/option/component/brush.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The following types of brushes are supported: `rect`, `polygon`, `lineX`, `lineY

**Control select-box with API**

`dispatchAction` can be used to render select-box programatically. For example:
`dispatchAction` can be used to render select-box programmatically. For example:

```javascript
myChart.dispatchAction({
Expand Down Expand Up @@ -282,7 +282,7 @@ Links interaction between selected items in different series.

Following is an example of enabling selected effect for `scatter` and `parallel` charts once a scatter chart is selected.

`brushLink` is an array of `seriesIndex`es, which assignes the series that can be interacted. For example, it can be:
`brushLink` is an array of `seriesIndex`es, which assigns the series that can be interacted. For example, it can be:

+ `[3, 4, 5]` for interacting series with seriesIndex as `3`, `4`, or `5`;
+ `'all'` for interacting all series;
Expand Down
16 changes: 11 additions & 5 deletions en/option/component/data-zoom-slider.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,17 @@ Area style of selected data shadow.

The color to fill selected area.

## borderColor(Color) = '#ddd'
## borderColor(Color) = '#d2dbee'

<ExampleUIControlColor default="#ddd" />
<ExampleUIControlColor default="#d2dbee" />

The color of border.

{{ use: partial-border-radius(
prefix = "#",
defaultBorderRadius = 3
) }}

## handleIcon(string)

<ExampleUIControlIcon />
Expand Down Expand Up @@ -154,7 +159,8 @@ Style of move handle.

{{ use: partial-item-style(
prefix = "##",
defaultColor = "#D2DBEE"
defaultColor = "#D2DBEE",
defaultOpacity = 0.7
) }}

## labelPrecision(number|string) = 'auto'
Expand Down Expand Up @@ -223,15 +229,15 @@ Whether to update view while dragging. If it is set as `false`, the view will be

Width of dataZoom-slider component. Default to 30 when vertical, adaptive when horizontal.

Has higer priority than `left` and `right`.
Has higher priority than `left` and `right`.

## height(string|number)

<ExampleUIControlNumber default="30"/>

Height of dataZoom-slider component. Default to 30 when horizontal, adaptive when vertical.

Has higer priority than `top` and `bottom`.
Has higher priority than `top` and `bottom`.

## brushSelect(boolean) = true

Expand Down
12 changes: 6 additions & 6 deletions en/option/component/data-zoom.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

These types of `dataZoom` component are supported:

+ [dataZoomInside](~dataZoom-inside): Data zoom functionalities is embeded inside coordinate systems, enable user to zoom or roam coordinate system by mouse dragging, mouse move or finger touch (in touch screen).
+ [dataZoomInside](~dataZoom-inside): Data zoom functionalities is embedded inside coordinate systems, enable user to zoom or roam coordinate system by mouse dragging, mouse move or finger touch (in touch screen).

+ [dataZoomSlider](~dataZoom-slider): A special slider bar is provided, on which coordinate systems can be zoomed or roamed by mouse dragging or finger touch (in touch screen).

Expand Down Expand Up @@ -35,7 +35,7 @@ A single chart instance can contain several `dataZoom` components, each of which
---


**✦ How dataZoom componets operates axes and data ✦**
**✦ How dataZoom components operates axes and data ✦**

{{ use: partial-data-zoom-filterMode() }}

Expand Down Expand Up @@ -64,7 +64,7 @@ option = {
type: 'slider',
xAxisIndex: [0],
filterMode: 'filter', // Set as 'filter' so that the modification
// of window of xAxis willl effect the
// of window of xAxis will effect the
// window of yAxis.
start: 30,
end: 70
Expand Down Expand Up @@ -292,7 +292,7 @@ Valid values:

Specify whether to lock the size of window (selected area).

When set as `true`, the size of window is locked, that is, only the translation (by mouse drag or touch drag) is avialable but zoom is not.
When set as `true`, the size of window is locked, that is, only the translation (by mouse drag or touch drag) is available but zoom is not.

## throttle(number) = 100

Expand Down Expand Up @@ -340,7 +340,7 @@ Possible values:

+ 'none': Do not filter data.

How to set `filterMode` is up to users, depending on the requirments and scenarios. Expirically:
How to set `filterMode` is up to users, depending on the requirements and scenarios. Expirically:

+ If only `xAxis` or only `yAxis` is controlled by `dataZoom`, `filterMode: 'filter'` is typically used, which enable the other axis auto adapte its window to the extent of the filtered data.

Expand Down Expand Up @@ -374,7 +374,7 @@ option = {
type: 'bar',
data: [
// The first column corresponds to xAxis,
// and the second coloum corresponds to yAxis.
// and the second column corresponds to yAxis.
[12, 24, 36],
[90, 80, 70],
[3, 9, 27],
Expand Down
4 changes: 2 additions & 2 deletions en/option/component/graphic.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Different types of graphic elements has their own configuration respectively, bu
$action: 'replace',

// These four properties is used to locating the element. Each property can be absolute
// value (like 10, means 10 pixel) or precent (like '12%') or 'center'/'middle'.
// value (like 10, means 10 pixel) or percent (like '12%') or 'center'/'middle'.
left: 10,
// right: 10,
top: 'center',
Expand Down Expand Up @@ -168,7 +168,7 @@ Only `group` element has children, which enable a group of elements to be positi

**Shape Configuration of Graphic Element**

Elements with different types have different shape setting repectively. For example:
Elements with different types have different shape setting respectively. For example:

```javascript
{
Expand Down
4 changes: 2 additions & 2 deletions en/option/component/radar.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The formatter of indicator's name, in which the string and callback function are
```ts
// using string template, the template variable should be the indicator's name {value}
formatter: '【{value}】'
// using callback function, the first parameter is the indicator's name, and the second parameter id the indicator's cinfiguration item
// using callback function, the first parameter is the indicator's name, and the second parameter id the indicator's configuration item
formatter: function (value, indicator) {
return '' + value + '';
}
Expand Down Expand Up @@ -139,5 +139,5 @@ The minimum value of indicator. It it an optional configuration, with default va

<ExampleUIControlColor />

Specfy a color of the indicator.
Specify a color of the indicator.

2 changes: 1 addition & 1 deletion en/option/component/toolbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ the different types of icon path , which could be configurated individually.

#### title(Object)

Title for different types, can be configured seperately.
Title for different types, can be configured separately.

##### line(string) = 'Switch to Line Chart'

Expand Down
4 changes: 2 additions & 2 deletions en/option/component/tooltip.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ Conditions to order tooltip. Options:

+ `'valueAsc'`

Base on value, ascending order tooltip, only for numberic value.
Base on value, ascending order tooltip, only for numeric value.

+ `'valueDesc'`

Base on value, descending order tooltip, only for numberic value.
Base on value, descending order tooltip, only for numeric value.
2 changes: 1 addition & 1 deletion en/option/component/visual-map-continuous.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ The distance between the ends of the main bar and the label, with unit px. See [

the formatter tool for label.

+ If it was set as a `string`, it refers to a template, for instance: `aaaa{value}bbbb`, where `{value}` represents the value of the edge of the seleted range.
+ If it was set as a `string`, it refers to a template, for instance: `aaaa{value}bbbb`, where `{value}` represents the value of the edge of the selected range.

+ If it was set as a `Function`, it refers to a callback function, for instance:

Expand Down
4 changes: 2 additions & 2 deletions en/option/component/visual-map-piecewise.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ If you just have a try, you'll know it is not so complicated.

The decimal precision of label, defaults to be 0 (no decimals).

+ In **CONTINUOUS-AVERAGE** mode (i.e., [visualMap-piecewise.splitNumber](~visualMap-piecewise.splitNumber) is used), the rule of data layout is the same as [visualMap-continuous.inverse](~visualMap-continuous.inverse), decimal percision auto adapts to series.data.
+ In **CONTINUOUS-AVERAGE** mode (i.e., [visualMap-piecewise.splitNumber](~visualMap-piecewise.splitNumber) is used), the rule of data layout is the same as [visualMap-continuous.inverse](~visualMap-continuous.inverse), decimal precision auto adapts to series.data.

+ In **CONTINUOUS-CUSTOMIZED** mode (i.e., [visualMap-piecewise.pieces](~visualMap-piecewise.pieces) is used) or **CATEGORY** mode (i.e., [visualMap-piecewise.categories](~visualMap-piecewise.categories) is used), decimal percision defaults to be 0 (no decimals):
+ In **CONTINUOUS-CUSTOMIZED** mode (i.e., [visualMap-piecewise.pieces](~visualMap-piecewise.pieces) is used) or **CATEGORY** mode (i.e., [visualMap-piecewise.categories](~visualMap-piecewise.categories) is used), decimal precision defaults to be 0 (no decimals):

## itemWidth(number) = 20

Expand Down
Loading

0 comments on commit fab1f6a

Please sign in to comment.