Merge branch 'master' into dev

apache · Nov 7, 2024 · 18010cb · 18010cb
2 parents f47d90a + 989252d
commit 18010cb
Show file tree

Hide file tree

Showing 19 changed files with 171 additions and 194 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -23,3 +23,8 @@ github:
     - apache
     - doc
     - documentation
+
+notifications:
+  commits: [email protected]
+  pullrequests: [email protected]
+  issues: [email protected]
diff --git a/editor/package-lock.json b/editor/package-lock.json
diff --git a/en/api/action.md b/en/api/action.md
@@ -294,7 +294,7 @@ dispatchAction({
 
 ### takeGlobalCursor(Action)
 
-Activate or inactivate `dataZoom` buttom in `toolbox`.
+Activate or inactivate `dataZoom` button in `toolbox`.
 
 ```ts
 myChart.dispatchAction({
@@ -474,7 +474,7 @@ The parameters are the same as [action brush](~action.brush.brush).
 ### takeGlobalCursor
 
 The switch of the brush. This action can make the mouse enabled/disabled to brush.
-In fact, the brush buttons in [toolbox](option.html#toolbox.feature.brush) just use this aciton.
+In fact, the brush buttons in [toolbox](option.html#toolbox.feature.brush) just use this action.
 
 This event corresponding to this action is [globalCursorTaken](~events.globalCursorTaken).
 

diff --git a/en/api/echarts-instance.md b/en/api/echarts-instance.md
@@ -538,7 +538,6 @@ In cartesian (see [grid](option.html#grid)), convert a point to pixel coordinate
 // xAxis-yAxis constitudes a cartesian.
 // Perform conversion in the cartesian consist of the third xAxis and the yAxis with id 'y1'.
 chart.convertToPixel({xAxisIndex: 2, yAxisId: 'y1'}, [300, 900]);
-// 使用 id 为 'g1' 的 grid 的第一个 cartesian 进行转换：
 // Perform conversion in the first cartesian of the grid with id 'g1'.
 chart.convertToPixel({gridId: 'g1'}, [300, 900]);
 ```

diff --git a/en/changelog.md b/en/changelog.md
@@ -1044,7 +1044,7 @@ Fix the line label can not be returned to its original opacity after `"focusNode
 
 + [Fix] Fix if some negetive numbers or strings existing in the dimensions array, the corresponding line will not show. Fix #10343.
 
-+ [Fix] Fix when `'0'` existing in dimentions the chart do not work. Make backward compat when dimention is a number-like string. Fix #9363, contributed by PR #9388.
++ [Fix] Fix when `'0'` existing in dimensions the chart do not work. Make backward compat when dimension is a number-like string. Fix #9363, contributed by PR #9388.
 
 + [Fix] Fix hover style on `textStroke` bug in custom series.
 
@@ -1859,7 +1859,7 @@ Recovery Build
 
 + [^] fix `the bug that update data can not be shown in `setOption` after emptying line chart data in v3.1.1.
 
-+ [^] fix possiblity of reporting `id duplicates` error in `setOption(chart.getOption())` . Fix [#2635](https://github.com/apache/incubator-echarts/issues/2635)
++ [^] fix possibility of reporting `id duplicates` error in `setOption(chart.getOption())` . Fix [#2635](https://github.com/apache/incubator-echarts/issues/2635)
 
 + [^] allow to customize toolbox toobar. See details in [toolbox.feature](https://ecomfe.github.io/echarts-doc/public/en/option.html#toolbox.feature)
 

diff --git a/en/option-gl/component/globe.md b/en/option-gl/component/globe.md
@@ -24,7 +24,7 @@ The outer radius of the globe. This area between `globeRadius` and `globeOuterRa
 
 {{ use: partial-environment(
     componentType="globe",
-    componentName="地球"
+    componentName="globe"
 ) }}
 
 {{ use: partial-environment }}
@@ -101,39 +101,39 @@ The following two images show the effects of different `displacementQuality`.
 
 {{ use: partial-shading-globe(
     componentType="globe",
-    componentName="地球"
+    componentName="globe"
 ) }}
 
 {{ use: partial-light-globe(
     componentType="globe",
-    componentName="地球"
+    componentName="globe"
 ) }}
 
 {{ use: partial-atmosphere(
     componentType="globe",
-    componentName="地球"
+    componentName="globe"
 ) }}
 
 {{ use: partial-post-effect(
     componentType="globe",
-    componentName="地球"
+    componentName="globe"
 ) }}
 
 {{ use: partial-temporal-super-sampling(
     componentType="globe",
-    componentName="地球"
+    componentName="globe"
 ) }}
 
 {{ use: partial-view-control(
     componentType="globe",
-    componentName="地球",
+    componentName="globe",
     defaultPanSensitivity=0
 ) }}
 
 ### targetCoord(Array)
 
 Position the longitudes and latitudes.
-Ignore [alpha](~globe.viewControl.alpha) 和 [beta](~globe.viewControl.beta) after the setting.
+Ignore [alpha](~globe.viewControl.alpha) and [beta](~globe.viewControl.beta) after the setting.
 
 
 ```ts

diff --git a/en/option-gl/series/map3D.md b/en/option-gl/series/map3D.md
@@ -17,5 +17,5 @@ Compared to 2D maps, 3D maps can set different heights for each area. This heigh
 {{ use: component-geo3D-common(
     componentType="series-map3D",
     inMap=true,
-    componentName="三维地图"
+    componentName="3D map"
 )  }}
diff --git a/en/option/partial/axisPointer-common.md b/en/option/partial/axisPointer-common.md
@@ -124,7 +124,7 @@ current value. When using [axisPointer.handle](xAxisPointer.handle), `value` can
 
 <ExampleUIControlEnum options="show,hide" />
 
-Current status, can be `'show'` 和 `'hide'`.
+Current status, can be `'show'` or `'hide'`.
 
 #${prefix} handle(Object)
 

diff --git a/en/option/partial/zr-graphic.md b/en/option/partial/zr-graphic.md
@@ -1735,15 +1735,15 @@ We can also specify all of the properties like this:
 
 ###${prefix} duration(number)
 
-动画时长，单位 ms
+Duration of animation, unit: ms
 
 ###${prefix} easing(string)
 
-动画缓动。不同的缓动效果可以参考 [缓动示例](${galleryEditorPath}line-easing)。
+Easing effect. Refer to the following for different effects: [examples](${galleryEditorPath}line-easing)
 
 ###${prefix} delay(number)
 
-动画延迟时长，单位 ms
+Delay of animation, unit: ms
 
 
 

diff --git a/en/option/series/lines.md b/en/option/series/lines.md
@@ -285,7 +285,7 @@ Label of a single line. Available when [polyline](~series-lines.polyline) is not
 
 {{ use: partial-z-zlevel(
     prefix = "#",
-    componentName = "路径图"
+    componentName = "lines graph"
 ) }}
 
 {{ use: partial-silent(