diff --git a/packages/component/src/popup.ts b/packages/component/src/popup.ts index cdb736eb22..5dbcd35627 100644 --- a/packages/component/src/popup.ts +++ b/packages/component/src/popup.ts @@ -214,13 +214,16 @@ export default class Popup extends EventEmitter implements IPopup { } // 高德地图需要阻止事件冒泡 // 测试mapbox 地图不需要添加 - ['mousemove', 'mousedown', 'mouseup', 'click', 'dblclick'].forEach( - (type) => { - this.container.addEventListener(type, (e) => { - e.stopPropagation(); - }); - }, - ); + const { stopPropagation } = this.popupOption; + if (stopPropagation) { + ['mousemove', 'mousedown', 'mouseup', 'click', 'dblclick'].forEach( + (type) => { + this.container.addEventListener(type, (e) => { + e.stopPropagation(); + }); + }, + ); + } } if (maxWidth && this.container.style.maxWidth !== maxWidth) { this.container.style.maxWidth = maxWidth; diff --git a/packages/layers/src/utils/__tests__/extrude_polyline.spec.ts b/packages/layers/src/utils/__tests__/extrude_polyline.spec.ts index 9cea6c49ce..c2ce9a7eb7 100644 --- a/packages/layers/src/utils/__tests__/extrude_polyline.spec.ts +++ b/packages/layers/src/utils/__tests__/extrude_polyline.spec.ts @@ -18,6 +18,6 @@ describe('extrude polyline', () => { coord[1] = lat; }); const mesh = extrude.extrude(coords); - expect(mesh.indices.length).toBe(6); + expect(mesh.indices.length).toBe(12); }); }); diff --git a/packages/layers/src/utils/extrude_polyline.ts b/packages/layers/src/utils/extrude_polyline.ts index 4c0a668e2e..be92556998 100644 --- a/packages/layers/src/utils/extrude_polyline.ts +++ b/packages/layers/src/utils/extrude_polyline.ts @@ -97,7 +97,7 @@ export default class ExtrudePolyline { this.normal = null; this.totalDistance = 0; // 去除数组里重复的点 - points = getArrayUnique(points); + // points = getArrayUnique(points); const total = points.length; let count = complex.startIndex; for (let i = 1; i < total; i++) { diff --git a/packages/maps/package.json b/packages/maps/package.json index b58c0fcd70..09b5049141 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@types/gl-matrix": "^2.4.5", - "@types/mapbox-gl": "^0.54.3", + "@types/mapbox-gl": "^1.11.2", "@types/viewport-mercator-project": "^6.1.0" }, "gitHead": "20154fe30d512024b03ac5e40f77731bc0580bb0", diff --git a/stories/React/components/Scene.tsx b/stories/React/components/Scene.tsx index 544d8857fd..d7e9e0dc75 100644 --- a/stories/React/components/Scene.tsx +++ b/stories/React/components/Scene.tsx @@ -2,6 +2,8 @@ import { AMapScene, LayerContext, LineLayer, + PolygonLayer, + MapboxScene, Marker, Popup, SceneContext, @@ -45,14 +47,14 @@ export default React.memo(function Map() { option={{ closeOnClick: false, }} - lnglat={[110.1938, 50.25] as number[]} + lnglat={[110.1938, 30.25] as number[]} > -

122222

+

122224

- -

122222

+ +

tes

- - + ); diff --git a/yarn.lock b/yarn.lock index 1e07ef7d5d..ad19ba58c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5429,10 +5429,10 @@ resolved "https://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.161.tgz?cache=0&sync_timestamp=1598664997598&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Flodash%2Fdownload%2F%40types%2Flodash-4.14.161.tgz#a21ca0777dabc6e4f44f3d07f37b765f54188b18" integrity sha1-ohygd32rxuT0Tz0H83t2X1QYixg= -"@types/mapbox-gl@^0.54.3": - version "0.54.5" - resolved "https://registry.npm.taobao.org/@types/mapbox-gl/download/@types/mapbox-gl-0.54.5.tgz#d50285796cb9d3544121d9e2b5314da99f9774bf" - integrity sha1-1QKFeWy501RBIdnitTFNqZ+XdL8= +"@types/mapbox-gl@^1.11.2": + version "1.11.2" + resolved "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-1.11.2.tgz#e989264075ac6be633837c21241f4acd54692ceb" + integrity sha512-IXfOnFPAbxnEhSG89MjFxuqIX6bJioPHA55yExM0qAaVdT+kfJX7P4d0wfW0Br3iSdq9ym8C9jCYHpuLT4FE6Q== dependencies: "@types/geojson" "*"