[fix]webmap 提供setLegends，cleanLayers可配置参数

Author: luoxiao-supermap

src/common/mapping/MapBase.js

@@ -26,6 +26,10 @@ export function createMapClassExtending(SuperClass = class {}) {
       return this._legendList;
     }
 
+    setLegends(legendList) {
+      this._legendList = legendList || [];
+    }
+
     getSelfAppreciableLayers() {
       return (this._sourceListModel && this._sourceListModel.getSelfLayers(...arguments)) || [];
     }

src/common/mapping/WebMapBase.js

@@ -499,16 +499,23 @@ export function createWebMapBaseExtending(SuperClass, { mapRepo }) {
      * @version 11.2.1
      * @function WebMapBase.prototype.cleanLayers
      * @description 删除追加的图层和事件。当设置 `map` 时有效
+     * @param {Array<Object>} [layersToClean] - 要删除的图层数组，默认为所有可删除的缓存图层（非 reused）。每个图层对象包含 id 属性
+     * @param {boolean} [isClean=true] - 是否调用 clean(false) 销毁内部资源。为 false 时只删除指定图层并同步清理 legends
      */
-    cleanLayers() {
+    cleanLayers(layersToClean = this._cacheCleanLayers.filter(item => !item.reused), isClean = true) {
       // 清空追加的地图图层以及对应的事件
       if (!this.map) {
         return;
       }
-      const layersToClean = this._cacheCleanLayers.filter(item => !item.reused);
+      const cacheLayers = this._cacheCleanLayers;
       this._handler && this._handler.cleanLayers(layersToClean);
-      this._cacheCleanLayers = [];
-      this.clean(false);
+      this._cacheCleanLayers = cacheLayers.filter(item => !layersToClean.some((item1=> item1.id === item.id)));
+      if (isClean) {
+        this.clean(false);
+      } else {
+        const legends = this.getLegends();
+        this._handler.setLegends(legends.filter(item => !layersToClean.some((item1=> item1.id === item.layerId))));
+      }
     }
     /**
     * @typedef {Object} BaseLayerConfig

test/common/mapping/MapBaseSpec.js

@@ -0,0 +1,95 @@
+import { createMapClassExtending } from '@supermapgis/iclient-common/mapping/MapBase';
+
+describe('MapBase', () => {
+  let MapBase;
+  let instance;
+  
+  beforeEach(() => {
+    MapBase = createMapClassExtending();
+    instance = new MapBase();
+  });
+  
+  describe('setLegends', () => {
+    it('should set _legendList with provided array', () => {
+      const legends = [
+        { layerId: 'layer1', items: [{ color: '#fff', label: 'test' }] },
+        { layerId: 'layer2', items: [{ color: '#000' }] }
+      ];
+      
+      instance.setLegends(legends);
+      
+      expect(instance._legendList).toEqual(legends);
+    });
+    
+    it('should set _legendList to empty array when null is passed', () => {
+      instance.setLegends(null);
+      
+      expect(instance._legendList).toEqual([]);
+    });
+    
+    it('should set _legendList to empty array when undefined is passed', () => {
+      instance.setLegends(undefined);
+      
+      expect(instance._legendList).toEqual([]);
+    });
+    
+    it('should set _legendList to empty array when no argument is passed', () => {
+      instance.setLegends();
+      
+      expect(instance._legendList).toEqual([]);
+    });
+    
+    it('should overwrite existing legends', () => {
+      instance._legendList = [{ layerId: 'old' }];
+      
+      instance.setLegends([{ layerId: 'new' }]);
+      
+      expect(instance._legendList).toEqual([{ layerId: 'new' }]);
+    });
+  });
+  
+  describe('getLegends', () => {
+    it('should return _legendList', () => {
+      const legends = [{ layerId: 'layer1' }];
+      instance._legendList = legends;
+      
+      expect(instance.getLegends()).toEqual(legends);
+    });
+    
+    it('should return empty array when _legendList is not set', () => {
+      expect(instance.getLegends()).toEqual([]);
+    });
+  });
+  
+  describe('getLayerCatalog', () => {
+    it('should return _sourceListModel.getLayerCatalog() when _sourceListModel exists', () => {
+      const catalogs = [{ id: 'cat1' }];
+      instance._sourceListModel = jasmine.createSpyObj('sourceListModel', ['getLayerCatalog']);
+      instance._sourceListModel.getLayerCatalog.and.returnValue(catalogs);
+      
+      expect(instance.getLayerCatalog()).toEqual(catalogs);
+    });
+    
+    it('should return empty array when _sourceListModel is null', () => {
+      instance._sourceListModel = null;
+      
+      expect(instance.getLayerCatalog()).toEqual([]);
+    });
+  });
+  
+  describe('getLayers', () => {
+    it('should return _sourceListModel.getLayers() when _sourceListModel exists', () => {
+      const layers = [{ id: 'layer1' }];
+      instance._sourceListModel = jasmine.createSpyObj('sourceListModel', ['getLayers']);
+      instance._sourceListModel.getLayers.and.returnValue(layers);
+      
+      expect(instance.getLayers()).toEqual(layers);
+    });
+    
+    it('should return empty array when _sourceListModel is null', () => {
+      instance._sourceListModel = null;
+      
+      expect(instance.getLayers()).toEqual([]);
+    });
+  });
+});

test/common/mapping/WebMapBaseSpec.js

@@ -0,0 +1,81 @@
+import { createMapClassExtending } from '../../../src/common/mapping/MapBase';
+
+describe('WebMapBase - MapBase Methods', () => {
+  let MapBase;
+  let instance;
+  
+  beforeEach(() => {
+    MapBase = createMapClassExtending();
+    instance = new MapBase();
+  });
+  
+  describe('setLegends', () => {
+    it('should set _legendList with provided array', () => {
+      const legends = [
+        { layerId: 'layer1', items: [{ color: '#fff', label: 'test' }] },
+        { layerId: 'layer2', items: [{ color: '#000' }] }
+      ];
+      
+      instance.setLegends(legends);
+      
+      expect(instance._legendList).toEqual(legends);
+    });
+    
+    it('should set _legendList to empty array when null is passed', () => {
+      instance.setLegends(null);
+      
+      expect(instance._legendList).toEqual([]);
+    });
+    
+    it('should set _legendList to empty array when undefined is passed', () => {
+      instance.setLegends(undefined);
+      
+      expect(instance._legendList).toEqual([]);
+    });
+  });
+  
+  describe('getLegends', () => {
+    it('should return _legendList', () => {
+      const legends = [{ layerId: 'layer1' }];
+      instance._legendList = legends;
+      
+      expect(instance.getLegends()).toEqual(legends);
+    });
+    
+    it('should return empty array when _legendList is not set', () => {
+      expect(instance.getLegends()).toEqual([]);
+    });
+  });
+    
+  describe('getLayerCatalog', () => {
+    it('should return _sourceListModel.getLayerCatalog() when _sourceListModel exists', () => {
+      const catalogs = [{ id: 'cat1' }];
+      instance._sourceListModel = jasmine.createSpyObj('sourceListModel', ['getLayerCatalog']);
+      instance._sourceListModel.getLayerCatalog.and.returnValue(catalogs);
+      
+      expect(instance.getLayerCatalog()).toEqual(catalogs);
+    });
+    
+    it('should return empty array when _sourceListModel is null', () => {
+      instance._sourceListModel = null;
+      
+      expect(instance.getLayerCatalog()).toEqual([]);
+    });
+  });
+  
+  describe('getLayers', () => {
+    it('should return _sourceListModel.getLayers() when _sourceListModel exists', () => {
+      const layers = [{ id: 'layer1' }];
+      instance._sourceListModel = jasmine.createSpyObj('sourceListModel', ['getLayers']);
+      instance._sourceListModel.getLayers.and.returnValue(layers);
+      
+      expect(instance.getLayers()).toEqual(layers);
+    });
+    
+    it('should return empty array when _sourceListModel is null', () => {
+      instance._sourceListModel = null;
+      
+      expect(instance.getLayers()).toEqual([]);
+    });
+  });
+});

test/test-main-common.js

@@ -228,10 +228,12 @@ import './common/util/GeometryAnalysisSpec.js';
 
 import './common/mapping/utils/AppreciableLayerBaseSpec.js'
 import './common/mapping/utils/L7LayerUtilSpec';
+import './common/mapping/MapBaseSpec.js'
 import './common/mapping/utils/ColorUtilSpec.js';
 import './common/mapping/utils/SourceListModelV2Spec.js';
 import './common/mapping/utils/SourceListModelV3Spec.js';
 import './common/mapping/utils/epsgDefineSpec.js';
 import './common/mapping/utils/UtilSpec.js';
+import './common/mapping/WebMapBaseSpec.js';
 import './common/mapping/WebMapServiceSpec';
 import './common/mapping/WebMapV2BaseSpec';