feat(treemap): add scaleLimit to limit the zooming. close apache#14599

liuyizhou · Apr 11, 2023 · 8921fec · 8921fec · dannishushu · Apr 10, 2024
1 parent 57b8c97
commit 8921fec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/chart/treemap/TreemapSeries.ts b/src/chart/treemap/TreemapSeries.ts
@@ -45,7 +45,6 @@ import SeriesData from '../../data/SeriesData';
 import { normalizeToArray } from '../../util/model';
 import { createTooltipMarkup } from '../../component/tooltip/tooltipMarkup';
 import enableAriaDecalForTree from '../helper/enableAriaDecalForTree';
-import View from '../../coord/View';
 
 // Only support numeric value.
 type TreemapSeriesDataValue = number | number[];
@@ -218,8 +217,6 @@ export interface TreemapSeriesOption
 
 class TreemapSeriesModel extends SeriesModel<TreemapSeriesOption> {
 
-    coordinateSystem: View;
-
     static type = 'series.treemap';
     type = TreemapSeriesModel.type;
 
@@ -235,6 +232,11 @@ class TreemapSeriesModel extends SeriesModel<TreemapSeriesOption> {
     private _idIndexMap: zrUtil.HashMap<number>;
     private _idIndexMapCount: number;
 
+    zoomLimit: {
+        max?: number;
+        min?: number;
+    };
+
     static defaultOption: TreemapSeriesOption = {
         coordinateSystem: 'view',
         // Disable progressive rendering
@@ -255,7 +257,7 @@ class TreemapSeriesModel extends SeriesModel<TreemapSeriesOption> {
 
         zoomToNodeRatio: 0.32 * 0.32,
 
-        zoom: 1,
+        scaleLimit: null,
 
         roam: true,
         nodeClick: 'zoomToNode',
@@ -511,10 +513,6 @@ class TreemapSeriesModel extends SeriesModel<TreemapSeriesOption> {
     enableAriaDecal() {
         enableAriaDecalForTree(this);
     }
-
-    setZoom(zoom: number) {
-        this.option.zoom = zoom;
-    }
 }
 
 /**

diff --git a/src/chart/treemap/TreemapView.ts b/src/chart/treemap/TreemapView.ts
@@ -493,10 +493,7 @@ class TreemapView extends ChartView {
             controllerHost = this._controllerHost = {
                 target: this.group
             } as RoamControllerHost;
-            this.seriesModel.setZoom(this.seriesModel.get('zoom'));
-            this.seriesModel.coordinateSystem.zoomLimit = this.seriesModel.get('scaleLimit');
             controllerHost.zoomLimit = this.seriesModel.get('scaleLimit');
-            controllerHost.zoom = this.seriesModel.coordinateSystem.getZoom();
         }
 
         const rect = new BoundingRect(0, 0, api.getWidth(), api.getHeight());