From 24aa13e4b9b7bb516e2bc4fa114a94c90f45c008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E9=98=B3?= Date: Tue, 21 May 2024 15:18:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0h5=E7=89=88map=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-components/package.json | 9 +- .../src/components/map/map.tsx | 1538 ++++++++++++++++- .../src/components/map/style/map.scss | 11 + pnpm-lock.yaml | 311 +--- 4 files changed, 1588 insertions(+), 281 deletions(-) create mode 100644 packages/taro-components/src/components/map/style/map.scss diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 0024a93470b5..2835e81af493 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -53,10 +53,11 @@ "@tarojs/components-advanced": "workspace:*", "@tarojs/taro": "workspace:*", "classnames": "^2.2.5", + "hammerjs": "^2.0.8", "hls.js": "^1.1.5", "resolve-pathname": "^3.0.0", - "tslib": "^2.6.2", - "swiper": "6.8.0" + "swiper": "6.8.0", + "tslib": "^2.6.2" }, "devDependencies": { "@babel/generator": "^7.20.0", @@ -74,6 +75,7 @@ "lightningcss": "^1.22.1", "lodash": "^4.17.21", "miniapp-types": "1.6.0", + "mkdirp": "^1.0.4", "puppeteer": "^19.2.0", "rollup": "^3.8.1", "rollup-plugin-node-externals": "^5.0.0", @@ -81,8 +83,7 @@ "stencil-vue2-output-target": "0.0.4", "ts-node": "^10.9.1", "tsconfig-paths": "^3.14.1", - "typescript": "^5.3.3", - "mkdirp": "^1.0.4" + "typescript": "^5.3.3" }, "peerDependenciesMeta": { "@types/react": { diff --git a/packages/taro-components/src/components/map/map.tsx b/packages/taro-components/src/components/map/map.tsx index cbeac06ca6a1..765660743809 100644 --- a/packages/taro-components/src/components/map/map.tsx +++ b/packages/taro-components/src/components/map/map.tsx @@ -1,18 +1,1544 @@ -import { Component, ComponentInterface, h, Host } from '@stencil/core' +import { Component, ComponentInterface, Element, Event, EventEmitter, h, Host, Prop } from '@stencil/core' +import Hammer from 'hammerjs' +import { MapProps } from 'types' -import { notSupport } from '../../utils' +declare const BMapGL: any +declare const BMAP_ANCHOR_TOP_RIGHT: any +declare const BMAP_ANCHOR_BOTTOM_RIGHT: any +declare const BMAP_NORMAL_MAP: any +declare const BMAP_SATELLITE_MAP: any +declare const BMapGLLib: any @Component({ - tag: 'taro-map-core' + tag: 'taro-map-core', + styleUrl: './style/map.scss', }) export class Map implements ComponentInterface { - componentDidLoad () { - notSupport('Map', this) + /** + * 纬度 + */ + @Prop() latitude: number + + /** + * 经度 + */ + @Prop() longitude: number + + /** + * 缩放级别 + */ + @Prop() scale: number + + /** + * 最小缩放级别 + */ + @Prop() minScale: number + + /** + * 最大缩放级别 + */ + @Prop() maxScale: number + + /** + *标记点 + */ + @Prop() markers: MapProps.marker[] + + /** + * 路线(问题) + */ + @Prop() polyline: MapProps.polyline[] + + /** + * 圆(问题) + */ + @Prop() circles: MapProps.circle[] + + /** + * 多边形（参数问题） + */ + @Prop() polygons: MapProps.polygon[] + + /** + * 个性化地图】使用的key + */ + @Prop() subkey: string + + /** + * 【个性化地图】配置的 style + */ + @Prop() layerStyle: number + + /** + * 旋转 + */ + @Prop() rotate: number + + /** + * 倾斜 + */ + @Prop() skew: number + + /** + * 指南针 + */ + @Prop() showCompass: boolean + + /** + * 比例尺 + */ + @Prop() showScale: boolean + + /** + * 是否开启俯视 + */ + @Prop() enableOverlooking: boolean + + /** + * 是否支持缩放 + */ + @Prop() enableZoom: boolean + + /** + * 是否支持拖动 + */ + @Prop() enableScroll: boolean + + /** + * 是否支持旋转 + */ + @Prop() enableRotate: boolean + + /** + * 是否开启卫星图 + */ + @Prop() enableSatellite: boolean + + /** + * 是否开启实时路况 + */ + @Prop() enableTraffic: boolean + + /** + * 是否展示建筑 + */ + @Prop() enableBuilding: boolean + + /** + * 是否开启最大俯视角 + */ + @Prop() enableAutoMaxOverlooking: boolean + + /** + * 3D楼块 + */ + @Prop() enable3D: boolean + + /** + * 添加宽度属性 + */ + @Prop() width = '100%' + + /** + * 添加高度属性 + */ + @Prop() height = '100%' + + @Event({ + eventName: 'tap', + }) + + onTap: EventEmitter + + private currentRotation = 0 + private map: any + private mapRef: HTMLDivElement + @Element() el: HTMLElement + groundOverlay: any + async componentDidLoad () { + // 加载地图脚本 + await this.loadMapScript() + // 记载BmapLib工具库 + await this.LoadBmapLibScript() + // 如果容器元素存在 + + if (this.mapRef) { + this.mapRef.addEventListener('touchmove', (e) => { + if (e.cancelable) { + e.preventDefault() + } + }) + // 创建地图对象 + this.map = new BMapGL.Map(this.mapRef) + // 移除百度地图版权信息 + this.map.removeControl(this.map.getMapType()) + // 创建中心点坐标对象 + // 中心经纬度为必填值 + if (this.latitude < -90 || this.latitude > 90 || this.longitude < -180 || this.longitude > 180 || isNaN(this.latitude) || isNaN(this.longitude)) { + console.error('请正确设置中心经纬度') + return + } + let scale = isNaN(this.scale) ? 16 : this.scale + let minScale = isNaN(this.minScale) ? 3 : this.minScale + let maxScale = isNaN(this.maxScale) ? 16 : this.maxScale + const point = new BMapGL.Point(this.longitude, this.latitude) + + if (minScale < 3 || minScale > 20) { + minScale = 3 + this.map.setMinZoom(3) + } else { + // 设置最小缩放级别 + this.map.setMinZoom(minScale) + } + + if (maxScale > 20 || maxScale < 3) { + maxScale = 20 + this.map.setMaxZoom(20) + } else { + // 设置最大缩放级别 + this.map.setMaxZoom(maxScale) + } + + if (minScale > maxScale) { + minScale = 3 + this.map.setMinZoom(3) + maxScale = 20 + this.map.setMaxZoom(20) + } + + // 设置地图中心和缩放级别 + if (minScale <= 16 && maxScale >= 16) { + if (scale >= minScale && scale <= maxScale) { + // 使用this.scale来设置缩放级别 + this.map.centerAndZoom(point, scale) + } else { + scale = 16 + this.map.centerAndZoom(point, scale) + } + } else { + if (scale >= minScale && scale <= maxScale) { + // 使用this.scale来设置缩放级别 + this.map.centerAndZoom(point, scale) + } else if (scale < minScale) { + scale = minScale + this.map.centerAndZoom(point, minScale) + } else { + scale = maxScale + this.map.centerAndZoom(point, maxScale) + } + } + + // 添加标记点markers + if (Array.isArray(this.markers)) { + this.addMarkers(this.markers) + } + + // 创建polyline路线 + if (Array.isArray(this.polyline)) { + this.polyline.forEach((line) => { + if (line.points) { + const points = line.points.map((point) => new BMapGL.Point(point.longitude, point.latitude)) + const polyline = new BMapGL.Polyline(points, { + strokeColor: line.color, + strokeWeight: line.width, + strokeStyle: line.dottedLine ? 'dashed' : 'solid', + strokeOpacity: 1, + }) + // 将polyline路线添加到地图上 + this.map.addOverlay(polyline) + } + }) + } + + // 添加圆形覆盖物circles + if (Array.isArray(this.circles)) { + this.circles.forEach((circle) => { + if (circle.latitude && circle.longitude && circle.radius) { + const point = new BMapGL.Point(circle.longitude, circle.latitude) + const circleObj = new BMapGL.Circle(point, circle.radius, { + strokeColor: circle.color, + fillColor: circle.fillColor, + strokeWeight: circle.strokeWidth, + }) + this.map.addOverlay(circleObj) + } + }) + } + + // 多边形 + if (Array.isArray(this.polygons)) { + this.polygons.forEach((polygon) => { + // 创建多边形的点坐标数组 + const points = polygon.points.map((point) => new BMapGL.Point(point.longitude, point.latitude)) + // 创建多边形对象 + const polygonObj = new BMapGL.Polygon(points, { + strokeColor: polygon.strokeColor, + fillColor: polygon.fillColor, + strokeWeight: polygon.strokeWidth, + }) + // 将多边形添加到地图上 + this.map.addOverlay(polygonObj) + }) + } + + if (this.layerStyle === 0) { + const layerStyle = this.layerStyle + if (layerStyle) { + // 使用个性化地图样式 + this.map.setMapStyleV2({ styleId: this.subkey }) + } + } else { + const layerStyle = this.layerStyle ? this.layerStyle : 1 + if (layerStyle === 1) { + // 使用个性化地图样式 + this.map.setMapStyleV2({ styleId: this.subkey }) + } + } + + const enable3D = this.enable3D === true ? this.enable3D : false + const enableOverlooking = this.enableOverlooking === true ? this.enableOverlooking : false + const enableAutoMaxOverlooking = this.enableAutoMaxOverlooking === true ? this.enableAutoMaxOverlooking : false + const skew = this.skew ? this.skew : 0 + if (enable3D === true) { + if (enableOverlooking === true) { + // /开启最大俯视角 + if (enableAutoMaxOverlooking === true) { + this.map.setTilt(75) + } else { + // 开启俯视角度 + this.map.setTilt(45) + } + } else if (skew >= 0 && skew <= 40) { + // 设置倾斜角度 + this.map.setTilt(skew) + } else { + this.map.setTilt(0) + } + } else { + this.map.setTilt(0) + } + + // 显示指南针 + const showCompass = this.showCompass === true ? this.showCompass : false + if (showCompass === true) { + const compassControl = new BMapGL.NavigationControl3D({ + anchor: BMAP_ANCHOR_TOP_RIGHT, + type: 3, // 3代表显示指南针 + }) + this.map.addControl(compassControl) + } + + // 显示比例尺 + const showScale = this.showScale === true ? this.showScale : false + if (showScale === true) { + const scaleControl = new BMapGL.ScaleControl({ + anchor: BMAP_ANCHOR_BOTTOM_RIGHT, + }) + this.map.addControl(scaleControl) + } + + const enableZoom = this.enableZoom === false ? this.enableZoom : true + if (enableZoom === true) { + // 启用缩放 + this.map.enableScrollWheelZoom(this.enableZoom) + } + // 启用缩放 + if (this.enableZoom === true && this.mapRef) { + this.map.enablePinchToZoom() + } else { + this.map.disablePinchToZoom() + } + + // 拖拽 + const enableScroll = this.enableScroll === false ? this.enableScroll : true + if (enableScroll === true) { + this.map.enableDragging() + } else { + this.map.disableDragging() + } + + const rotate = this.rotate ? this.rotate : 0 + if (rotate >= 0 && this.rotate <= 360) { + this.map.setHeading(this.rotate) + } else { + this.map.setHeading(0) + } + + // 设置旋转角度 + if (this.enableRotate === true) { + this.map.enableRotateGestures() + } + + // 启用卫星图 + const enableSatellite = this.enableSatellite === true ? this.enableSatellite : false + if (enableSatellite === true && this.mapRef) { + const mapTypeControl = new BMapGL.MapTypeControl({ + mapTypes: [BMAP_NORMAL_MAP, BMAP_SATELLITE_MAP], + }) + this.map.addControl(mapTypeControl) + } + + const enableTraffic = this.enableTraffic === true ? this.enableTraffic : false + if (enableTraffic === true && this.mapRef) { + this.map.setTrafficOn() + } + + // 是否开启建筑物 + const enableBuilding = this.enableBuilding === false ? this.enableBuilding : true + if (enableBuilding === false) { + this.map.setDisplayOptions({ building: false }) + } + } + if (this.map) { + // 创建Hammer对象，绑定到地图容器 + const hammer = new Hammer(this.mapRef) + hammer.on('tap', (e) => { + // 将Hammer事件对象中的坐标转换为百度地图坐标 + const point = this.map.pixelToPoint({ x: e.center.x, y: e.center.y }) + this.onTap.emit({ + longitude: point.lng, + latitude: point.lat, + }) + }) + } + } + + + disconnectedCallback () { + if (this.map) { + this.map.destroy() + } + } + + + addMarkers (markers) { + // 维护已存在的marker id 列表 + const existingIds: string[] = [] + markers.forEach((marker) => { + if (existingIds.includes(marker.id)) { + // 如果id已存在，直接返回，不执行后续操作 + console.error('请输入不同的marker的id') + return + } + existingIds.push(marker.id) + if (marker.latitude && marker.longitude && marker.iconPath && marker.id) { + if (marker.latitude < -90 || marker.latitude > 90 || marker.longitude < -180 || marker.longitude > 180) { + console.error('请正确设置marker的经纬度') + return + } + const pt = new BMapGL.Point(marker.longitude, marker.latitude) + const markerObj = new BMapGL.Marker(pt, { enableClicking: true }) + + markerObj.id = marker.id // 设置标记点的唯一标识符 + markerObj.alpha = marker.alpha + if (marker.zIndex) { + markerObj.setZIndex(marker.zIndex) + } + if (marker.width && marker.height) { + const canvas = document.createElement('canvas') + canvas.width = marker.width * 2 + canvas.height = marker.height * 2 + // 获取 Canvas 上下文 + const ctx = canvas.getContext('2d')! + // 创建一个新的图片对象 + const img = new Image() + // 设置图片的跨域属性 + img.crossOrigin = 'Anonymous' + img.src = marker.iconPath + // 当图片加载完成后，将其绘制到Canvas上 + img.onload = function () { + ctx.drawImage(img, 0, 0, marker.width * 2, marker.height * 2) + // 创建 BMapGL.Icon 对象，并将 Canvas 元素作为图标的内容 + // 设置锚点偏移量为(0, 0)，表示图标的左上角将与经纬度对齐 + const icon = new BMapGL.Icon(canvas.toDataURL(), new BMapGL.Size(marker.width, marker.height), { + anchor: new BMapGL.Size(0, 0) + }) + markerObj.setIcon(icon) + } + } else { + const img = new Image() + img.src = marker.iconPath + img.style.opacity = String(marker.alpha) + img.onload = () => { + const iconSize = new BMapGL.Size(img.width, img.height) + const icon = new BMapGL.Icon(img.src, iconSize) + icon.imageOffset = new BMapGL.Size(0, 0, marker.alpha || 1) + markerObj.setIcon(icon) + } + } + const rotate = marker.rotate ? marker.rotate : 0 + if (rotate >= 0 && rotate <= 360) { + markerObj.setRotation(rotate) + } + // 如果anchor.x和anchor.y被定义，则使用它们的值，否则使用默认值 + const anchorX = marker.anchor?.x ?? 0.5 + const anchorY = marker.anchor?.y ?? 1 + if (anchorX >= 0 && anchorX <= 1 && anchorY >= 0 && anchorY <= 1) { + // 锚点设置为图标宽度的负值乘以x，以向左移动 + const offsetX = -(anchorX) * ((marker.width as number) || 0) + // 锚点设置为图标高度的负值乘以y，以向上移动 + const offsetY = -(anchorY) * ((marker.height as number) || 0) + // 使用计算出的偏移量设置标注对象的偏移 + markerObj.setOffset(new BMapGL.Size(offsetX, offsetY)) + } else { + const offsetX = -0.5 * ((marker.width as number) || 0) + const offsetY = -1 * ((marker.height as number) || 0) + markerObj.setOffset(new BMapGL.Size(offsetX, offsetY)) + } + // 创建title + if (!marker.callout && marker.title) { + const hammer = new Hammer(this.mapRef) // 创建Hammer对象，绑定到地图容器 + hammer.on('tap', (e) => { + // 使用tap事件替代click事件 + const touch = e.center + const x = touch.x + const y = touch.y + // 假设阈值为 10，表示点击距离小于 10 个像素时认为是点击到了标记点 + const threshold = 15 + // 遍历标记点数组，计算触摸位置与每个标记点的距离 + this.markers.forEach((marker) => { + // 通过class名获取地图容器 + const mapContainer = document.getElementsByClassName('bmap-container')[0] + // 获取地图容器在屏幕上的偏移量 + const mapContainerRect = mapContainer.getBoundingClientRect() + const mapOffsetX = mapContainerRect.left + const mapOffsetY = mapContainerRect.top + const point = new BMapGL.Point(marker.longitude, marker.latitude) + const pixel = this.map.pointToPixel(point) + const markerX = pixel.x + mapOffsetX + const markerY = pixel.y + mapOffsetY + // 计算触摸位置与标记点的距离 + const distance = Math.sqrt(Math.pow(x - markerX, 2) + Math.pow(y - markerY, 2)) + if (distance < threshold && marker.id === markerObj.id) { + // 最近的标记点距离小于阈值，表示用户点击到了标记点 + const content = `
${marker.title}
` + const infoWindow = new BMapGL.InfoWindow(content) + this.map.openInfoWindow(infoWindow, pt) + } + }) + }) + } + if (marker.callout) { + const offsetX = marker.callout?.anchorX ? marker.callout?.anchorX : 0 // 横向偏移量 + const offsetY = marker.callout?.anchorY ? marker.callout?.anchorY : 0 // 纵向偏移量 + // 创建气泡(callout)对象 + const callout = new BMapGL.InfoWindow( + `
+

${marker.callout?.content || ''}

+
`, + { + width: 200, // 气泡宽度 + height: 100, // 气泡高度 + offset: new BMapGL.Size(offsetX - 24, offsetY - 20), // 设置偏移量 + } + ) + // 自定义属性存储气泡(callout)对象 + markerObj.callout = callout + // 将气泡(callout)对象绑定到标记(marker)对象上 + this.map.addOverlay(markerObj) + if (marker.callout?.display === 'ALWAYS') { + markerObj.callout.disableCloseOnClick() + const point = markerObj.getPosition() // 获取marker标记点的位置 + markerObj.callout.addEventListener('open', function () { + const infoWindowElement = document.querySelector('.BMap_bubble_pop') + if (infoWindowElement) { + let triangle = infoWindowElement.querySelector('.triangle') + if (!triangle) { + // 如果不存在，则创建并添加新的三角形 div + triangle = document.createElement('div') + triangle.className = 'triangle' // 添加一个类名以便日后查找 + infoWindowElement.appendChild(triangle) + } + + const img = document.querySelector('.BMap_bubble_pop>img') + if (img) { + img.setAttribute('style', `position: absolute;transform: translate(-50%, 0); top: ${point.lat - 100}px; left: ${point.lng - 20}px;display:none`) + } + const backgroundcolor = marker.callout?.bgColor + let borderWidth = marker.callout?.borderWidth || 5 + const borderColor = marker.callout?.borderColor + const borderRadius = marker.callout?.borderRadius + // 确保边框大小不超过15 + borderWidth = Math.min(borderWidth, 15) + triangle.setAttribute('style', `width:0;height:0;borderLeft:${borderWidth}px solid transparent;borderRight:${borderWidth}px solid transparent;borderTop:${borderWidth}px solid ${borderColor};position:absolute;left:83px;bottom:-${2 * borderWidth}px`) + infoWindowElement.setAttribute('style', `background-color:${backgroundcolor};top:${point.lat - 120}px; left:${point.lng - 100}px;position: absolute;border: ${borderWidth}px solid ${borderColor};border-radius:${borderRadius}px; `) + } + }) + this.map.openInfoWindow(markerObj.callout, pt) + } else { + const hammer = new Hammer(this.mapRef) // 创建Hammer对象，绑定到地图容器 + hammer.on('tap', (e) => { + // 使用tap事件替代click事件 + const touch = e.center + const x = touch.x + const y = touch.y + // 假设阈值为 10，表示点击距离小于 10 个像素时认为是点击到了标记点 + const threshold = 15 + // 遍历标记点数组，计算触摸位置与每个标记点的距离 + this.markers.forEach((marker) => { + // 通过class名获取地图容器 + const mapContainer = document.getElementsByClassName('bmap-container')[0] + // 获取地图容器在屏幕上的偏移量 + const mapContainerRect = mapContainer.getBoundingClientRect() + const mapOffsetX = mapContainerRect.left + const mapOffsetY = mapContainerRect.top + const point = new BMapGL.Point(marker.longitude, marker.latitude) + const pixel = this.map.pointToPixel(point) + const markerX = pixel.x + mapOffsetX + const markerY = pixel.y + mapOffsetY + // 计算触摸位置与标记点的距离 + const distance = Math.sqrt(Math.pow(x - markerX, 2) + Math.pow(y - markerY, 2)) + if (distance < threshold && marker.id === markerObj.id) { + const point = markerObj.getPosition() // 获取marker标记点的位置 + markerObj.callout.addEventListener('open', function () { + const infoWindowElement = document.querySelector('.BMap_bubble_pop') + if (infoWindowElement) { + let triangle = infoWindowElement.querySelector('.triangle') + if (!triangle) { + // 如果不存在，则创建并添加新的三角形 div + triangle = document.createElement('div') + triangle.className = 'triangle' // 添加一个类名以便日后查找 + infoWindowElement.appendChild(triangle) + } + + const img = document.querySelector('.BMap_bubble_pop>img') + if (img) { + img.setAttribute('style', `position: absolute;transform: translate(-50%, 0); top: ${point.lat - 100}px; left: ${point.lng - 20}px;display:none`) + } + const backgroundcolor = marker.callout?.bgColor + let borderWidth = marker.callout?.borderWidth || 5 + const borderColor = marker.callout?.borderColor + const borderRadius = marker.callout?.borderRadius + // 确保边框大小不超过15 + borderWidth = Math.min(borderWidth, 15) + triangle.setAttribute('style', `width:0;height:0;border-left:${borderWidth}px solid transparent;border-right:${borderWidth}px solid transparent;border-top:${borderWidth}px solid ${borderColor};position:absolute;left:83px;bottom:-${2 * borderWidth}px`) + infoWindowElement.setAttribute('style', `background-color:${backgroundcolor};top:${point.lat - 120}px; left:${point.lng - 100}px;position: absolute;border: ${borderWidth}px solid ${borderColor};border-radius:${borderRadius}px; `) + } + }) + // 最近的标记点距离小于阈值，表示用户点击到了标记点 + this.map.openInfoWindow(markerObj.callout, pt) + } else { + markerObj.callout.enableCloseOnClick() + // 用户点击到了地图上的其他位置，不是标记点 + } + }) + }) + } + } + + // 判断是否有label属性 + if (marker.label) { + const labelContent = marker.label.content || '' + const labelOpts = { + position: pt, + offset: new BMapGL.Size(marker.label.anchorX || 0, marker.label.anchorY || 0), + } + const label = new BMapGL.Label(labelContent, labelOpts) + const borderColor = marker.label.borderColor ? marker.label.borderColor : 'white' + // 设置标签样式 + label.setStyle({ + color: marker.label.color, + fontSize: marker.label.fontSize + 'px', + borderWidth: marker.label.borderWidth + 'px', + borderColor: borderColor, + borderRadius: marker.label.borderRadius + 'px', + background: marker.label.bgColor, + padding: marker.label.padding + 'px', + }) + markerObj.setLabel(label) + } + this.map.addOverlay(markerObj) + } else { + console.error('请检查marker经纬度和marker自定义图标路径和id值') + } + }) + } + + + public loadMapScript (): Promise { + return new Promise((resolve, reject) => { + const script = document.createElement('script') + script.src = 'https://api.map.baidu.com/getscript?v=3.0&type=webgl&ak=Mb1FLBD3gfnY6bup4v6zEWh6MXwsZ9eo' + script.defer = true + script.onload = () => resolve() + script.onerror = reject + script.type = 'text/javascript' + document.head.appendChild(script) + }) + } + + + public async LoadBmapLibScript (): Promise { + return new Promise((resolve, reject) => { + // 地图加载完成后再加载BMapGLLib + const bmapLibScript = document.createElement('script') + bmapLibScript.src = '//mapopen.bj.bcebos.com/github/BMapGLLib/AreaRestriction/src/AreaRestriction.min.js' + bmapLibScript.defer = true + bmapLibScript.type = 'text/javascript' + bmapLibScript.onload = () => { + resolve() + } + bmapLibScript.onerror = reject + document.head.appendChild(bmapLibScript) + }) + } + + /* 获取当前地图中心的经纬度 */ + + _getCenterLocation = (option) => { + // 遍历当前的覆盖物，找到之前添加的中心点图标并删除它 + this.map.getOverlays().forEach((overlay) => { + if (overlay instanceof BMapGL.Marker && overlay.isCenterMarker) { + this.map.removeOverlay(overlay) + } + }) + // 创建自定义图标并设置图标位置 + option.iconPath = 'https://img0.baidu.com/it/u=2604176863,3349829508&fm=253&fmt=auto&app=138&f=PNG?w=243&h=243' + const icon = new BMapGL.Icon(option.iconPath, new BMapGL.Size(20, 30)) + // 将经纬度从BD09转换为GCJ02 + const gcj02Point = [this.longitude, this.latitude] + const marker = new BMapGL.Marker(new BMapGL.Point(this.longitude, this.latitude), { icon }) + marker.isCenterMarker = true // 标记该覆盖物是中心点图标 + // 添加新的图标 + this.map.addOverlay(marker) + return gcj02Point + } + + /* 设置定位点图标，支持网络路径、本地路径、代码包路径 */ + _setLocMarkerIcon = (option) => { + // 创建自定义图标 + const icon = new BMapGL.Icon(option.iconPath, new BMapGL.Size(20, 30)) + + // 创建定位点并设置图标 + const point = new BMapGL.Point(116.404, 39.915) + const marker = new BMapGL.Marker(point, { icon }) + this.map.addOverlay(marker) + } + + /* 平移marker，带动画 */ + _translateMarker = (option) => { + let latitude = option.destination.latitude + const longitude = option.destination.longitude + if (latitude < -80 && latitude >= -90) { + latitude = option.destination.latitude + 10 + } + const destinationPoint = new BMapGL.Point(longitude, latitude) + const obj: any = { + flagId: true, // 标记是否有有效id + flagCoordinate: true // 标记是否有有效经纬度 + } + const animationEndResult: any = { + errMsg: 'animationEnd:ok', + } + // 获取所有覆盖物 + const overlays = this.map.getOverlays() + // 查找指定 id 的 Marker 对象 + const targetMarker = overlays.find( + (overlay: any) => overlay instanceof BMapGL.Marker && overlay.id === option.markerId + ) + if (!targetMarker) { + console.error(`Marker "${option.markerId}" not found.`) + obj.flagId = false + return obj + } + + if (latitude > 90 || latitude < -90 || longitude > 180 || longitude < -180 || isNaN(latitude) || isNaN(longitude)) { + obj.flagCoordinate = false + return obj + } + // 计算平移步长 + const startLngLat = targetMarker.getPosition() + const step = { + lng: (destinationPoint.lng - startLngLat.lng) / (option.duration / 16), // 每帧移动的经度增量 + lat: (destinationPoint.lat - startLngLat.lat) / (option.duration / 16), // 每帧移动的纬度增量 + } + + // 计算旋转角度的步长 + const startRotation = targetMarker.getRotation() // 获取起始旋转角度 + const targetRotation = option.rotate // 设置目标旋转角度 + if (!this.currentRotation) { + this.currentRotation = targetRotation + } else { + this.currentRotation += targetRotation + } + const rotationStep = (this.currentRotation - startRotation) / (option.duration / 16) + + // 执行平移动画 + let currentLngLat = startLngLat + let currentRotation = startRotation + + if (!option.moveWithRotate && option.autoRotate) { + let currentFrame = 0 // 用于平移动画的计数器 + // 执行平移动画 + const animationInterval = setInterval(() => { + currentLngLat = new BMapGL.Point(currentLngLat.lng + step.lng, currentLngLat.lat + step.lat) + targetMarker.setPosition(currentLngLat) + currentFrame++ + if (currentFrame >= option.duration / 16) { + clearInterval(animationInterval) + let rotationFrame = 0 // 用于旋转动画的计数器 + // 在到达目的地后执行旋转动画 + const rotationInterval = setInterval(() => { + currentRotation += rotationStep + targetMarker.setRotation(currentRotation) + rotationFrame++ + if (rotationFrame >= option.duration / 16) { + clearInterval(rotationInterval) // 清除旋转动画的定时器 + option?.animationEnd(animationEndResult) + } + }, 16) + } + }, 16) + } else if (option.moveWithRotate && option.autoRotate) { + let currentFrame = 0 // 定义局部变量 + const animationInterval = setInterval(() => { + currentLngLat = new BMapGL.Point(currentLngLat.lng + step.lng, currentLngLat.lat + step.lat) + targetMarker.setPosition(currentLngLat) + currentRotation += rotationStep + targetMarker.setRotation(currentRotation) + currentFrame++ + if (currentFrame >= option.duration / 16) { + clearInterval(animationInterval) + option?.animationEnd(animationEndResult) + } + }, 16) + } else if (option.moveWithRotate && !option.autoRotate) { + let currentFrame = 0 // 定义局部变量 + const animationInterval = setInterval(() => { + currentLngLat = new BMapGL.Point(currentLngLat.lng + step.lng, currentLngLat.lat + step.lat) + targetMarker.setPosition(currentLngLat) + currentFrame++ + if (currentFrame >= option.duration / 16) { + clearInterval(animationInterval) + option?.animationEnd(animationEndResult) + } + }, 16) + } + return obj + } + + /* 缩放视野展示所有经纬度 */ + _includePoints = (option) => { + const bPoints = option.points.map((point) => new BMapGL.Point(point.longitude, point.latitude)) + const originalZoom = this.map.getZoom() + const originalCenter = this.map.getCenter() + const view = this.map.getViewport(bPoints) + // 地图缩放后 + this.map.centerAndZoom(view.center, view.zoom) + const bounds = this.map.getBounds() + let flag = true + for (let i = 0; i < bPoints.length; i++) { + if (!bounds.containsPoint(bPoints[i])) { + this.map.centerAndZoom(originalCenter, originalZoom) + flag = false + break + } + } + return flag + } + + /* 获取当前地图的视野范围 */ + _getRegion = () => { + // 获取地图当前视野范围 + const bounds = this.map.getBounds() + const sw = bounds.getSouthWest() // 西南角坐标 + const ne = bounds.getNorthEast() // 东北角坐标 + + return { + southwest: { lat: sw.lat, lng: sw.lng }, + northeast: { lat: ne.lat, lng: ne.lng }, + } + } + + /* 获取当前地图的旋转角 */ + _getRotate = () => { + // 获取地图当前旋转角度 + let rotation = this.rotate + if (rotation < 0 || rotation > 360) { + rotation = 0 + } + return rotation + } + + /* 获取当前地图的倾斜角 */ + _getSkew = () => { + let Skew = this.skew + if (Skew < 0 || Skew > 40) { + Skew = 0 + } + return Skew + } + + /* 获取当前地图的缩放级别 */ + _getScale = () => { + const Scale = this.scale + return Scale + } + + /* 设置地图中心点偏移，向后向下为增长 */ + _setCenterOffset = (option) => { + // 解构获取偏移量参数 + const [x, y] = option.offset + // 获取地图尺寸 + const mapSize = this.map.getSize() + // 计算水平偏移量 + const offsetX = Math.max(0.25 * mapSize.width, Math.min(0.75 * mapSize.width, x * mapSize.width)) + // 计算垂直偏移量 + const offsetY = Math.max(0.25 * mapSize.height, Math.min(0.75 * mapSize.height, y * mapSize.height)) + // 创建像素坐标对象 + const pixel = new BMapGL.Pixel(offsetX, offsetY) + // 将像素坐标转换为地理坐标 + const center = this.map.pixelToPoint(pixel) + // 平移地图至指定中心点 + this.map.panTo(center) + } + + /* 添加 marker */ + _addMarkers = (option) => { + if (option.clear) { + // 清除地图上所有marker + this.map.clearOverlays(this.markers) + } + + option.markers.forEach((marker) => { + if (marker.latitude && marker.longitude && marker.iconPath) { + const pt = new BMapGL.Point(marker.longitude, marker.latitude) + const markerObj = new BMapGL.Marker(pt, { enableClicking: true }) + this.map.addOverlay(markerObj) + markerObj.id = marker.id // 设置标记点的唯一标识符 + markerObj.alpha = marker.alpha + if (marker.zIndex) { + markerObj.setZIndex(marker.zIndex) + } + if (marker.width && marker.height && marker.iconPath) { + const icon = new BMapGL.Icon(marker.iconPath, new BMapGL.Size(marker.width, marker.height)) + markerObj.setIcon(icon) + } else if (marker.iconPath) { + const img = new Image() + img.src = marker.iconPath + img.style.opacity = String(marker.alpha) + img.onload = () => { + const iconSize = new BMapGL.Size(img.width, img.height) + const icon = new BMapGL.Icon(img.src, iconSize) + icon.imageOffset = new BMapGL.Size(0, 0, marker.alpha || 1) + markerObj.setIcon(icon) + } + } else { + console.error('没有找到iconPath图片路径') + return + } + const rotate = marker.rotate ? marker.rotate : 0 + if (rotate) { + markerObj.setRotation(rotate) + } + if (marker.anchor) { + const offsetX = (marker.anchor?.x ?? 0) * ((marker.width as number) || 0) + const offsetY = (marker.anchor?.y ?? 0) * ((marker.height as number) || 0) + markerObj.setOffset(new BMapGL.Size(offsetX, offsetY)) + } + // 创建title + if (!marker.callout && marker.title) { + const hammer = new Hammer(this.mapRef) // 创建Hammer对象，绑定到地图容器 + hammer.on('tap', (e) => { + // 使用tap事件替代click事件 + const touch = e.center + const x = touch.x + const y = touch.y + // 假设阈值为 10，表示点击距离小于 10 个像素时认为是点击到了标记点 + const threshold = 15 + // 遍历标记点数组，计算触摸位置与每个标记点的距离 + option.markers.forEach((marker) => { + // 通过class名获取地图容器 + const mapContainer = document.getElementsByClassName('bmap-container')[0] + // 获取地图容器在屏幕上的偏移量 + const mapContainerRect = mapContainer.getBoundingClientRect() + const mapOffsetX = mapContainerRect.left + const mapOffsetY = mapContainerRect.top + const point = new BMapGL.Point(marker.longitude, marker.latitude) + const pixel = this.map.pointToPixel(point) + const markerX = pixel.x + mapOffsetX + const markerY = pixel.y + mapOffsetY + // 计算触摸位置与标记点的距离 + const distance = Math.sqrt(Math.pow(x - markerX, 2) + Math.pow(y - markerY, 2)) + if (distance < threshold && marker.id === markerObj.id) { + // 最近的标记点距离小于阈值，表示用户点击到了标记点 + const content = `
${marker.title}
` + const infoWindow = new BMapGL.InfoWindow(content) + this.map.openInfoWindow(infoWindow, pt) + } + }) + }) + } + if (marker.callout) { + const offsetX = marker.callout?.anchorX ? marker.callout?.anchorX : 0 // 横向偏移量 + const offsetY = marker.callout?.anchorY ? marker.callout?.anchorY : 0 // 纵向偏移量 + // 创建气泡(callout)对象 + const callout = new BMapGL.InfoWindow( + `
+

${marker.callout?.content || ''}

+
`, + { + width: 200, // 气泡宽度 + height: 100, // 气泡高度 + offset: new BMapGL.Size(offsetX - 24, offsetY - 20), // 设置偏移量 + } + ) + // 自定义属性存储气泡(callout)对象 + markerObj.callout = callout + // 将气泡(callout)对象绑定到标记(marker)对象上 + this.map.addOverlay(markerObj) + if (marker.callout?.display === 'ALWAYS') { + markerObj.callout.disableCloseOnClick() + const point = markerObj.getPosition() // 获取marker标记点的位置 + markerObj.callout.addEventListener('open', function () { + console.log(markerObj.callout) + const infoWindowElement = document.querySelector('.BMap_bubble_pop') + if (infoWindowElement) { + let triangle = infoWindowElement.querySelector('.triangle') + if (!triangle) { + // 如果不存在，则创建并添加新的三角形 div + triangle = document.createElement('div') + triangle.className = 'triangle' // 添加一个类名以便日后查找 + infoWindowElement.appendChild(triangle) + } + + const img = document.querySelector('.BMap_bubble_pop>img') + if (img) { + img.setAttribute('style', `position: absolute;transform: translate(-50%, 0); top: ${point.lat - 100}px; left: ${point.lng - 20}px;display:none`) + } + const backgroundcolor = marker.callout?.bgColor + let borderWidth = marker.callout?.borderWidth || 5 + const borderColor = marker.callout?.borderColor + const borderRadius = marker.callout?.borderRadius + // 确保边框大小不超过15 + borderWidth = Math.min(borderWidth, 15) + + triangle.setAttribute('style', `width:0;height:0;border-left:${borderWidth}px solid transparent;border-right:${borderWidth}px solid transparent;border-top:${borderWidth}px solid ${borderColor};position:absolute;left:83px;bottom:-${2 * borderWidth}px`) + + infoWindowElement.setAttribute('style', `background-color:${backgroundcolor};top:${point.lat - 120}px; left:${point.lng - 100}px;position: absolute;border: ${borderWidth}px solid ${borderColor};border-radius:${borderRadius}px; `) + } + }) + this.map.openInfoWindow(markerObj.callout, pt) + } else { + const hammer = new Hammer(this.mapRef) // 创建Hammer对象，绑定到地图容器 + hammer.on('tap', (e) => { + // 使用tap事件替代click事件 + const touch = e.center + const x = touch.x + const y = touch.y + // 假设阈值为 10，表示点击距离小于 10 个像素时认为是点击到了标记点 + const threshold = 15 + // 遍历标记点数组，计算触摸位置与每个标记点的距离 + option.markers.forEach((marker) => { + // 通过class名获取地图容器 + const mapContainer = document.getElementsByClassName('bmap-container')[0] + // 获取地图容器在屏幕上的偏移量 + const mapContainerRect = mapContainer.getBoundingClientRect() + const mapOffsetX = mapContainerRect.left + const mapOffsetY = mapContainerRect.top + const point = new BMapGL.Point(marker.longitude, marker.latitude) + const pixel = this.map.pointToPixel(point) + const markerX = pixel.x + mapOffsetX + const markerY = pixel.y + mapOffsetY + // 计算触摸位置与标记点的距离 + const distance = Math.sqrt(Math.pow(x - markerX, 2) + Math.pow(y - markerY, 2)) + if (distance < threshold && marker.id === markerObj.id) { + const point = markerObj.getPosition() // 获取marker标记点的位置 + markerObj.callout.addEventListener('open', function () { + console.log(markerObj.callout) + const infoWindowElement = document.querySelector('.BMap_bubble_pop') + if (infoWindowElement) { + let triangle = infoWindowElement.querySelector('.triangle') + if (!triangle) { + // 如果不存在，则创建并添加新的三角形 div + triangle = document.createElement('div') + triangle.className = 'triangle' // 添加一个类名以便日后查找 + infoWindowElement.appendChild(triangle) + } + + const img = document.querySelector('.BMap_bubble_pop>img') + if (img) { + img.setAttribute('style', `position: absolute;transform: translate(-50%, 0); top: ${point.lat - 100}px; left: ${point.lng - 20}px;display:none`) + } + const backgroundcolor = marker.callout?.bgColor + let borderWidth = marker.callout?.borderWidth || 5 + const borderColor = marker.callout?.borderColor + const borderRadius = marker.callout?.borderRadius + // 确保边框大小不超过15 + borderWidth = Math.min(borderWidth, 15) + triangle.setAttribute('style', `width:0;height:0;border-left:${borderWidth}px solid transparent;border-right:${borderWidth}px solid transparent;border-top:${borderWidth}px solid ${borderColor};position:absolute;left:83px;bottom:-${2 * borderWidth}px`) + infoWindowElement.setAttribute('style', `background-color:${backgroundcolor};top:${point.lat - 120}px; left:${point.lng - 100}px;position: absolute;border: ${borderWidth}px solid ${borderColor};border-radius:${borderRadius}px; `) + } + }) + // 最近的标记点距离小于阈值，表示用户点击到了标记点 + this.map.openInfoWindow(markerObj.callout, pt) + } else { + markerObj.callout.enableCloseOnClick() + // 用户点击到了地图上的其他位置，不是标记点 + } + }) + }) + } + } + + // 判断是否有label属性 + if (marker.label) { + const labelContent = marker.label.content || '' + const labelOpts = { + position: pt, + offset: new BMapGL.Size(marker.label.anchorX || 0, marker.label.anchorY || 0), + } + const label = new BMapGL.Label(labelContent, labelOpts) + // 设置标签样式 + label.setStyle({ + color: marker.label.color, + fontSize: marker.label.fontSize + 'px', + borderWidth: marker.label.borderWidth + 'px', + borderColor: marker.label.borderColor, + borderRadius: marker.label.borderRadius + 'px', + background: marker.label.bgColor, + padding: marker.label.padding + 'px', + }) + markerObj.setLabel(label) + } + } + }) + } + + /* 移除 marker */ + _removeMarkers = (option) => { + // 获取所有覆盖物 + const overlays = this.map.getOverlays() + let newTargetMarker = {} + option.markerIds.forEach((id) => { + // 查找指定 id 的 Marker 对象 + const targetMarker = overlays.find( + (overlay: any) => overlay instanceof BMapGL.Marker && String(overlay.id) === id + ) + newTargetMarker = targetMarker + this.map.removeOverlay(targetMarker) + }) + return newTargetMarker + } + + /* 沿指定路径移动 marker，用于轨迹回放等场景。动画完成时触发回调事件，若动画进行中，对同一 marker 再次调用 moveAlong 方法，前一次的动画将被打断 */ + _moveAlong = (object) => { + const path = object.path + const targetMarkerId = object.markerId + const duration = object.duration + const autoRotate = object.autoRotate + const targetMarker = this.map.getOverlays().find((overlay) => overlay instanceof BMapGL.Marker && overlay.id === targetMarkerId) + const points = path.map((p) => new BMapGL.Point(p.longitude, p.latitude)) + const obj: any = { + flagId: true, // 标记是否有有效id + flagCoordinate: true // 标记是否有有效经纬度 + } + + if (!targetMarker) { + console.error(`Marker "${targetMarkerId}" not found.`) + obj.flagId = false + return obj + } + + for (let i = 0; i < points.length; i++) { + const point = points[i] + if (point.lat < -80 && point.lat >= -90) { + point.lat += 10 + } + if (point.lng < -180 || point.lng > 180 || point.lat < -90 || point.lat > 90 || isNaN(point.lng) || isNaN(point.lat)) { + obj.flagCoordinate = false + return obj + } + } + + if (obj.flagId && obj.flagCoordinate) { + const startTime = performance.now() + + const animate = (timestamp) => { + const elapsedTime = timestamp - startTime + const progress = Math.min(elapsedTime / duration, 1) + const currentPoint = this.getPointOnPath(points, progress) + targetMarker.setPosition(currentPoint) + + if (autoRotate && progress < 1) { + const nextPoint = this.getPointOnPath(points, Math.min(progress + 0.01, 1)) // 获取前进一点的点 + const rotation = this.calculateRotation(currentPoint, nextPoint) + targetMarker.setRotation(rotation) + } + + if (progress < 1) { + requestAnimationFrame(animate) + } else { + // 动画结束 + targetMarker.setPosition(points[points.length - 1]) // 设置 marker 位置为路径的最后一个点 + targetMarker.setRotation(0) // 恢复旋转角度为0 + } + } + + requestAnimationFrame(animate) + } + + return obj + } + + getPointOnPath = (points, progress) => { + const totalLength = this.calculateTotalLength(points) + const targetLength = totalLength * progress + let currentLength = 0 + for (let i = 0; i < points.length - 1; i++) { + const segmentLength = this.map.getDistance(points[i], points[i + 1]) + if (currentLength + segmentLength >= targetLength) { + const ratio = (targetLength - currentLength) / segmentLength + const deltaX = points[i + 1].lng - points[i].lng + const deltaY = points[i + 1].lat - points[i].lat + const newLng = points[i].lng + deltaX * ratio + const newLat = points[i].lat + deltaY * ratio + return new BMapGL.Point(newLng, newLat) + } + currentLength += segmentLength + } + // 如果进度超出路径长度，返回路径的最后一个点 + return points[points.length - 1] + } + + calculateTotalLength = (points) => { + let totalLength = 0 + for (let i = 0; i < points.length - 1; i++) { + totalLength += this.map.getDistance(points[i], points[i + 1]) + } + return totalLength + } + + calculateRotation = (currentPoint, nextPoint) => { + const dx = nextPoint.lng - currentPoint.lng + const dy = nextPoint.lat - currentPoint.lat + let angle = Math.atan2(dy, dx) * (180 / Math.PI) + angle = 90 - angle + return angle + } + + /* 创建自定义图片图层，图片会随着地图缩放而缩放 */ + _addGroundOverlay = (option) => { + const { src, opacity, bounds, visible, id, zIndex } = option + let flag = true + if (bounds.southwest.longitude >= bounds.northeast.longitude || bounds.southwest.latitude >= bounds.northeast.latitude) { + flag = false + return + } + + if (bounds.southwest.latitude > 90 || bounds.southwest.latitude < -90 || bounds.southwest.longitude > 180 || bounds.southwest.longitude < -180 || isNaN(bounds.southwest.latitude) || isNaN(bounds.southwest.longitude)) { + flag = false + return + } + + if (bounds.northeast.latitude > 90 || bounds.northeast.latitude < -90 || bounds.northeast.longitude > 180 || bounds.northeast.longitude < -180 || isNaN(bounds.northeast.latitude) || isNaN(bounds.northeast.longitude)) { + flag = false + return + } + + // 创建覆盖物边界对象 + const overlayBounds = new BMapGL.Bounds( + new BMapGL.Point(bounds.southwest.longitude, bounds.southwest.latitude), + new BMapGL.Point(bounds.northeast.longitude, bounds.northeast.latitude) + ) + // 定义 GroundOverlay类 + function GroundOverlay (bounds, imageUrl, map, visible, opacity, zIndex, id) { + this._bounds = bounds + this._imageUrl = imageUrl + this._map = map + this._visible = visible + this._opacity = opacity + this._zIndex = zIndex + this._id = id + } + // 继承 BMapGL.Overlay + GroundOverlay.prototype = new BMapGL.Overlay() + // 初始化方法 + GroundOverlay.prototype.initialize = function (map) { + // 移除已存在的元素 + if (document.getElementById(this._id)) { + const element = document.getElementById(this._id) + element?.remove() + } + + this._map = map + + if (!this._div) { + // 创建 div 元素并设置样式 + const div = document.createElement('div') + div.id = this._id + div.style.position = 'absolute' + div.style.border = 'none' + div.style.zIndex = this._zIndex + + // 创建 img 元素并设置样式 + const img = document.createElement('img') + img.src = this._imageUrl + // 确保opacity值在0到1之间 + const validOpacity = (this._opacity < 0) ? '1' : this._opacity + img.style.opacity = validOpacity + div.appendChild(img) + this._div = div + } + + // 监听地图缩放事件，调整覆盖物尺寸 + map.addEventListener('zoomend', () => { + const swPixel = map.pointToOverlayPixel(this._bounds.getSouthWest()) + const nePixel = map.pointToOverlayPixel(this._bounds.getNorthEast()) + const width = nePixel.x - swPixel.x + const height = swPixel.y - nePixel.y + + this._div.style.width = width + 'px' + this._div.style.height = height + 'px' + + const img = this._div.querySelector('img') + img.style.width = width + 'px' + img.style.height = height + 'px' + }) + + // 将 div 元素添加到地图覆盖物层 + map.getPanes().labelPane.appendChild(this._div) + + return this._div + } + + // 绘制方法 + GroundOverlay.prototype.draw = function () { + // 设置 div 元素位置和尺寸 + const _northeast = { + lat: option.bounds.northeast.latitude, + lng: option.bounds.southwest.longitude + } + const position = this._map.pointToOverlayPixel(_northeast) + this._div.style.left = position.x + 'px' + this._div.style.top = position.y + 'px' + + const bounds = this._map.getBounds() + const sw = this._map.pointToPixel(bounds.getSouthWest()) + const ne = this._map.pointToPixel(bounds.getNorthEast()) + const width = ne.x - sw.x + const height = ne.y - sw.y + + const zoom = this._map.getZoom() + + const imageWidth = width * Math.pow(2, 18 - zoom) + const imageHeight = height * Math.pow(2, 18 - zoom) + + this._div.style.width = imageWidth + 'px' + this._div.style.height = imageHeight + 'px' + this._div.style.display = this._visible ? 'block' : 'none' + const validOpacity = (this._opacity < 0) ? '1' : this._opacity + this._div.getElementsByTagName('img')[0].style.opacity = validOpacity + } + + // 创建 GroundOverlay 实例 + const overlay = new GroundOverlay(overlayBounds, src, this.map, visible, opacity, zIndex, id) + + this.map.addOverlay(overlay) + // 对所有覆盖物进行排序 + const overlays = this.map.getOverlays().sort((a, b) => a._zIndex - b._zIndex) + this.groundOverlay = overlay + // 将所有覆盖物重新绘制 + overlays.forEach((overlay) => overlay.draw()) + const zoom = this.map.getZoom() + if (zoom < 20) { + this.map.setZoom(zoom + 1) + this.map.setZoom(zoom) + } else { + this.map.setZoom(zoom - 1) + this.map.setZoom(zoom) + } + return flag + } + + /* 更新自定义图片图层 */ + _updateGroundOverlay = (option) => { + const { src, opacity, bounds, visible, id, zIndex } = option + let obj: any + let flagId = true // 标记是否有id + let flagCoordinate = true // 标记是否有有效经纬度 + let flagObj = {} + + // 获取所有图层 + const overlays = this.map.getOverlays() + // 找到要更新的图层 + const targetOverlay = overlays.find((overlay) => overlay._id === id) + + if (!targetOverlay) { + flagId = false + flagObj = { + flagId: flagId, + flagCoordinate: flagCoordinate + } + obj = { ...flagObj } + return obj + } + + if (bounds.southwest.longitude >= bounds.northeast.longitude || bounds.southwest.latitude >= bounds.northeast.latitude) { + flagCoordinate = false + flagObj = { + flagId: flagId, + flagCoordinate: flagCoordinate + } + obj = { ...flagObj } + } + + if (bounds.southwest.latitude > 90 || bounds.southwest.latitude < -90 || bounds.southwest.longitude > 180 || bounds.southwest.longitude < -180 || isNaN(bounds.southwest.latitude) || isNaN(bounds.southwest.longitude)) { + flagCoordinate = false + flagObj = { + flagId: flagId, + flagCoordinate: flagCoordinate + } + obj = { ...flagObj } + } + + if (bounds.northeast.latitude > 90 || bounds.northeast.latitude < -90 || bounds.northeast.longitude > 180 || bounds.northeast.longitude < -180 || isNaN(bounds.northeast.latitude) || isNaN(bounds.northeast.longitude)) { + flagCoordinate = false + flagObj = { + flagId: flagId, + flagCoordinate: flagCoordinate + } + obj = { ...flagObj } + } + + if (flagId && flagCoordinate) { + const targetBounds = new BMapGL.Bounds( + new BMapGL.Point(bounds.southwest.longitude, bounds.southwest.latitude), + new BMapGL.Point(bounds.northeast.longitude, bounds.northeast.latitude) + ) + const zoom = this.map.getZoom() + + if (targetOverlay) { + // 更新DOM元素 + const element = document.getElementById(id) + if (element) { + const imgElement = element.querySelector('img') + if (imgElement) { + // 找到了对应的元素 + const validOpacity = (opacity < 0) ? '1' : opacity + element.style.opacity = validOpacity + imgElement.style.display = visible ? 'block' : 'none' + element.style.zIndex = zIndex + + // 加载图片 + const image = new Image() + image.onload = () => { + // 图片加载完成后执行 + imgElement.src = src // 设置图片的src + + // 根据当前缩放级别设置图片宽高 + const lngSpan = targetBounds.getNorthEast().lng - targetBounds.getSouthWest().lng + const mapWidth = this.map.getSize().width // 获取地图容器的宽度 + const updatedImageWidth = (mapWidth / Math.pow(2, 18 - zoom)) * lngSpan + const imageAspectRatio = image.naturalHeight / image.naturalWidth + const updatedImageHeight = updatedImageWidth * imageAspectRatio + + imgElement.style.width = `${updatedImageWidth}px` + imgElement.style.height = `${updatedImageHeight}px` + + // 重新绘制图层 + targetOverlay._bounds = targetBounds + targetOverlay.draw() + + // 更新完图片后，立即重绘地图 + this.map.panTo(this.map.getCenter()) + targetOverlay.draw() + } + image.src = src + } + } + } else { + // 没有找到对应的元素 + console.error(`未找到id为${id}的元素`) + } + flagObj = { + flagId: flagId, + flagCoordinate: flagCoordinate + } + obj = { ...flagObj } + return obj + } else { + return obj + } + } + + /* 移除自定义图片图层 */ + _removeGroundOverlay = (option) => { + // 获取所有图层 + const overlays = this.map.getOverlays() + let newTargetOverlay = '' + // 找到要更新的图层 + const targetOverlay = overlays.find((overlay) => overlay._id === option.id) + newTargetOverlay = targetOverlay + if (targetOverlay) { + // 如果找到了对应的图层，执行删除操作 + this.map.removeOverlay(targetOverlay) + } + return newTargetOverlay + } + + /* 限制地图的显示范围。此接口同时会限制地图的最小缩放整数级别。 */ + _setBoundary = (option) => { + let nth = option.northeast.latitude + let sth = option.southwest.latitude + let flag = true + + if (option.northeast.latitude <= -80 && option.northeast.latitude >= -90) { + nth = option.northeast.latitude + 10 + } + if (option.southwest.latitude <= -80 && option.southwest.latitude >= -90) { + sth = option.southwest.latitude + 10 + } + if (option.northeast.latitude < -90 || option.northeast.latitude > 90 || option.northeast.longitude < -180 || option.northeast.longitude > 180 || isNaN(option.northeast.latitude) || isNaN(option.northeast.longitude) || option.northeast.longitude < option.southwest.longitude || option.northeast.latitude < option.southwest.latitude) { + flag = false + return + } + if (option.southwest.latitude < -90 || option.southwest.latitude > 90 || option.southwest.longitude < -180 || option.southwest.longitude > 180 || isNaN(option.southwest.latitude) || isNaN(option.southwest.longitude)) { + flag = false + return + } + const ne = new BMapGL.Point(option.northeast.longitude, nth) + const sw = new BMapGL.Point(option.southwest.longitude, sth) + const bounds = new BMapGL.Bounds(sw, ne) + const viewport = this.map.getViewport([ne, sw]) + + + this.map.centerAndZoom(new BMapGL.Point(viewport.center.lng, viewport.center.lat), viewport.zoom + 2) + this.map.addOverlay(new BMapGL.Polygon([ + new BMapGL.Point(bounds.sw.lng, bounds.sw.lat), + new BMapGL.Point(bounds.sw.lng, bounds.ne.lat), + new BMapGL.Point(bounds.ne.lng, bounds.ne.lat), + new BMapGL.Point(bounds.ne.lng, bounds.sw.lat) + ], { + fillOpacity: 0 + })) + + BMapGLLib.AreaRestriction.setBounds(this.map, bounds) + return flag } + render () { return ( - + +
{ + if (dom) { + this.mapRef = dom as HTMLDivElement + } + }} + style={{ width: this.width, height: this.height }} + >
+ ) } } diff --git a/packages/taro-components/src/components/map/style/map.scss b/packages/taro-components/src/components/map/style/map.scss new file mode 100644 index 000000000000..82a53579c174 --- /dev/null +++ b/packages/taro-components/src/components/map/style/map.scss @@ -0,0 +1,11 @@ +.BMap_cpyCtrl { + display: none +} + +.anchorBL img { + display: none +} + +.BMap_bubble_buttons{ + display: none +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe73e0e11d4c..2f3151d693a9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1094,6 +1094,9 @@ importers: classnames: specifier: ^2.2.5 version: registry.npmjs.org/classnames@2.3.2 + hammerjs: + specifier: ^2.0.8 + version: registry.npmjs.org/hammerjs@2.0.8 hls.js: specifier: ^1.1.5 version: registry.npmjs.org/hls.js@1.4.1 @@ -4338,7 +4341,7 @@ packages: '@babel/helper-split-export-declaration': 7.18.6 '@babel/parser': 7.23.4 '@babel/types': registry.npmjs.org/@babel/types@7.21.5 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -6638,7 +6641,7 @@ packages: '@babel/traverse': registry.npmjs.org/@babel/traverse@7.21.5 '@babel/types': registry.npmjs.org/@babel/types@7.21.5 convert-source-map: registry.npmjs.org/convert-source-map@1.9.0 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) gensync: registry.npmjs.org/gensync@1.0.0-beta.2 json5: registry.npmjs.org/json5@2.2.3 semver: registry.npmjs.org/semver@6.3.0 @@ -6818,7 +6821,7 @@ packages: '@babel/core': registry.npmjs.org/@babel/core@7.21.8 '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) '@babel/helper-plugin-utils': registry.npmjs.org/@babel/helper-plugin-utils@7.22.5 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) lodash.debounce: registry.npmjs.org/lodash.debounce@4.0.8 resolve: registry.npmjs.org/resolve@1.22.2 semver: registry.npmjs.org/semver@6.3.0 @@ -9660,7 +9663,7 @@ packages: '@babel/helper-split-export-declaration': registry.npmjs.org/@babel/helper-split-export-declaration@7.18.6 '@babel/parser': registry.npmjs.org/@babel/parser@7.21.8 '@babel/types': registry.npmjs.org/@babel/types@7.21.5 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) globals: registry.npmjs.org/globals@11.12.0 transitivePeerDependencies: - supports-color @@ -10247,7 +10250,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: registry.npmjs.org/ajv@6.12.6 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) espree: registry.npmjs.org/espree@9.5.2 globals: registry.npmjs.org/globals@13.20.0 ignore: registry.npmjs.org/ignore@5.2.4 @@ -10645,7 +10648,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': registry.npmjs.org/@humanwhocodes/object-schema@1.2.1 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) minimatch: registry.npmjs.org/minimatch@3.1.2 transitivePeerDependencies: - supports-color @@ -12986,7 +12989,7 @@ packages: typescript: optional: true dependencies: - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) extract-zip: registry.npmjs.org/extract-zip@2.0.1 https-proxy-agent: registry.npmjs.org/https-proxy-agent@5.0.1 progress: registry.npmjs.org/progress@2.0.3 @@ -15361,7 +15364,7 @@ packages: '@typescript-eslint/type-utils': registry.npmjs.org/@typescript-eslint/type-utils@6.21.0(eslint@8.40.0)(typescript@4.9.5) '@typescript-eslint/utils': registry.npmjs.org/@typescript-eslint/utils@6.21.0(eslint@8.40.0)(typescript@4.9.5) '@typescript-eslint/visitor-keys': registry.npmjs.org/@typescript-eslint/visitor-keys@6.21.0 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) eslint: registry.npmjs.org/eslint@8.40.0 graphemer: registry.npmjs.org/graphemer@1.4.0 ignore: registry.npmjs.org/ignore@5.2.4 @@ -15413,7 +15416,7 @@ packages: '@typescript-eslint/types': registry.npmjs.org/@typescript-eslint/types@6.21.0 '@typescript-eslint/typescript-estree': registry.npmjs.org/@typescript-eslint/typescript-estree@6.21.0(typescript@4.9.5) '@typescript-eslint/visitor-keys': registry.npmjs.org/@typescript-eslint/visitor-keys@6.21.0 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) eslint: registry.npmjs.org/eslint@8.40.0 typescript: registry.npmjs.org/typescript@4.9.5 transitivePeerDependencies: @@ -15486,7 +15489,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': registry.npmjs.org/@typescript-eslint/typescript-estree@6.21.0(typescript@4.9.5) '@typescript-eslint/utils': registry.npmjs.org/@typescript-eslint/utils@6.21.0(eslint@8.40.0)(typescript@4.9.5) - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) eslint: registry.npmjs.org/eslint@8.40.0 ts-api-utils: registry.npmjs.org/ts-api-utils@1.2.1(typescript@4.9.5) typescript: registry.npmjs.org/typescript@4.9.5 @@ -15528,7 +15531,7 @@ packages: dependencies: '@typescript-eslint/types': registry.npmjs.org/@typescript-eslint/types@5.59.2 '@typescript-eslint/visitor-keys': registry.npmjs.org/@typescript-eslint/visitor-keys@5.59.2 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) globby: registry.npmjs.org/globby@11.1.0 is-glob: registry.npmjs.org/is-glob@4.0.3 semver: registry.npmjs.org/semver@7.5.4 @@ -15576,7 +15579,7 @@ packages: dependencies: '@typescript-eslint/types': registry.npmjs.org/@typescript-eslint/types@6.21.0 '@typescript-eslint/visitor-keys': registry.npmjs.org/@typescript-eslint/visitor-keys@6.21.0 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) globby: registry.npmjs.org/globby@11.1.0 is-glob: registry.npmjs.org/is-glob@4.0.3 minimatch: registry.npmjs.org/minimatch@9.0.3 @@ -16576,7 +16579,7 @@ packages: version: 6.0.2 engines: {node: '>= 6.0.0'} dependencies: - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) transitivePeerDependencies: - supports-color @@ -19065,27 +19068,6 @@ packages: name: bn.js version: 5.2.1 - registry.npmjs.org/body-parser@1.20.1: - resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz} - name: body-parser - version: 1.20.1 - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - dependencies: - bytes: registry.npmjs.org/bytes@3.1.2 - content-type: registry.npmjs.org/content-type@1.0.5 - debug: registry.npmjs.org/debug@2.6.9 - depd: registry.npmjs.org/depd@2.0.0 - destroy: registry.npmjs.org/destroy@1.2.0 - http-errors: registry.npmjs.org/http-errors@2.0.0 - iconv-lite: registry.npmjs.org/iconv-lite@0.4.24 - on-finished: registry.npmjs.org/on-finished@2.4.1 - qs: registry.npmjs.org/qs@6.11.0 - raw-body: registry.npmjs.org/raw-body@2.5.1 - type-is: registry.npmjs.org/type-is@1.6.18 - unpipe: registry.npmjs.org/unpipe@1.0.0 - transitivePeerDependencies: - - supports-color - registry.npmjs.org/body-parser@1.20.1(supports-color@6.1.0): resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz} id: registry.npmjs.org/body-parser/1.20.1 @@ -19107,7 +19089,6 @@ packages: unpipe: registry.npmjs.org/unpipe@1.0.0 transitivePeerDependencies: - supports-color - dev: false registry.npmjs.org/body-parser@1.20.2: resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz} @@ -20529,22 +20510,6 @@ packages: dependencies: mime-db: 1.52.0 - registry.npmjs.org/compression@1.7.4: - resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/compression/-/compression-1.7.4.tgz} - name: compression - version: 1.7.4 - engines: {node: '>= 0.8.0'} - dependencies: - accepts: registry.npmjs.org/accepts@1.3.8 - bytes: registry.npmjs.org/bytes@3.0.0 - compressible: registry.npmjs.org/compressible@2.0.18 - debug: registry.npmjs.org/debug@2.6.9 - on-headers: registry.npmjs.org/on-headers@1.0.2 - safe-buffer: registry.npmjs.org/safe-buffer@5.1.2 - vary: registry.npmjs.org/vary@1.1.2 - transitivePeerDependencies: - - supports-color - registry.npmjs.org/compression@1.7.4(supports-color@6.1.0): resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/compression/-/compression-1.7.4.tgz} id: registry.npmjs.org/compression/1.7.4 @@ -22030,18 +21995,6 @@ packages: mimic-fn: registry.npmjs.org/mimic-fn@3.1.0 dev: false - registry.npmjs.org/debug@2.6.9: - resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/debug/-/debug-2.6.9.tgz} - name: debug - version: 2.6.9 - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.0.0 - registry.npmjs.org/debug@2.6.9(supports-color@6.1.0): resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/debug/-/debug-2.6.9.tgz} id: registry.npmjs.org/debug/2.6.9 @@ -22069,19 +22022,6 @@ packages: ms: registry.npmjs.org/ms@2.0.0 dev: false - registry.npmjs.org/debug@3.2.7: - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/debug/-/debug-3.2.7.tgz} - name: debug - version: 3.2.7 - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: registry.npmjs.org/ms@2.1.3 - dev: true - registry.npmjs.org/debug@3.2.7(supports-color@6.1.0): resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/debug/-/debug-3.2.7.tgz} id: registry.npmjs.org/debug/3.2.7 @@ -22110,19 +22050,6 @@ packages: ms: 2.1.3 dev: false - registry.npmjs.org/debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/debug/-/debug-4.3.4.tgz} - name: debug - version: 4.3.4 - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: registry.npmjs.org/ms@2.1.2 - registry.npmjs.org/debug@4.3.4(supports-color@6.1.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/debug/-/debug-4.3.4.tgz} id: registry.npmjs.org/debug/4.3.4 @@ -23817,7 +23744,7 @@ packages: name: eslint-import-resolver-node version: 0.3.7 dependencies: - debug: registry.npmjs.org/debug@3.2.7 + debug: registry.npmjs.org/debug@3.2.7(supports-color@6.1.0) is-core-module: registry.npmjs.org/is-core-module@2.12.0 resolve: 1.22.2 transitivePeerDependencies: @@ -23881,7 +23808,7 @@ packages: optional: true dependencies: '@typescript-eslint/parser': registry.npmjs.org/@typescript-eslint/parser@6.21.0(eslint@8.40.0)(typescript@4.9.5) - debug: registry.npmjs.org/debug@3.2.7 + debug: registry.npmjs.org/debug@3.2.7(supports-color@6.1.0) eslint: registry.npmjs.org/eslint@8.40.0 eslint-import-resolver-node: registry.npmjs.org/eslint-import-resolver-node@0.3.7 transitivePeerDependencies: @@ -23955,7 +23882,7 @@ packages: array-includes: registry.npmjs.org/array-includes@3.1.6 array.prototype.flat: registry.npmjs.org/array.prototype.flat@1.3.1 array.prototype.flatmap: registry.npmjs.org/array.prototype.flatmap@1.3.1 - debug: registry.npmjs.org/debug@3.2.7 + debug: registry.npmjs.org/debug@3.2.7(supports-color@6.1.0) doctrine: registry.npmjs.org/doctrine@2.1.0 eslint: registry.npmjs.org/eslint@8.40.0 eslint-import-resolver-node: registry.npmjs.org/eslint-import-resolver-node@0.3.7 @@ -24327,7 +24254,7 @@ packages: ajv: registry.npmjs.org/ajv@6.12.6 chalk: registry.npmjs.org/chalk@4.1.2 cross-spawn: registry.npmjs.org/cross-spawn@7.0.3 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) doctrine: registry.npmjs.org/doctrine@3.0.0 escape-string-regexp: registry.npmjs.org/escape-string-regexp@4.0.0 eslint-scope: registry.npmjs.org/eslint-scope@7.2.0 @@ -24966,46 +24893,6 @@ packages: version: 1.0.0 dev: false - registry.npmjs.org/express@4.18.2: - resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/express/-/express-4.18.2.tgz} - name: express - version: 4.18.2 - engines: {node: '>= 0.10.0'} - dependencies: - accepts: registry.npmjs.org/accepts@1.3.8 - array-flatten: registry.npmjs.org/array-flatten@1.1.1 - body-parser: registry.npmjs.org/body-parser@1.20.1 - content-disposition: registry.npmjs.org/content-disposition@0.5.4 - content-type: registry.npmjs.org/content-type@1.0.5 - cookie: registry.npmjs.org/cookie@0.5.0 - cookie-signature: registry.npmjs.org/cookie-signature@1.0.6 - debug: registry.npmjs.org/debug@2.6.9 - depd: registry.npmjs.org/depd@2.0.0 - encodeurl: registry.npmjs.org/encodeurl@1.0.2 - escape-html: registry.npmjs.org/escape-html@1.0.3 - etag: registry.npmjs.org/etag@1.8.1 - finalhandler: registry.npmjs.org/finalhandler@1.2.0 - fresh: registry.npmjs.org/fresh@0.5.2 - http-errors: registry.npmjs.org/http-errors@2.0.0 - merge-descriptors: registry.npmjs.org/merge-descriptors@1.0.1 - methods: registry.npmjs.org/methods@1.1.2 - on-finished: registry.npmjs.org/on-finished@2.4.1 - parseurl: registry.npmjs.org/parseurl@1.3.3 - path-to-regexp: registry.npmjs.org/path-to-regexp@0.1.7 - proxy-addr: registry.npmjs.org/proxy-addr@2.0.7 - qs: registry.npmjs.org/qs@6.11.0 - range-parser: registry.npmjs.org/range-parser@1.2.1 - safe-buffer: registry.npmjs.org/safe-buffer@5.2.1 - send: registry.npmjs.org/send@0.18.0 - serve-static: registry.npmjs.org/serve-static@1.15.0 - setprototypeof: registry.npmjs.org/setprototypeof@1.2.0 - statuses: registry.npmjs.org/statuses@2.0.1 - type-is: registry.npmjs.org/type-is@1.6.18 - utils-merge: registry.npmjs.org/utils-merge@1.0.1 - vary: registry.npmjs.org/vary@1.1.2 - transitivePeerDependencies: - - supports-color - registry.npmjs.org/express@4.18.2(supports-color@6.1.0): resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/express/-/express-4.18.2.tgz} id: registry.npmjs.org/express/4.18.2 @@ -25046,7 +24933,6 @@ packages: vary: registry.npmjs.org/vary@1.1.2 transitivePeerDependencies: - supports-color - dev: false registry.npmjs.org/ext-list@2.2.2: resolution: {integrity: sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz} @@ -25156,7 +25042,7 @@ packages: engines: {node: '>= 10.17.0'} hasBin: true dependencies: - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) get-stream: registry.npmjs.org/get-stream@5.2.0 yauzl: registry.npmjs.org/yauzl@2.10.0 optionalDependencies: @@ -25514,22 +25400,6 @@ packages: transitivePeerDependencies: - supports-color - registry.npmjs.org/finalhandler@1.2.0: - resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz} - name: finalhandler - version: 1.2.0 - engines: {node: '>= 0.8'} - dependencies: - debug: registry.npmjs.org/debug@2.6.9 - encodeurl: registry.npmjs.org/encodeurl@1.0.2 - escape-html: registry.npmjs.org/escape-html@1.0.3 - on-finished: registry.npmjs.org/on-finished@2.4.1 - parseurl: registry.npmjs.org/parseurl@1.3.3 - statuses: registry.npmjs.org/statuses@2.0.1 - unpipe: registry.npmjs.org/unpipe@1.0.0 - transitivePeerDependencies: - - supports-color - registry.npmjs.org/finalhandler@1.2.0(supports-color@6.1.0): resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz} id: registry.npmjs.org/finalhandler/1.2.0 @@ -25546,7 +25416,6 @@ packages: unpipe: registry.npmjs.org/unpipe@1.0.0 transitivePeerDependencies: - supports-color - dev: false registry.npmjs.org/find-babel-config@1.2.0: resolution: {integrity: sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz} @@ -25672,17 +25541,6 @@ packages: inherits: registry.npmjs.org/inherits@2.0.4 readable-stream: registry.npmjs.org/readable-stream@2.3.8 - registry.npmjs.org/follow-redirects@1.15.2: - resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz} - name: follow-redirects - version: 1.15.2 - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - registry.npmjs.org/follow-redirects@1.15.2(debug@4.3.4): resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz} id: registry.npmjs.org/follow-redirects/1.15.2 @@ -25696,7 +25554,6 @@ packages: optional: true dependencies: debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) - dev: false registry.npmjs.org/follow-redirects@1.15.6: resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz} @@ -26633,6 +26490,13 @@ packages: dev: true optional: true + registry.npmjs.org/hammerjs@2.0.8: + resolution: {integrity: sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz} + name: hammerjs + version: 2.0.8 + engines: {node: '>=0.8.0'} + dev: false + registry.npmjs.org/handle-thing@2.0.1: resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz} name: handle-thing @@ -27177,7 +27041,7 @@ packages: dependencies: '@tootallnate/once': registry.npmjs.org/@tootallnate/once@1.1.2 agent-base: registry.npmjs.org/agent-base@6.0.2 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) transitivePeerDependencies: - supports-color dev: true @@ -27217,7 +27081,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: '@types/http-proxy': registry.npmjs.org/@types/http-proxy@1.17.11 - http-proxy: registry.npmjs.org/http-proxy@1.18.1 + http-proxy: registry.npmjs.org/http-proxy@1.18.1(debug@4.3.4) is-glob: registry.npmjs.org/is-glob@4.0.3 is-plain-obj: registry.npmjs.org/is-plain-obj@3.0.0 micromatch: 4.0.5 @@ -27239,25 +27103,13 @@ packages: dependencies: '@types/express': registry.npmjs.org/@types/express@4.17.17 '@types/http-proxy': registry.npmjs.org/@types/http-proxy@1.17.11 - http-proxy: registry.npmjs.org/http-proxy@1.18.1 + http-proxy: registry.npmjs.org/http-proxy@1.18.1(debug@4.3.4) is-glob: registry.npmjs.org/is-glob@4.0.3 is-plain-obj: registry.npmjs.org/is-plain-obj@3.0.0 micromatch: 4.0.5 transitivePeerDependencies: - debug - registry.npmjs.org/http-proxy@1.18.1: - resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz} - name: http-proxy - version: 1.18.1 - engines: {node: '>=8.0.0'} - dependencies: - eventemitter3: registry.npmjs.org/eventemitter3@4.0.7 - follow-redirects: registry.npmjs.org/follow-redirects@1.15.2 - requires-port: registry.npmjs.org/requires-port@1.0.0 - transitivePeerDependencies: - - debug - registry.npmjs.org/http-proxy@1.18.1(debug@4.3.4): resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz} id: registry.npmjs.org/http-proxy/1.18.1 @@ -27270,7 +27122,6 @@ packages: requires-port: registry.npmjs.org/requires-port@1.0.0 transitivePeerDependencies: - debug - dev: false registry.npmjs.org/http-signature@1.2.0: resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz} @@ -27295,7 +27146,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: registry.npmjs.org/agent-base@6.0.2 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) transitivePeerDependencies: - supports-color @@ -28534,7 +28385,7 @@ packages: version: 4.0.1 engines: {node: '>=10'} dependencies: - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) istanbul-lib-coverage: registry.npmjs.org/istanbul-lib-coverage@3.2.0 source-map: registry.npmjs.org/source-map@0.6.1 transitivePeerDependencies: @@ -31792,7 +31643,7 @@ packages: chalk: registry.npmjs.org/chalk@5.2.0 cli-truncate: registry.npmjs.org/cli-truncate@3.1.0 commander: registry.npmjs.org/commander@10.0.1 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) execa: registry.npmjs.org/execa@7.1.1 lilconfig: registry.npmjs.org/lilconfig@2.1.0 listr2: registry.npmjs.org/listr2@5.0.8 @@ -36285,7 +36136,7 @@ packages: '@puppeteer/browsers': registry.npmjs.org/@puppeteer/browsers@0.5.0(typescript@5.3.3) chromium-bidi: registry.npmjs.org/chromium-bidi@0.4.7(devtools-protocol@0.0.1107588) cross-fetch: registry.npmjs.org/cross-fetch@3.1.5 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) devtools-protocol: registry.npmjs.org/devtools-protocol@0.0.1107588 extract-zip: registry.npmjs.org/extract-zip@2.0.1 https-proxy-agent: registry.npmjs.org/https-proxy-agent@5.0.1 @@ -38563,28 +38414,6 @@ packages: dependencies: lru-cache: registry.npmjs.org/lru-cache@6.0.0 - registry.npmjs.org/send@0.18.0: - resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/send/-/send-0.18.0.tgz} - name: send - version: 0.18.0 - engines: {node: '>= 0.8.0'} - dependencies: - debug: registry.npmjs.org/debug@2.6.9 - depd: registry.npmjs.org/depd@2.0.0 - destroy: registry.npmjs.org/destroy@1.2.0 - encodeurl: registry.npmjs.org/encodeurl@1.0.2 - escape-html: registry.npmjs.org/escape-html@1.0.3 - etag: registry.npmjs.org/etag@1.8.1 - fresh: registry.npmjs.org/fresh@0.5.2 - http-errors: registry.npmjs.org/http-errors@2.0.0 - mime: registry.npmjs.org/mime@1.6.0 - ms: 2.1.3 - on-finished: registry.npmjs.org/on-finished@2.4.1 - range-parser: registry.npmjs.org/range-parser@1.2.1 - statuses: registry.npmjs.org/statuses@2.0.1 - transitivePeerDependencies: - - supports-color - registry.npmjs.org/send@0.18.0(supports-color@6.1.0): resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/send/-/send-0.18.0.tgz} id: registry.npmjs.org/send/0.18.0 @@ -38662,22 +38491,6 @@ packages: dependencies: randombytes: registry.npmjs.org/randombytes@2.1.0 - registry.npmjs.org/serve-index@1.9.1: - resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz} - name: serve-index - version: 1.9.1 - engines: {node: '>= 0.8.0'} - dependencies: - accepts: registry.npmjs.org/accepts@1.3.8 - batch: registry.npmjs.org/batch@0.6.1 - debug: registry.npmjs.org/debug@2.6.9 - escape-html: registry.npmjs.org/escape-html@1.0.3 - http-errors: registry.npmjs.org/http-errors@1.6.3 - mime-types: 2.1.35 - parseurl: registry.npmjs.org/parseurl@1.3.3 - transitivePeerDependencies: - - supports-color - registry.npmjs.org/serve-index@1.9.1(supports-color@6.1.0): resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz} id: registry.npmjs.org/serve-index/1.9.1 @@ -38694,20 +38507,6 @@ packages: parseurl: registry.npmjs.org/parseurl@1.3.3 transitivePeerDependencies: - supports-color - dev: false - - registry.npmjs.org/serve-static@1.15.0: - resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz} - name: serve-static - version: 1.15.0 - engines: {node: '>= 0.8.0'} - dependencies: - encodeurl: registry.npmjs.org/encodeurl@1.0.2 - escape-html: registry.npmjs.org/escape-html@1.0.3 - parseurl: registry.npmjs.org/parseurl@1.3.3 - send: registry.npmjs.org/send@0.18.0 - transitivePeerDependencies: - - supports-color registry.npmjs.org/serve-static@1.15.0(supports-color@6.1.0): resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz} @@ -39245,20 +39044,6 @@ packages: name: spdx-license-ids version: 3.0.13 - registry.npmjs.org/spdy-transport@3.0.0: - resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz} - name: spdy-transport - version: 3.0.0 - dependencies: - debug: registry.npmjs.org/debug@4.3.4 - detect-node: registry.npmjs.org/detect-node@2.1.0 - hpack.js: registry.npmjs.org/hpack.js@2.1.6 - obuf: registry.npmjs.org/obuf@1.1.2 - readable-stream: registry.npmjs.org/readable-stream@3.6.2 - wbuf: registry.npmjs.org/wbuf@1.7.3 - transitivePeerDependencies: - - supports-color - registry.npmjs.org/spdy-transport@3.0.0(supports-color@6.1.0): resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz} id: registry.npmjs.org/spdy-transport/3.0.0 @@ -39273,21 +39058,6 @@ packages: wbuf: registry.npmjs.org/wbuf@1.7.3 transitivePeerDependencies: - supports-color - dev: false - - registry.npmjs.org/spdy@4.0.2: - resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz} - name: spdy - version: 4.0.2 - engines: {node: '>=6.0.0'} - dependencies: - debug: registry.npmjs.org/debug@4.3.4 - handle-thing: registry.npmjs.org/handle-thing@2.0.1 - http-deceiver: registry.npmjs.org/http-deceiver@1.2.7 - select-hose: registry.npmjs.org/select-hose@2.0.0 - spdy-transport: registry.npmjs.org/spdy-transport@3.0.0 - transitivePeerDependencies: - - supports-color registry.npmjs.org/spdy@4.0.2(supports-color@6.1.0): resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz} @@ -39303,7 +39073,6 @@ packages: spdy-transport: registry.npmjs.org/spdy-transport@3.0.0(supports-color@6.1.0) transitivePeerDependencies: - supports-color - dev: false registry.npmjs.org/split-on-first@1.1.0: resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==, registry: https://registry.yarnpkg.com/, tarball: https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz} @@ -39939,7 +39708,7 @@ packages: colord: registry.npmjs.org/colord@2.9.3 cosmiconfig: registry.npmjs.org/cosmiconfig@7.1.0 css-functions-list: registry.npmjs.org/css-functions-list@3.1.0 - debug: registry.npmjs.org/debug@4.3.4 + debug: registry.npmjs.org/debug@4.3.4(supports-color@6.1.0) fast-glob: 3.3.1 fastest-levenshtein: registry.npmjs.org/fastest-levenshtein@1.0.16 file-entry-cache: registry.npmjs.org/file-entry-cache@6.0.1 @@ -42602,10 +42371,10 @@ packages: bonjour-service: registry.npmjs.org/bonjour-service@1.1.1 chokidar: registry.npmjs.org/chokidar@3.5.3 colorette: registry.npmjs.org/colorette@2.0.20 - compression: registry.npmjs.org/compression@1.7.4 + compression: registry.npmjs.org/compression@1.7.4(supports-color@6.1.0) connect-history-api-fallback: registry.npmjs.org/connect-history-api-fallback@2.0.0 default-gateway: registry.npmjs.org/default-gateway@6.0.3 - express: registry.npmjs.org/express@4.18.2 + express: registry.npmjs.org/express@4.18.2(supports-color@6.1.0) graceful-fs: registry.npmjs.org/graceful-fs@4.2.11 html-entities: registry.npmjs.org/html-entities@2.3.3 http-proxy-middleware: registry.npmjs.org/http-proxy-middleware@2.0.6(@types/express@4.17.17) @@ -42615,9 +42384,9 @@ packages: rimraf: registry.npmjs.org/rimraf@3.0.2 schema-utils: registry.npmjs.org/schema-utils@4.0.1 selfsigned: registry.npmjs.org/selfsigned@2.1.1 - serve-index: registry.npmjs.org/serve-index@1.9.1 + serve-index: registry.npmjs.org/serve-index@1.9.1(supports-color@6.1.0) sockjs: registry.npmjs.org/sockjs@0.3.24 - spdy: registry.npmjs.org/spdy@4.0.2 + spdy: registry.npmjs.org/spdy@4.0.2(supports-color@6.1.0) webpack: registry.npmjs.org/webpack@5.78.0 webpack-dev-middleware: registry.npmjs.org/webpack-dev-middleware@5.3.3(webpack@5.78.0) ws: registry.npmjs.org/ws@8.13.0 From 889eee5a7771666f4dd10cbe143708ff4a36198d Mon Sep 17 00:00:00 2001 From: licunhao1 <1441249604@qq.com> Date: Tue, 28 May 2024 11:11:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dh5map=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=A0=B7=E4=BE=8B=E4=B8=8D=E9=80=9A=E8=BF=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-components/__tests__/map.spec.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/taro-components/__tests__/map.spec.tsx b/packages/taro-components/__tests__/map.spec.tsx index 132143b41176..9b27627db7da 100644 --- a/packages/taro-components/__tests__/map.spec.tsx +++ b/packages/taro-components/__tests__/map.spec.tsx @@ -2,10 +2,6 @@ import { h } from '@stencil/core' import { newSpecPage, SpecPage } from '@stencil/core/testing' import { Map } from '../src/components/map/map' -import { printUnimplementedWarning } from './utils' - -const logError = jest.fn() -console.error = logError describe('Map', () => { let page: SpecPage @@ -18,8 +14,9 @@ describe('Map', () => { await page.waitForChanges() expect(page.root).toEqualHtml(` - + +
+ `) - expect(logError).toHaveBeenCalledWith(printUnimplementedWarning(page.root)) }) })