diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index 09a2d28efd3cdb6ddaa105bca7c7855876af5707..193004aef8af9d4b3c66d3f5d48349d476029e5b 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/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 { diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 16f2fb09a13fffe9422b18315d4f6769645d55bf..ce434fbd8adcbf360fd04ad2a8e7d5a4f6b5374c 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/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 { diff --git a/packages/uni-h5/src/view/components/map/MapMarker.tsx b/packages/uni-h5/src/view/components/map/MapMarker.tsx index 5f70684192f97696501015507e60039cc26972f6..9d7fd119fd481d00ddda5450faf5493cd361c9e0 100644 --- a/packages/uni-h5/src/view/components/map/MapMarker.tsx +++ b/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() diff --git a/packages/uni-h5/src/view/components/map/maps/Callout.ts b/packages/uni-h5/src/view/components/map/maps/Callout.ts index 1c81d2d072a88d218561248fb46148ef97171f5b..5498b84885d5d5ca1923dbd26b7a91d2dafa5a84 100644 --- a/packages/uni-h5/src/view/components/map/maps/Callout.ts +++ b/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', diff --git a/packages/uni-shared/dist/uni-shared.cjs.js b/packages/uni-shared/dist/uni-shared.cjs.js index 20d3e59bae67d3db77bea015bf7286517dcb02a1..912d0514d1f7a9e55bdf5ee1d039dc4cfb37fa77 100644 --- a/packages/uni-shared/dist/uni-shared.cjs.js +++ b/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', diff --git a/packages/uni-shared/dist/uni-shared.es.js b/packages/uni-shared/dist/uni-shared.es.js index 2b073baacf2e035e22e3b7ccbb039ebcd5df8f02..88d017cdfc43ade6836987b337776b54f6504ce9 100644 --- a/packages/uni-shared/dist/uni-shared.es.js +++ b/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',