feat(map): add event

packages/uni-h5/dist/uni-h5.cjs.js

@@ -9176,7 +9176,14 @@ const MapPolyline = /* @__PURE__ */ defineSystemComponent({
       function addPolyline(option) {
         const path = [];
         option.points.forEach((point) => {
-          const pointPosition = getIsAMap() ? [point.longitude, point.latitude] : new maps.LatLng(point.latitude, point.longitude);
+          let pointPosition;
+          if (getIsAMap()) {
+            pointPosition = [point.longitude, point.latitude];
+          } else if (getIsBMap()) {
+            pointPosition = new maps.Point(point.longitude, point.latitude);
+          } else {
+            pointPosition = new maps.LatLng(point.latitude, point.longitude);
+          }
           path.push(pointPosition);
         });
         const strokeWeight = Number(option.width) || 1;
@@ -9221,7 +9228,12 @@ const MapPolyline = /* @__PURE__ */ defineSystemComponent({
         if (borderWidth) {
           polylineBorder = new maps.Polyline(polylineBorderOptions);
         }
-        polyline = new maps.Polyline(polylineOptions);
+        if (getIsBMap()) {
+          polyline = new maps.Polyline(polylineOptions.path, polylineOptions);
+          map.addOverlay(polyline);
+        } else {
+          polyline = new maps.Polyline(polylineOptions);
+        }
       }
       addPolyline(props2);
       vue.watch(props2, updatePolyline);
@@ -9278,7 +9290,7 @@ const MapCircle = /* @__PURE__ */ defineSystemComponent({
         addCircle(option);
       }
       function addCircle(option) {
-        const center = getIsAMap() ? [option.longitude, option.latitude] : new maps.LatLng(option.latitude, option.longitude);
+        const center = getIsAMap() || getIsBMap() ? [option.longitude, option.latitude] : new maps.LatLng(option.latitude, option.longitude);
         const circleOptions = {
           map,
           center,
@@ -9287,7 +9299,7 @@ const MapCircle = /* @__PURE__ */ defineSystemComponent({
           strokeWeight: Number(option.strokeWidth) || 1,
           strokeDashStyle: "solid"
         };
-        if (getIsAMap()) {
+        if (getIsAMap() || getIsBMap()) {
           circleOptions.strokeColor = option.color;
           circleOptions.fillColor = option.fillColor || "#000";
           circleOptions.fillOpacity = 1;
@@ -9314,9 +9326,20 @@ const MapCircle = /* @__PURE__ */ defineSystemComponent({
             circleOptions.strokeOpacity = sa;
           }
         }
-        circle = new maps.Circle(circleOptions);
-        if (getIsAMap()) {
-          map.add(circle);
+        if (getIsBMap()) {
+          let pt = new maps.Point(
+            // @ts-ignore
+            circleOptions.center[0],
+            // @ts-ignore
+            circleOptions.center[1]
+          );
+          circle = new maps.Circle(pt, circleOptions.radius, circleOptions);
+          map.addOverlay(circle);
+        } else {
+          circle = new maps.Circle(circleOptions);
+          if (getIsAMap()) {
+            map.add(circle);
+          }
         }
       }
       addCircle(props2);
@@ -9458,7 +9481,13 @@ const MapPolygon = /* @__PURE__ */ defineSystemComponent({
             latitude,
             longitude
           } = item;
-          return getIsAMap() ? [longitude, latitude] : new maps.LatLng(latitude, longitude);
+          if (getIsAMap()) {
+            return [longitude, latitude];
+          } else if (getIsBMap()) {
+            return new maps.Point(longitude, latitude);
+          } else {
+            return new maps.LatLng(latitude, longitude);
+          }
         });
         const {
           r: fcR,
@@ -9510,7 +9539,12 @@ const MapPolygon = /* @__PURE__ */ defineSystemComponent({
           polygonIns.setOptions(polygonOptions);
           return;
         }
-        polygonIns = new maps.Polygon(polygonOptions);
+        if (getIsBMap()) {
+          polygonIns = new maps.Polygon(polygonOptions.path, polygonOptions);
+          map.addOverlay(polygonIns);
+        } else {
+          polygonIns = new maps.Polygon(polygonOptions);
+        }
       }
       drawPolygon();
       vue.watch(props2, drawPolygon);
@@ -9616,6 +9650,9 @@ function getLat(latLng) {
   if ("getLat" in latLng) {
     return latLng.getLat();
   } else {
+    if (getIsBMap()) {
+      return latLng.lat;
+    }
     return latLng.lat();
   }
 }
@@ -9623,6 +9660,9 @@ function getLng(latLng) {
   if ("getLng" in latLng) {
     return latLng.getLng();
   } else {
+    if (getIsBMap()) {
+      return latLng.lng;
+    }
     return latLng.lng();
   }
 }

packages/uni-h5/dist/uni-h5.es.js

@@ -17625,7 +17625,14 @@ const MapPolyline = /* @__PURE__ */ defineSystemComponent({
       function addPolyline(option) {
         const path = [];
         option.points.forEach((point) => {
-          const pointPosition = getIsAMap() ? [point.longitude, point.latitude] : new maps2.LatLng(point.latitude, point.longitude);
+          let pointPosition;
+          if (getIsAMap()) {
+            pointPosition = [point.longitude, point.latitude];
+          } else if (getIsBMap()) {
+            pointPosition = new maps2.Point(point.longitude, point.latitude);
+          } else {
+            pointPosition = new maps2.LatLng(point.latitude, point.longitude);
+          }
           path.push(pointPosition);
         });
         const strokeWeight = Number(option.width) || 1;
@@ -17670,7 +17677,12 @@ const MapPolyline = /* @__PURE__ */ defineSystemComponent({
         if (borderWidth) {
           polylineBorder = new maps2.Polyline(polylineBorderOptions);
         }
-        polyline = new maps2.Polyline(polylineOptions);
+        if (getIsBMap()) {
+          polyline = new maps2.Polyline(polylineOptions.path, polylineOptions);
+          map.addOverlay(polyline);
+        } else {
+          polyline = new maps2.Polyline(polylineOptions);
+        }
       }
       addPolyline(props2);
       watch(props2, updatePolyline);
@@ -17728,7 +17740,7 @@ const MapCircle = /* @__PURE__ */ defineSystemComponent({
         addCircle(option);
       }
       function addCircle(option) {
-        const center = getIsAMap() ? [option.longitude, option.latitude] : new maps2.LatLng(option.latitude, option.longitude);
+        const center = getIsAMap() || getIsBMap() ? [option.longitude, option.latitude] : new maps2.LatLng(option.latitude, option.longitude);
         const circleOptions = {
           map,
           center,
@@ -17737,7 +17749,7 @@ const MapCircle = /* @__PURE__ */ defineSystemComponent({
           strokeWeight: Number(option.strokeWidth) || 1,
           strokeDashStyle: "solid"
         };
-        if (getIsAMap()) {
+        if (getIsAMap() || getIsBMap()) {
           circleOptions.strokeColor = option.color;
           circleOptions.fillColor = option.fillColor || "#000";
           circleOptions.fillOpacity = 1;
@@ -17764,9 +17776,20 @@ const MapCircle = /* @__PURE__ */ defineSystemComponent({
             circleOptions.strokeOpacity = sa;
           }
         }
-        circle = new maps2.Circle(circleOptions);
-        if (getIsAMap()) {
-          map.add(circle);
+        if (getIsBMap()) {
+          let pt = new maps2.Point(
+            // @ts-ignore
+            circleOptions.center[0],
+            // @ts-ignore
+            circleOptions.center[1]
+          );
+          circle = new maps2.Circle(pt, circleOptions.radius, circleOptions);
+          map.addOverlay(circle);
+        } else {
+          circle = new maps2.Circle(circleOptions);
+          if (getIsAMap()) {
+            map.add(circle);
+          }
         }
       }
       addCircle(props2);
@@ -23149,7 +23172,13 @@ const MapPolygon = /* @__PURE__ */ defineSystemComponent({
             latitude,
             longitude
           } = item;
-          return getIsAMap() ? [longitude, latitude] : new maps2.LatLng(latitude, longitude);
+          if (getIsAMap()) {
+            return [longitude, latitude];
+          } else if (getIsBMap()) {
+            return new maps2.Point(longitude, latitude);
+          } else {
+            return new maps2.LatLng(latitude, longitude);
+          }
         });
         const {
           r: fcR,
@@ -23201,7 +23230,12 @@ const MapPolygon = /* @__PURE__ */ defineSystemComponent({
           polygonIns.setOptions(polygonOptions);
           return;
         }
-        polygonIns = new maps2.Polygon(polygonOptions);
+        if (getIsBMap()) {
+          polygonIns = new maps2.Polygon(polygonOptions.path, polygonOptions);
+          map.addOverlay(polygonIns);
+        } else {
+          polygonIns = new maps2.Polygon(polygonOptions);
+        }
       }
       drawPolygon();
       watch(props2, drawPolygon);
@@ -23310,6 +23344,9 @@ function getLat(latLng) {
   if ("getLat" in latLng) {
     return latLng.getLat();
   } else {
+    if (getIsBMap()) {
+      return latLng.lat;
+    }
     return latLng.lat();
   }
 }
@@ -23317,6 +23354,9 @@ function getLng(latLng) {
   if ("getLng" in latLng) {
     return latLng.getLng();
   } else {
+    if (getIsBMap()) {
+      return latLng.lng;
+    }
     return latLng.lng();
   }
 }
@@ -23425,7 +23465,6 @@ function useMap(props2, rootRef, emit2) {
     const mapEl = mapRef.value;
     const center = getMapPosition(maps2, state2.latitude, state2.longitude);
     const event = maps2.event || maps2.Event;
-    console.log("event:", event);
     const map2 = new maps2.Map(mapEl, {
       center,
       zoom: Number(props2.scale),
@@ -23457,7 +23496,22 @@ function useMap(props2, rootRef, emit2) {
       }
     });
     if (getIsBMap()) {
-      console.log("bmap的事件绑定是on？？");
+      map2.addEventListener("click", () => {
+        trigger("tap", {}, {});
+        trigger("click", {}, {});
+      });
+      map2.addEventListener("dragstart", () => {
+        trigger("regionchange", {}, {
+          type: "begin",
+          causedBy: "gesture"
+        });
+      });
+      map2.addEventListener("dragend", () => {
+        trigger("regionchange", {}, extend({
+          type: "end",
+          causedBy: "drag"
+        }, getMapInfo2()));
+      });
     } else {
       const boundsChangedEvent = event.addListener(map2, "bounds_changed", () => {
         boundsChangedEvent.remove();

packages/uni-h5/src/view/components/map/index.tsx

@@ -160,6 +160,9 @@ function getLat(latLng: LatLng) {
   if ('getLat' in latLng) {
     return latLng.getLat()
   } else {
+    if (getIsBMap()) {
+      return latLng.lat
+    }
     return latLng.lat()
   }
 }
@@ -168,6 +171,9 @@ function getLng(latLng: LatLng) {
   if ('getLng' in latLng) {
     return latLng.getLng()
   } else {
+    if (getIsBMap()) {
+      return latLng.lng
+    }
     return latLng.lng()
   }
 }
@@ -300,7 +306,7 @@ function useMap(
     const center = getMapPosition(maps, state.latitude, state.longitude)
     const event =
       (maps as QQMaps | GoogleMaps).event || (maps as AMap.NameSpace).Event
-    console.log('event:', event)
+    // console.log('event:', event)
     const map = new maps.Map(mapEl, {
       center: center as any,
       zoom: Number(props.scale),
@@ -340,7 +346,32 @@ function useMap(
     })
     // 需在 bounds_changed 后触发 BoundsReady
     if (getIsBMap()) {
-      console.log('bmap的事件绑定是on？？')
+      // @ts-ignore
+      map.addEventListener('click', () => {
+        trigger('tap', {} as Event, {})
+        trigger('click', {} as Event, {})
+      })
+      // @ts-ignore
+      map.addEventListener('dragstart', () => {
+        trigger('regionchange', {} as Event, {
+          type: 'begin',
+          causedBy: 'gesture',
+        })
+      })
+      // @ts-ignore
+      map.addEventListener('dragend', () => {
+        trigger(
+          'regionchange',
+          {} as Event,
+          extend(
+            {
+              type: 'end',
+              causedBy: 'drag',
+            },
+            getMapInfo()
+          )
+        )
+      })
     } else {
       const boundsChangedEvent = event.addListener(
         map,

packages/uni-h5/src/view/components/map/map-polygon/index.tsx

@@ -127,7 +127,6 @@ export default /*#__PURE__*/ defineSystemComponent({
             return
           }
           if (getIsBMap()) {
-            console.log('polygon options:', polygonOptions)
             // @ts-ignore
             polygonIns = new maps.Polygon(polygonOptions.path, polygonOptions)
             // @ts-ignore

pnpm-lock.yaml

 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 overrides:
   '@babel/plugin-transform-block-scoping': 7.19.4
 
@@ -10917,7 +10921,3 @@ packages:
     optionalDependencies:
       commander: 9.5.0
     dev: true
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false