[fix]setLayersVisible webmap 新增isSetVisible参数控制visible参数

Author: luoxiao-supermap

src/common/mapping/utils/AppreciableLayerBase.js

@@ -98,10 +98,12 @@ export class AppreciableLayerBase extends Events {
     }
   }
 
-  setLayersVisible(layers, visibility) {
+  setLayersVisible(layers, visibility, isSetVisible = true) {
     layers.forEach((layer) => {
       const visbleId = this._getLayerVisibleId(layer);
-      this.layersVisibleMap.set(visbleId, visibility === 'visible');
+      if (isSetVisible) {
+        this.layersVisibleMap.set(visbleId, visibility === 'visible');
+      }
       if (layer.CLASS_INSTANCE && layer.CLASS_INSTANCE.show && layer.CLASS_INSTANCE.hide) {
         visibility === 'visible' ? layer.CLASS_INSTANCE.show() : layer.CLASS_INSTANCE.hide();
         this.map.style.fire('data', { dataType: 'style' });

test/common/mapping/utils/AppreciableLayerBaseSpec.js

@@ -0,0 +1,121 @@
+import { AppreciableLayerBase } from '../../../../src/common/mapping/utils/AppreciableLayerBase';
+
+describe('AppreciableLayerBase', () => {
+  let instance;
+  let mockMap;
+
+  beforeEach(() => {
+    mockMap = {
+      style: {
+        fire: jasmine.createSpy('fire')
+      },
+      getLayer: jasmine.createSpy('getLayer').and.returnValue({}),
+      setLayoutProperty: jasmine.createSpy('setLayoutProperty')
+    };
+    
+    instance = new AppreciableLayerBase({
+      map: mockMap,
+      layers: []
+    });
+  });
+
+  describe('setLayersVisible', () => {
+    it('should set layer visibility to visible', () => {
+      const layer = {
+        renderLayers: ['layer1'],
+        CLASS_NAME: 'TestLayer'
+      };
+      
+      instance.setLayersVisible([layer], 'visible', true);
+      
+      expect(mockMap.setLayoutProperty).toHaveBeenCalledWith('layer1', 'visibility', 'visible');
+    });
+
+    it('should set layer visibility to none', () => {
+      const layer = {
+        renderLayers: ['layer1'],
+        CLASS_NAME: 'TestLayer'
+      };
+      
+      instance.setLayersVisible([layer], 'none', true);
+      
+      expect(mockMap.setLayoutProperty).toHaveBeenCalledWith('layer1', 'visibility', 'none');
+    });
+
+    it('should handle layer with CLASS_INSTANCE', () => {
+      const mockShow = jasmine.createSpy('show');
+      const mockHide = jasmine.createSpy('hide');
+      const layer = {
+        renderLayers: ['layer1'],
+        CLASS_NAME: 'TestLayer',
+        CLASS_INSTANCE: {
+          show: mockShow,
+          hide: mockHide
+        }
+      };
+      
+      instance.setLayersVisible([layer], 'visible', true);
+      
+      expect(mockShow).toHaveBeenCalled();
+      expect(mockHide).not.toHaveBeenCalled();
+      expect(mockMap.style.fire).toHaveBeenCalledWith('data', { dataType: 'style' });
+    });
+
+    it('should handle layer with CLASS_INSTANCE and hide', () => {
+      const mockShow = jasmine.createSpy('show');
+      const mockHide = jasmine.createSpy('hide');
+      const layer = {
+        renderLayers: ['layer1'],
+        CLASS_NAME: 'TestLayer',
+        CLASS_INSTANCE: {
+          show: mockShow,
+          hide: mockHide
+        }
+      };
+      
+      instance.setLayersVisible([layer], 'none', true);
+      
+      expect(mockHide).toHaveBeenCalled();
+      expect(mockShow).not.toHaveBeenCalled();
+      expect(mockMap.style.fire).toHaveBeenCalledWith('data', { dataType: 'style' });
+    });
+
+    it('should skip layersVisibleMap when isSetVisible is false', () => {
+      const layer = {
+        renderLayers: ['layer1'],
+        CLASS_NAME: 'TestLayer'
+      };
+      
+      instance.setLayersVisible([layer], 'visible', false);
+      
+      // isSetVisible=false 只跳过 layersVisibleMap 的设置，但 setLayoutProperty 仍会被调用
+      expect(mockMap.setLayoutProperty).toHaveBeenCalledWith('layer1', 'visibility', 'visible');
+    });
+
+    it('should handle multiple renderLayers', () => {
+      const layer = {
+        renderLayers: ['layer1', 'layer2', 'layer3'],
+        CLASS_NAME: 'TestLayer'
+      };
+      
+      instance.setLayersVisible([layer], 'visible', true);
+      
+      expect(mockMap.setLayoutProperty).toHaveBeenCalledTimes(3);
+      expect(mockMap.setLayoutProperty).toHaveBeenCalledWith('layer1', 'visibility', 'visible');
+      expect(mockMap.setLayoutProperty).toHaveBeenCalledWith('layer2', 'visibility', 'visible');
+      expect(mockMap.setLayoutProperty).toHaveBeenCalledWith('layer3', 'visibility', 'visible');
+    });
+
+    it('should skip L7Layer when getLayer returns falsy', () => {
+      mockMap.getLayer.and.returnValue(null);
+      const layer = {
+        renderLayers: ['l7layer1'],
+        CLASS_NAME: 'L7Layer'
+      };
+      
+      instance.setLayersVisible([layer], 'visible', true);
+      
+      expect(mockMap.setLayoutProperty).not.toHaveBeenCalled();
+    });
+  });
+});

test/test-main-common.js

@@ -226,11 +226,12 @@ import './common/util/EncryptRequestSpec';
 import './common/util/MapCalculateUtilSpec';
 import './common/util/GeometryAnalysisSpec.js';
 
+import './common/mapping/utils/AppreciableLayerBaseSpec.js'
 import './common/mapping/utils/L7LayerUtilSpec';
 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/WebMapServiceSpec';
-import './common/mapping/WebMapV2BaseSpec';
+import './common/mapping/WebMapV2BaseSpec';