Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: xilanhuaweidapao

src/common/mapping/MapBase.js

@@ -15,7 +15,7 @@ export function createMapClassExtending(SuperClass = class {}) {
     }
 
     getLayerCatalog() {
-      return (this._sourceListModel && this._sourceListModel.getSourceList()) || [];
+      return (this._sourceListModel && this._sourceListModel.getLayerCatalog()) || [];
     }
 
     getLayers() {
@@ -30,6 +30,14 @@ export function createMapClassExtending(SuperClass = class {}) {
       return (this._sourceListModel && this._sourceListModel.getSelfLayers(appreciableLayers)) || [];
     }
 
+    setLayersVisible(layers, visibility) {
+      this._sourceListModel && this._sourceListModel.setLayersVisible(layers, visibility);
+    }
+
+    toggleLayerVisible(layerId, visible) {
+      this._sourceListModel && this._sourceListModel.toggleLayerVisible(layerId, visible);
+    }
+
     echartsLayerResize() {}
 
     updateOverlayLayer() {}

src/common/mapping/MapStyle.js

@@ -62,9 +62,12 @@ export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
 
     clean(removeMap = true) {
       if (this.map) {
+        if (this._sourceListModel) {
+          this._sourceListModel.destroy();
+          this._sourceListModel = null;
+        }
         removeMap && this.map.remove();
         this.map = null;
-        this._sourceListModel = null;
       }
     }
 
@@ -156,6 +159,11 @@ export function createMapStyleExtending(SuperClass, { MapManager, mapRepo }) {
         layers: layersFromStyle,
         appendLayers: this._appendLayers
       });
+      this._sourceListModel.on({
+        layerupdatechanged: (params) => {
+          this.fire('layerupdatechanged', params);
+        }
+      });
       this.fire('mapcreatesucceeded', {
         map: this.map,
         mapparams: { title: this.mapOptions.name, description: '' },

src/common/mapping/WebMapBase.js

@@ -155,6 +155,7 @@
          */
         'projectionnotmatch',
         'layeraddchanged',
+        'layerupdatechanged',
         /**
          * @event WebMapBase#mapbeforeremove
          * @description 地图销毁前。
@@ -391,6 +392,21 @@
       return (this._handler && this._handler.getLayerCatalog()) || [];
     }
 
+    setLayersVisible(layers, visibility) {
+      this._handler && this._handler.setLayersVisible(layers, visibility);
+    }
+
+    /**
+     * @version 11.2.1
+     * @function WebMapBase.prototype.toggleLayerVisible
+     * @param {string} layerId - 图层 id。
+     * @param {boolean} visible - 图层是否可见。true 表示显示，false 表示隐藏。
+     * @description 设置图层显隐。
+     */
+    toggleLayerVisible(layerId, visible) {
+      this._handler && this._handler.toggleLayerVisible(layerId, visible);
+    }
+
     /**
      * @version 11.3.0
      * @function WebMapBase.prototype.getWebMapType

src/common/mapping/WebMapV2.js

@@ -52,11 +52,14 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo }) {
 
     clean(removeMap = true) {
       if (this.map) {
+        if (this._sourceListModel) {
+          this._sourceListModel.destroy();
+          this._sourceListModel = null;
+        }
         this.stopCanvg();
         removeMap && this.map.remove();
         this.map = null;
         this._legendList = [];
-        this._sourceListModel = null;
         this.center = null;
         this.zoom = null;
         if (this._dataflowService) {
@@ -2229,6 +2232,7 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo }) {
     _sendMapToUser(count, layersLen) {
       if (count === layersLen) {
         this.addLayersSucceededLen = this._cacheLayerId.size;
+        this._changeSourceListModel();
         const appreciableLayers = this.getLayers();
         const layerOptions = this._getSelfAppreciableLayers(appreciableLayers);
         this._rectifyLayersOrder(layerOptions.layers);
@@ -2772,41 +2776,14 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo }) {
         const matchInsertIndex = matchIndex < 0 ? renderLayerList.length : matchIndex;
         renderLayerList.splice(matchInsertIndex, 0, ...renderLayers);
       }
-      const layersFromMapInfo = [];
-      const layerList = [this._mapInfo.baseLayer].concat(this._mapInfo.layers);
-      if (this._graticuleLayer) {
-        const { id: layerID, visible } = this._graticuleLayer;
-        layerList.push({ layerID, visible, name: 'GraticuleLayer' });
-      }
-      // this._mapInfo.layers 是有序的
-      layerList.forEach((layerInfo) => {
-        const targetLayerId = layerInfo.layerID || layerInfo.name;
-        const targetLayerVisible =
-          layerInfo.visible === void 0 || layerInfo.visible === 'visible' || layerInfo.visible === true;
-        const matchLayers = this._cacheLayerId.get(targetLayerId);
-        if (matchLayers) {
-          const renderLayers = matchLayers.map((item) => item.layerId);
-          if (!renderLayers.length) {
-            return;
-          }
-          layersFromMapInfo.push({
-            ...layerInfo,
-            id: targetLayerId,
-            visible: targetLayerVisible,
-            renderLayers,
-            reused: matchLayers.some((item) => item.reused)
-          });
-        }
-      });
-      this._changeSourceListModel(layersFromMapInfo);
-      const appreciableLayers = this.getLayers();
-      if (this.addLayersSucceededLen && this._cacheLayerId.size !== this.addLayersSucceededLen) {
+      if (this.addLayersSucceededLen && this._cacheLayerId.size <= this.expectLayerLen) {
+        this._changeSourceListModel();
+        const appreciableLayers = this.getLayers();
         const selfAppreciableLayers = this.getSelfAppreciableLayers(appreciableLayers);
         const topLayerBeforeId = this._findTopLayerBeforeId(selfAppreciableLayers);
         this._rectifyLayersOrder(selfAppreciableLayers, topLayerBeforeId);
-        this.addLayersSucceededLen = this._cacheLayerId.size;
+        this.fire('layeraddchanged', this._getSelfAppreciableLayers(appreciableLayers));
       }
-      this.fire('layeraddchanged', this._getSelfAppreciableLayers(appreciableLayers));
     }
 
     _findTopLayerBeforeId(selfAppreciableLayers) {
@@ -2831,22 +2808,53 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo }) {
       }
     }
 
-    _changeSourceListModel(layersFromMapInfo) {
+    _changeSourceListModel() {
+      const layersFromMapInfo = [];
+      const layerList = [this._mapInfo.baseLayer].concat(this._mapInfo.layers);
+      if (this._graticuleLayer) {
+        const { id: layerID, visible } = this._graticuleLayer;
+        layerList.push({ layerID, visible, name: 'GraticuleLayer' });
+      }
+      // this._mapInfo.layers 是有序的
+      layerList.forEach((layerInfo) => {
+        const targetLayerId = layerInfo.layerID || layerInfo.name;
+        const targetLayerVisible =
+          layerInfo.visible === void 0 || layerInfo.visible === 'visible' || layerInfo.visible === true;
+        const matchLayers = this._cacheLayerId.get(targetLayerId);
+        if (matchLayers) {
+          const renderLayers = matchLayers.map((item) => item.layerId);
+          if (!renderLayers.length) {
+            return;
+          }
+          layersFromMapInfo.push({
+            ...layerInfo,
+            id: targetLayerId,
+            visible: targetLayerVisible,
+            renderLayers,
+            reused: matchLayers.some((item) => item.reused)
+          });
+        }
+      });
       if (!this._sourceListModel) {
         this._sourceListModel = new SourceListModelV2({
           map: this.map,
           layers: layersFromMapInfo,
           appendLayers: this._appendLayers
         });
-      } else {
-        this._sourceListModel.setSelfLayers(layersFromMapInfo);
+        this._sourceListModel.on({
+          layerupdatechanged: (params) => {
+            this.fire('layerupdatechanged', params);
+          }
+        });
+        return;
       }
+      this._sourceListModel.setSelfLayers(layersFromMapInfo);
     }
 
     _getSelfAppreciableLayers(appreciableLayers) {
       return {
         layers: this.getSelfAppreciableLayers(appreciableLayers),
-        allLoaded: this._cacheLayerId.size === this.addLayersSucceededLen
+        allLoaded: this._cacheLayerId.size === this.expectLayerLen
       };
     }
 

src/common/mapping/WebMapV3.js

@@ -205,6 +205,10 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, mapRe
 
   clean(removeMap = true) {
     if (this.map) {
+      if (this._sourceListModel) {
+        this._sourceListModel.destroy();
+        this._sourceListModel = null;
+      }
       if (removeMap) {
         const scene = this.map.$l7scene;
         scene && scene.removeAllLayer();
@@ -614,6 +618,11 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, mapRe
       legendList: this._legendList,
       l7LayerUtil
     });
+    this._sourceListModel.on({
+      layerupdatechanged: (params) => {
+        this.fire('layerupdatechanged', params);
+      }
+    });
     this.fire('mapcreatesucceeded', { map: this.map, mapparams: this.mapParams, layers: this.getSelfAppreciableLayers() });
   }