fix(sunburst): improve code

apache · Sep 10, 2021 · dd1890b · dd1890b
1 parent c5fcf82
commit dd1890b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 24 deletions.
diff --git a/src/chart/sunburst/SunburstSeries.ts b/src/chart/sunburst/SunburstSeries.ts
@@ -95,15 +95,15 @@ export interface SunburstSeriesNodeItemOption extends
 export interface SunburstSeriesLevelOption
     extends SunburstStateOption, StatesOptionMixin<SunburstStateOption, SunburstStatesMixin> {
 
-    radius?: number | number[]
+    radius?: (number | string)[]
     /**
      * @deprecated use radius instead
      */
-    r?: number
+    r?: number | string
     /**
      * @deprecated use radius instead
      */
-    r0?: number
+    r0?: number | string
 
     highlight?: {
         itemStyle?: SunburstItemStyleOption
@@ -171,10 +171,10 @@ class SunburstSeriesModel extends SeriesModel<SunburstSeriesOption> {
 
         completeTreeValue(root);
 
-        this._levelModels = zrUtil.map(option.levels || [], function (levelDefine) {
-            return new Model(levelDefine, this, ecModel);
-        }, this);
-        const levelModels = this._levelModels;
+        const levelModels = this._levelModels
+            = zrUtil.map(option.levels || [], function (levelDefine) {
+                return new Model(levelDefine, this, ecModel);
+            }, this);
 
         // Make sure always a new tree is created when setOption,
         // in TreemapView, we check whether oldTree === newTree

diff --git a/src/chart/sunburst/sunburstLayout.ts b/src/chart/sunburst/sunburstLayout.ts
@@ -122,26 +122,17 @@ export default function sunburstLayout(
 
                 const levelModel = seriesModel.getLevelModel(node);
                 if (levelModel) {
-                    const r0 = levelModel.get('r0', true);
-                    if (r0 != null) {
-                        // Compatible with deprecated r0
-                        rStart = parsePercent(r0, size / 2);
-                    }
-                    const r = levelModel.get('r', true);
-                    if (r != null) {
-                        // Compatible with deprecated r
-                        rEnd = parsePercent(r, size / 2);
-                    }
+                    let r0 = levelModel.get('r0', true);
+                    let r = levelModel.get('r', true);
+                    let radius = levelModel.get('radius', true);
 
-                    // level-specific radius should override that of series
-                    let radius: number | number[] = levelModel.get('radius', true);
                     if (radius != null) {
-                        if (typeof radius === 'number') {
-                            radius = [radius, radius];
-                        }
-                        rStart = parsePercent(radius[0], size / 2);
-                        rEnd = parsePercent(radius[1], size / 2);
+                        r0 = radius[0];
+                        r = radius[1];
                     }
+
+                    (r0 != null) && (rStart = parsePercent(r0, size / 2));
+                    (r != null) && (rEnd = parsePercent(r, size / 2));
                 }
 
                 node.setLayout({