chore: build

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

@@ -7930,6 +7930,13 @@ var index$d = /* @__PURE__ */ defineBuiltInComponent({
   }
 });
 const ICON_PATH_ORIGIN = "data:image/png;base64,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";
+var MapType = /* @__PURE__ */ ((MapType2) => {
+  MapType2["QQ"] = "qq";
+  MapType2["GOOGLE"] = "google";
+  MapType2["AMAP"] = "AMap";
+  MapType2["UNKNOWN"] = "";
+  return MapType2;
+})(MapType || {});
 function getMapInfo() {
   if (__uniConfig.qqMapKey) {
     return {
@@ -8211,6 +8218,14 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
                   $event.stopPropagation();
                   $event.preventDefault();
                 };
+                if (getMapInfo().type === MapType.GOOGLE) {
+                  callout.div.ontouchstart = function($event) {
+                    $event.stopPropagation();
+                  };
+                  callout.div.onpointerdown = function($event) {
+                    $event.stopPropagation();
+                  };
+                }
               }
             }
           } else {

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

@@ -15465,9 +15465,8 @@ function createCallout(maps2) {
     this.Text = new maps2.Text({
       text: option.content,
       anchor: "bottom-center",
-      offset: new maps2.Pixel(0, option.offsetY),
+      offset: new maps2.Pixel(0, option.offsetY - 16),
       style: {
-        "margin-bottom": "1rem",
         padding: (option.padding || 8) + "px",
         "line-height": (option.fontSize || 14) + "px",
         "border-radius": (option.borderRadius || 0) + "px",
@@ -15921,6 +15920,14 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
                   $event.stopPropagation();
                   $event.preventDefault();
                 };
+                if (getMapInfo().type === MapType.GOOGLE) {
+                  callout.div.ontouchstart = function($event) {
+                    $event.stopPropagation();
+                  };
+                  callout.div.onpointerdown = function($event) {
+                    $event.stopPropagation();
+                  };
+                }
               }
             }
           } else {

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

@@ -360,9 +360,9 @@ export default /*#__PURE__*/ defineSystemComponent({
                 }
 
                 // The mobile terminal prevent google map callout click trigger map click
-                if(getMapInfo().type === MapType.GOOGLE){
-                  callout.div!.ontouchstart = function($event: Event) {
-                    $event.stopPropagation();
+                if (getMapInfo().type === MapType.GOOGLE) {
+                  callout.div!.ontouchstart = function ($event: Event) {
+                    $event.stopPropagation()
                   }
                   callout.div!.onpointerdown = function ($event: Event) {
                     $event.stopPropagation()

packages/uni-h5/src/view/components/map/maps/Callout.ts

@@ -34,7 +34,7 @@ export function createCallout(maps: QQMaps | GoogleMaps | AMap.NameSpace) {
     this.Text = new (maps as AMap.NameSpace).Text({
       text: option.content,
       anchor: 'bottom-center', // 设置文本标记锚点
-      offset: new (maps as AMap.NameSpace).Pixel(0, option.offsetY!-16),
+      offset: new (maps as AMap.NameSpace).Pixel(0, option.offsetY! - 16),
       style: {
         padding: (option.padding || 8) + 'px',
         'line-height': (option.fontSize || 14) + 'px',

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

@@ -111,6 +111,7 @@ const NVUE_BUILT_IN_TAGS = [
     'recycle-list',
     'u-scalable',
     'barcode',
+    'gcanvas',
 ];
 const NVUE_U_BUILT_IN_TAGS = [
     'u-text',

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

@@ -107,6 +107,7 @@ const NVUE_BUILT_IN_TAGS = [
     'recycle-list',
     'u-scalable',
     'barcode',
+    'gcanvas',
 ];
 const NVUE_U_BUILT_IN_TAGS = [
     'u-text',