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

ChenZeping

2021-05-08 3ec2e48009c84474ead34a82713ccc8c46f05d26

 src/components/LayerController/service/WmsLayerService.js

@@ -131,15 +131,18 @@
                autoClose: false
              })
              .openPopup() */
            window.$layer.open({
              content: {
                content: Popup, // 组件
                data: { // 传递的参数
                  datas: popupDatas
                }
              },
              title: '' // 标题
            })

            if (window.layerFactory.clickSwitch) {
              window.$layer.open({
                content: {
                  content: Popup, // 组件
                  data: { // 传递的参数
                    datas: popupDatas
                  }
                },
                title: '' // 标题
              })
            }
            // this.popupComp.setDatas(popupDatas)
            // this.popupComp.setShow()
          }