apache · Ovilia · Mar 7, 2023 · Nov 30, 2022 · Nov 30, 2022 · Nov 30, 2022
diff --git a/.npmignore b/.npmignore
@@ -10,5 +10,7 @@
 .DS_Store
 Thumbs.db
 Desktop.ini
+/asset/contributing-inspect.png
+CONTRIBUTING.md
 # Hidden files
-.*
+.*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,9 +8,9 @@ Please check out the [Apache Code of Conduct](https://www.apache.org/foundation/
 
 Contributions can be made in varied ways:
 
-- Help others in the issues
+- Help others with the issues
     - Help solve problems with the issues
-    - Remind the authors to provide a demo if they are reporting for a bug
+    - Remind the authors to provide a demo if they are reporting a bug
     - Try to reproduce the problem as described in the issues
 - Make pull requests to fix bugs or implement new features
 - Improve or translate the documents
@@ -19,22 +19,22 @@ Contributions can be made in varied ways:
 
 ## Issues
 
-We have already prepared issue templates for bug report and feature request. If you want to fire an issue, just entering [New issue](https://github.com/apache/echarts/issues/new/choose) page and select either of them to get started.
+We have already prepared issue templates for bug reports and feature requests. If you want to fire an issue, just enter the [New issue](https://github.com/apache/echarts/issues/new/choose) page and select either of them to get started.
 
 Additionally, before doing so, please search for similar questions in our [issues list](https://github.com/apache/echarts/issues?utf8=%E2%9C%93&q=is%3Aissue). If you are able to reproduce an issue found in a closed issue, please create a new issue and reference the closed one.
 
 Please read the [documentation](http://echarts.apache.org/option.html) carefully before asking any questions.
 
-Any questions in the form of *how can I use echarts to* or *how to use echarts x feature to* belong in [Stack Overflow](http://stackoverflow.com), issues with questions like that in the issue tracker will be closed.
+Any questions in the form of *how can I use echarts to* or *how to use echarts x feature to* belong in [Stack Overflow](http://stackoverflow.com). Issues with questions like that in the issue tracker will be closed.
 
 ## Release Milestone Discussion
 
 We will start the discussion about the bugs to fix and the features of each release in the [mailing list](https://echarts.apache.org/en/maillist.html). You may subscribe to our [mailing list](https://echarts.apache.org/en/maillist.html) to give your valuable advice in milestone discussions.
 
 Regarding the release plan, we will release a minor version at the end of every month. Here is some detail.
 
-1. Assume our current stable release is 4.3.0. We will start the discussion of the milestone of the release two versions ahead, which is 4.5.0 at the beginning of each month. At this time we should also kickoff the development of the next release, which is 4.4.0.
-2. Finish 4.4.0 developing at about 22th of this month and start the testing. And the 4.5.0 milestone discussion is frozen and published on the [GitHub](https://github.com/apache/echarts/milestone/14)
+1. Assume our current stable release is 4.3.0. We will start the discussion of the milestone of the release two versions ahead, which is 4.5.0 at the beginning of each month. At this time, we should also kick off the development of the next release, which is 4.4.0.
+2. Finish 4.4.0 development on about the 22nd of this month and start the testing. And the 4.5.0 milestone discussion is frozen and published on the [GitHub](https://github.com/apache/echarts/milestone/14)
 3. Vote in the mailing list for the 4.4.0 release at the end of this month.
 
 ## Pull Requests
@@ -47,23 +47,23 @@ Wiki: [How to setup the dev environment](https://github.com/apache/echarts/wiki/
 
 ## Some hints about using code from other authors
 
-+ About using some algorithms/formulas or inspired by other's work:
-    + We can be inspired by other people’s work. There is no problem with copying ideas and no problems associated with that so long as the code is entirely yours and you aren’t violating the license of the inspirational work. You can just follow "normal" source code rules.
++ About using some algorithms/formulas or inspired by others' work:
+    + We can be inspired by other people’s work. There is no problem with copying ideas and no problems associated with that as long as the code is entirely yours and you aren’t violating the license of the inspirational work. You can just follow "normal" source code rules.
     + But when you copy the code, even parts of files, it must remain under the copyright of the original authors.
     + What's the right thing to do for the public good here? I'll go with:
         + Be transparent when implementing an existing idea/algorithm.
         + Reference where that idea/algorithm came from.
         + Use standard language when doing so (we need to define standard language).
             + "inspired by", "learned from" and "references to" are vague concepts in copyright.
         + If any copyrightable expression is copied from the existing idea/algorithm, compare its licensing to our licensing policies and include licensing accordingly.
-    + Check the original discussion about it in: https://lists.apache.org/list.html?legal-discuss@apache.org:lte=36M:echarts
+    + Check the original discussion about it at: https://lists.apache.org/list.html?legal-discuss@apache.org:lte=36M:echarts
 + About adding the license/header of 3rd-party work:
     + https://www.apache.org/legal/src-headers.html#3party
 + Licenses that are compatible with the Apache license:
-    + BSD and MIT are compatible with the Apache license but CC_BY_SA is not (https://apache.org/legal/resolved.html#cc-sa).
+    + BSD and MIT are compatible with the Apache license, but CC_BY_SA is not (https://apache.org/legal/resolved.html#cc-sa).
 + Stack Overflow:
-    + before intending to copy code from Stack Overflow, we must check:
+    + before intending to copy code from Stack Overflow, we must check the following:
     + https://apache.org/legal/resolved.html#stackoverflow
     + https://issues.apache.org/jira/browse/LEGAL-471
 + Wikipedia (and most Wikimedia Foundation projects):
-    + Wikipedia, and most Wikimedia Foundation projects, are licensed under CC 4.0 BY_SA (and sometimes GFDL) and is incompatible with the Apache license. Therefore, we should not copy code from Wikipedia, or Wikimedia Foundation projects.
+    + Wikipedia, and most Wikimedia Foundation projects, are licensed under CC 4.0 BY_SA (and sometimes GFDL) and are incompatible with the Apache license. Therefore, we should not copy code from Wikipedia or Wikimedia Foundation projects.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache ECharts
-Copyright 2017-2022 The Apache Software Foundation
+Copyright 2017-2023 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
     <img style="vertical-align: top;" src="./asset/logo.png?raw=true" alt="logo" height="50px">
 </a>
 
-Apache ECharts is a free, powerful charting and visualization library offering an easy way of adding intuitive, interactive, and highly customizable charts to your commercial products. It is written in pure JavaScript and based on <a href="https://github.com/ecomfe/zrender">zrender</a>, which is a whole new lightweight canvas library.
+Apache ECharts is a free, powerful charting and visualization library offering easy ways to add intuitive, interactive, and highly customizable charts to your commercial products. It is written in pure JavaScript and based on <a href="https://github.com/ecomfe/zrender">zrender</a>, which is a whole new lightweight canvas library.
 
 **[中文官网](https://echarts.apache.org/zh/index.html)** | **[ENGLISH HOMEPAGE](https://echarts.apache.org/en/index.html)**
 
@@ -45,12 +45,12 @@ Execute the instructions in the root directory of the echarts:
 npm install
 
 # Rebuild source code immediately in watch mode when changing the source code.
-# It opens the `./test` directory and you may open `-cases.html` to get the list
+# It opens the `./test` directory, and you may open `-cases.html` to get the list
 # of all test cases.
 # If you wish to create a test case, run `npm run mktest:help` to learn more.
 npm run dev
 
-# Check correctness of TypeScript code.
+# Check the correctness of TypeScript code.
 npm run checktype
 
 # If intending to build and get all types of the "production" files:
@@ -61,7 +61,7 @@ Then the "production" files are generated in the `dist` directory.
 
 ## Contribution
 
-If you wish to debug locally or make pull requests, please refer to the [contributing](https://github.com/apache/echarts/blob/master/CONTRIBUTING.md) document.
+Please refer to the [contributing](https://github.com/apache/echarts/blob/master/CONTRIBUTING.md) document if you wish to debug locally or make pull requests.
 
 ## Resources
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     "serve-handler": "6.1.1",
     "slugify": "1.3.4",
     "socket.io": "2.5.0",
-    "terser": "^5.3.8",
+    "terser": "^5.16.1",
     "ts-jest": "^26.4.3",
     "typescript": "4.4.3"
   }

diff --git a/src/chart/bar/BarSeries.ts b/src/chart/bar/BarSeries.ts
@@ -53,8 +53,8 @@ interface BarStatesMixin {
 }
 
 export interface BarItemStyleOption<TCbParams = never> extends ItemStyleOption<TCbParams> {
-    // Border radius is not supported for bar on polar
-    borderRadius?: number | number[]
+    // for polar bars, this is used for sector's cornerRadius
+    borderRadius?: (number | string)[] | number | string
 }
 export interface BarDataItemOption extends BarStateOption,
     StatesOptionMixin<BarStateOption, BarStatesMixin>,

diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
@@ -21,6 +21,8 @@ import Path, {PathProps} from 'zrender/src/graphic/Path';
 import Group from 'zrender/src/graphic/Group';
 import {extend, each, map} from 'zrender/src/core/util';
 import {BuiltinTextPosition} from 'zrender/src/core/types';
+import {SectorProps} from 'zrender/src/graphic/shape/Sector';
+import {RectProps} from 'zrender/src/graphic/shape/Rect';
 import {
     Rect,
     Sector,
@@ -66,6 +68,7 @@ import { warn } from '../../util/log';
 import {createSectorCalculateTextPosition, SectorTextPosition, setSectorTextRotation} from '../../label/sectorLabel';
 import { saveOldStyle } from '../../animation/basicTransition';
 import Element from 'zrender/src/Element';
+import { getSectorCornerRadius } from '../helper/sectorHelper';
 
 const mathMax = Math.max;
 const mathMin = Math.min;
@@ -243,6 +246,9 @@ class BarView extends ChartView {
             if (coord.type === 'cartesian2d') {
                 (bgEl as Rect).setShape('r', barBorderRadius);
             }
+            else {
+                (bgEl as Sector).setShape('cornerRadius', barBorderRadius);
+            }
             bgEls[dataIndex] = bgEl;
             return bgEl;
         };
@@ -334,11 +340,14 @@ class BarView extends ChartView {
                         if (coord.type === 'cartesian2d') {
                             (bgEl as Rect).setShape('r', barBorderRadius);
                         }
+                        else {
+                            (bgEl as Sector).setShape('cornerRadius', barBorderRadius);
+                        }
                         bgEls[newIndex] = bgEl;
                     }
                     const bgLayout = getLayout[coord.type](data, newIndex);
                     const shape = createBackgroundShape(isHorizontalOrRadial, bgLayout, coord);
-                    updateProps(bgEl, { shape }, animationModel, newIndex);
+                    updateProps<RectProps | SectorProps>(bgEl, { shape }, animationModel, newIndex);
                 }
 
                 let el = oldData.getItemGraphicEl(oldIndex) as BarPossiblePath;
@@ -803,7 +812,7 @@ const elementCreator: {
             const sectorShape = sector.shape;
             const animateProperty = isRadial ? 'r' : 'endAngle' as 'r' | 'endAngle';
             const animateTarget = {} as SectorShape;
-            sectorShape[animateProperty] = isRadial ? 0 : layout.startAngle;
+            sectorShape[animateProperty] = isRadial ? layout.r0 : layout.startAngle;
             animateTarget[animateProperty] = layout[animateProperty];
             (isUpdate ? updateProps : initProps)(sector, {
                 shape: animateTarget
@@ -971,7 +980,8 @@ function createPolarPositionMapping(isRadial: boolean)
 
 function updateStyle(
     el: BarPossiblePath,
-    data: SeriesData, dataIndex: number,
+    data: SeriesData,
+    dataIndex: number,
     itemModel: Model<BarDataItemOption>,
     layout: RectLayout | SectorLayout,
     seriesModel: BarSeriesModel,
@@ -981,7 +991,19 @@ function updateStyle(
     const style = data.getItemVisual(dataIndex, 'style');
 
     if (!isPolar) {
-        (el as Rect).setShape('r', itemModel.get(['itemStyle', 'borderRadius']) || 0);
+        const borderRadius = itemModel
+            .get(['itemStyle', 'borderRadius']) as number | number[] || 0;
+        (el as Rect).setShape('r', borderRadius);
+    }
+    else if (!seriesModel.get('roundCap')) {
+        const sectorShape = (el as Sector).shape;
+        const cornerRadius = getSectorCornerRadius(
+            itemModel.getModel('itemStyle'),
+            sectorShape,
+            true
+        );
+        extend(sectorShape, cornerRadius);
+        (el as Sector).setShape(sectorShape);
     }
 
     el.useStyle(style);