fix: 图层接口类型缺失 (#238)

antvis · Oct 31, 2022 · ec237ae · ec237ae
1 parent d7199bc
commit ec237ae
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/packages/composite-layers/src/types/interface.ts b/packages/composite-layers/src/types/interface.ts
@@ -29,6 +29,7 @@ export interface ILayerGroup {
  * 核心图层的基类接口
  */
 export interface ICoreLayer {
+  options: Record<string, any>;
   name: string;
   id: string;
   type: string;
@@ -73,6 +74,7 @@ export interface ICoreLayer {
  * 复合图层的基类接口
  */
 export interface ICompositeLayer {
+  options: Record<string, any>;
   name: string;
   id: string;
   type: string;

diff --git a/packages/l7plot/__tests__/unit/core/plot/index.test.ts b/packages/l7plot/__tests__/unit/core/plot/index.test.ts
@@ -113,15 +113,15 @@ describe('core plot', () => {
         try {
           expect(dotMap.zoomControl).toBeDefined();
           expect(dotMap.scaleControl).toBeDefined();
-          expect(dotMap.layerMenuControl).toBeDefined();
+          // expect(dotMap.layerMenuControl).toBeDefined();
 
           dotMap.removeZoomControl();
           dotMap.removeScaleControl();
           dotMap.removeLayerMenuControl();
 
           expect(dotMap.zoomControl).toBeUndefined();
           expect(dotMap.scaleControl).toBeUndefined();
-          expect(dotMap.layerMenuControl).toBeUndefined();
+          // expect(dotMap.layerMenuControl).toBeUndefined();
           resolve();
         } catch (err) {
           reject(err);

diff --git a/packages/l7plot/src/component/legend.ts b/packages/l7plot/src/component/legend.ts
@@ -1,4 +1,4 @@
-import { IControlOption } from '@antv/l7-core';
+import { IControlOption } from '@antv/l7';
 import { Control } from '@antv/l7-component';
 import { CategoryLegendOptions, ContinueLegendOptions, CategoryLegend, ContinueLegend } from '@antv/l7plot-component';
 

diff --git a/packages/l7plot/src/core/map/index.ts b/packages/l7plot/src/core/map/index.ts
@@ -1,6 +1,6 @@
 import { Scene } from '@antv/l7-scene';
 import { Mapbox, GaodeMap } from '@antv/l7-maps';
-import { Scale, Layers, Zoom } from '@antv/l7-component';
+import { Scale, Zoom } from '@antv/l7-component';
 import EventEmitter from '@antv/event-emitter';
 import { isObject, isBoolean, isUndefined, isEqual } from '@antv/util';
 import { Tooltip } from '../../component/tooltip';
@@ -88,7 +88,7 @@ export abstract class Map<O extends MapOptions> extends EventEmitter {
   /**
    * layerMenu 图层列表 Control
    */
-  public layerMenuControl: Layers | undefined;
+  // public layerMenuControl: Layers | undefined;
   /**
    * legend 图例 Control
    */
@@ -530,26 +530,26 @@ export abstract class Map<O extends MapOptions> extends EventEmitter {
    * 添加 layerMenu 控件
    */
   public addLayerMenuControl(options: LayerMenuControlOptions) {
-    if (this.layerMenuControl) {
-      return;
-    }
+    // if (this.layerMenuControl) {
+    //   return;
+    // }
     const baseLayers = {};
     const overlayers = {};
     this.layerGroup.getLayers().forEach(({ name, layer }) => {
       overlayers[name] = layer;
     });
-    this.layerMenuControl = new Layers(Object.assign({}, options, { baseLayers, overlayers }));
-    this.scene.addControl(this.layerMenuControl);
+    // this.layerMenuControl = new Layers(Object.assign({}, options, { baseLayers, overlayers }));
+    // this.scene.addControl(this.layerMenuControl);
   }
 
   /**
    * 更新 layerMenu 控件
    */
   public updateLayerMenuControl(options: LayerMenuControlOptions) {
-    if (!this.layerMenuControl) {
-      this.addLayerMenuControl(options);
-      return;
-    }
+    // if (!this.layerMenuControl) {
+    //   this.addLayerMenuControl(options);
+    //   return;
+    // }
     this.removeLayerMenuControl();
     this.addLayerMenuControl(options);
   }
@@ -558,10 +558,10 @@ export abstract class Map<O extends MapOptions> extends EventEmitter {
    * 移除 layerMenu 控件
    */
   public removeLayerMenuControl() {
-    if (this.layerMenuControl) {
-      this.layerMenuControl.remove();
-      this.layerMenuControl = undefined;
-    }
+    // if (this.layerMenuControl) {
+    //   this.layerMenuControl.remove();
+    //   this.layerMenuControl = undefined;
+    // }
   }
 
   /**

diff --git a/packages/l7plot/src/types/control.ts b/packages/l7plot/src/types/control.ts
@@ -27,6 +27,7 @@ export type ScaleControlOptions = {
 /**
  * LayerMenuControl
  */
+// TODO: 类型更新
 export type LayerMenuControlOptions = {
   position?: PositionName;
   collapsed?: boolean;