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

ChenZeping

2021-05-06 bc43761af362df2c88eb1b08fce0b90095441328

 src/components/LayerController/service/WmsLayerService.js

@@ -1,5 +1,6 @@
import AjaxUtils from '../../../utils/AjaxUtils'
import { PIPELINE_WMS } from '../../../conf/Constants'
import Popup from '@views/popup/Popup'

/**
 * todo 得考虑一个图层配置了多个 wmsLayers的情况
@@ -118,7 +119,7 @@
            var myIcon = this.L.divIcon({ className: 'my-div-icon' })
            this.L.marker(e.latlng, {
              icon: myIcon
            }).addTo(this.featureGroup)
            }).addTo(this.featureGroup)/*
              .bindPopup((layer) => {
                this.popupComp.setDatas(popupDatas)
                this.popupComp.setShow()
@@ -129,7 +130,18 @@
                closeButton: false,
                autoClose: false
              })
              .openPopup()
              .openPopup() */
            window.$layer.open({
              content: {
                content: Popup, // 组件
                data: { // 传递的参数
                  datas: popupDatas
                }
              },
              title: '' // 标题
            })
            // this.popupComp.setDatas(popupDatas)
            // this.popupComp.setShow()
          }
        })
      }