Merge remote-tracking branch 'origin/develop' into develop

ChenZeping

2021-05-08 3ec2e48009c84474ead34a82713ccc8c46f05d26

Merge remote-tracking branch 'origin/develop' into develop

 src/components/LayerController/service/WmsLayerService.js

@@ -76,9 +76,6 @@

  clickListener () {
    window.map.on('click', (e) => {
      if (!window.layerFactory.clickSwitch) {
        return
      }
      this.featureGroup.clearLayers()
      var point = this.map.latLngToContainerPoint(e.latlng, this.map.getZoom())
      var size = this.map.getSize()
@@ -134,6 +131,8 @@
                autoClose: false
              })
              .openPopup() */

            if (window.layerFactory.clickSwitch) {
            window.$layer.open({
              content: {
                content: Popup, // 组件
@@ -143,6 +142,7 @@
              },
              title: '' // 标题
            })
            }
            // this.popupComp.setDatas(popupDatas)
            // this.popupComp.setShow()
          }