tg-map-vue3 3.5.6 → 3.5.7

package/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 3.5.x
 
 - fix: [LatLngBounds]为空时中心点计算问题
+- perf: 废弃`rightclick`事件, 使用`contextmenu`替代
 - ***BREAKING CHANGE***: `useTgMap` -> [useTgMapInner]
 - ***BREAKING CHANGE***: 统一[TgLabel]在google和baidu上的默认显示层级, 都位于overlay上方
 

package/dist/src/components/TgMap.vue.d.ts

@@ -60,6 +60,10 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<number>;
         required: true;
     };
+    /**
+     * 该属性不会响应式更新, 要让它立即生效, 请参考{@link file://./../views/map/InfoDemo.vue#L3}
+     * @see MapOptions.infoWindowMode
+     */
     infoWindowMode: {
         type: import("vue").PropType<"single" | "multi">;
     };
@@ -150,6 +154,10 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<number>;
         required: true;
     };
+    /**
+     * 该属性不会响应式更新, 要让它立即生效, 请参考{@link file://./../views/map/InfoDemo.vue#L3}
+     * @see MapOptions.infoWindowMode
+     */
     infoWindowMode: {
         type: import("vue").PropType<"single" | "multi">;
     };
@@ -195,6 +203,7 @@ declare const _default: import("vue").DefineComponent<{
     onClick?: ((event: import("../map/event").Tg.MouseEvent) => any) | undefined;
     onDblclick?: ((event: import("../map/event").Tg.MouseEvent) => any) | undefined;
     onRightclick?: ((event: import("../map/event").Tg.MouseEvent) => any) | undefined;
+    onContextmenu?: ((event: import("../map/event").Tg.MouseEvent) => any) | undefined;
     onMousedown?: ((event: import("../map/event").Tg.MouseEvent) => any) | undefined;
     onMouseup?: ((event: import("../map/event").Tg.MouseEvent) => any) | undefined;
     onMouseout?: ((event: import("../map/event").Tg.MouseEvent) => any) | undefined;

package/dist/src/components/overlays/TgMarker.vue.d.ts

@@ -57,11 +57,10 @@ declare const TgMarker: import("vue").DefineComponent<{
             readonly offset?: any;
             style?: unknown;
             onClick?: ((event: import("../../map/event").Tg.Event) => any) | undefined;
-            class?: unknown;
             ref?: import("vue").VNodeRef | undefined;
+            class?: unknown;
             ref_for?: boolean | undefined;
             ref_key?: string | undefined;
-            readonly mapPane?: import("../../utils/mapped-types").StringEnumValue<typeof import("../../map/map/overlay/element-overlay").MapPane> | undefined;
             onVnodeBeforeMount?: ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
                 [key: string]: any;
             }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -100,6 +99,7 @@ declare const TgMarker: import("vue").DefineComponent<{
             }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
                 [key: string]: any;
             }>) => void)[] | undefined;
+            readonly mapPane?: import("../../utils/mapped-types").StringEnumValue<typeof import("../../map/map/overlay/element-overlay").MapPane> | undefined;
         };
         $attrs: {
             [x: string]: unknown;
@@ -238,6 +238,7 @@ declare const TgMarker: import("vue").DefineComponent<{
     onClick?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;
     onDblclick?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;
     onRightclick?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;
+    onContextmenu?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;
     onMousedown?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;
     onMouseup?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;
     onMouseout?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;

package/dist/src/map/map/map-options.d.ts

@@ -24,6 +24,15 @@ export interface MapOptions {
     center: LatLng;
     /** 缩放等级, 必须是整数 */
     zoom: number;
+    /**
+     * ## 不同行为
+     * - baidu: 只支持单窗口
+     * - google: 支持单窗口或多窗口, 默认多窗口
+     *
+     * 要显示多个弹窗, 推荐使用InfoBox替代
+     *
+     * {@macros info_window_vs_box}
+     */
     infoWindowMode?: InfoWindowMode;
     gestureHandling?: GestureHandlingOptions;
     minZoom?: number;

package/dist/src/map/map/map.d.ts

@@ -27,7 +27,9 @@ import type { RectangleOptions, RectangleOverlay } from './overlay/rectangle';
 export type AbstractMapEventMap = {
     click: Tg.MouseEvent;
     dblclick: Tg.MouseEvent;
+    /** @deprecated 使用`contextmenu`替代 */
     rightclick: Tg.MouseEvent;
+    contextmenu: Tg.MouseEvent;
     dragstart: Tg.Event;
     drag: Tg.Event;
     dragend: Tg.Event;

package/dist/src/map/map/overlay/baidu-info-box.d.ts

@@ -36,10 +36,15 @@ export declare function createBaiduInfoBox(content: HTMLElement, position?: BMap
     }): void;
 };
 /**
+ * {@template info_window_vs_box}
  * baidu自带的InfoWindow有如下问题:
  * 1. 窗体不可自定义, 默认的窗体有点丑
  * 2. 一次只能显示一个
  * 3. 和MarkerClusterer的配合并不好, 重建聚合时会使InfoWindow消失
+ *
+ * 故重新实现了一个InfoBox, 解决上述问题, 用来替代InfoWindow, 但Info也点问题...:
+ * 1. 未实现InfoWindow的autoPan功能
+ * {@endtemplate }
  */
 declare function createBaiduInfoBoxClass(): {
     new (content: HTMLElement, position?: BMap.Point, offset?: Point, zIndex?: number, maxWidth?: number, borderClass?: string): {

package/dist/src/map/map/overlay/info-box.d.ts

@@ -21,6 +21,7 @@ export interface InfoBoxOptions {
     maxWidth?: number;
     borderClass?: string;
 }
+/** {@macros info_window_vs_box} */
 export interface InfoBox extends Tg.EventTarget {
     open(anchor?: Marker): void;
     close(): void;

package/dist/src/map/map/overlay/marker.d.ts

@@ -36,7 +36,9 @@ export interface MarkerOptions extends OverlayOptions {
 export type MarkerEventMap = {
     click: Tg.MouseEvent;
     dblclick: Tg.MouseEvent;
+    /** @deprecated 使用`contextmenu`替代 */
     rightclick: Tg.MouseEvent;
+    contextmenu: Tg.MouseEvent;
     mousedown: Tg.MouseEvent;
     mouseup: Tg.MouseEvent;
     mouseout: Tg.MouseEvent;

package/dist/tg-map.js

@@ -2,7 +2,7 @@
 var br = Object.defineProperty;
 var Mr = (i, t, e) => t in i ? br(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
 var c = (i, t, e) => (Mr(i, typeof t != "symbol" ? t + "" : t, e), e);
-import { createCommentVNode as Fe, computed as Nt, defineComponent as C, markRaw as Tr, watch as Gt, openBlock as W, createElementBlock as j, mergeProps as ce, createElementVNode as Or, normalizeClass as $e, renderSlot as G, normalizeStyle as Cr, getCurrentInstance as wr, inject as Er, onMounted as Lr, onBeforeUnmount as xr, toRaw as De, withDirectives as Pr, vShow as kr } from "vue";
+import { createCommentVNode as Fe, computed as Nt, defineComponent as C, markRaw as Tr, watch as Gt, openBlock as W, createElementBlock as j, mergeProps as ce, createElementVNode as Or, normalizeClass as $e, renderSlot as G, normalizeStyle as Cr, getCurrentInstance as wr, inject as Er, onMounted as Lr, onBeforeUnmount as xr, toRaw as ze, withDirectives as Pr, vShow as kr } from "vue";
 function V(i, t, e) {
   Object.keys(i).forEach((r) => {
     r.startsWith("update:") || e != null && e.includes(r) || t.addEventListener(r, i[r]);
@@ -162,29 +162,29 @@ function fs(i) {
   return i != null;
 }
 var Q = /* @__PURE__ */ ((i) => (i.wgs84 = "wgs84", i.gcj02 = "gcj02", i.bd09 = "bd09", i))(Q || {});
-const He = "wgs84", D = class {
+const He = "wgs84", z = class {
   constructor(t, e, r) {
     this.lat = t, this.lng = e, this.coord = r;
   }
   /** @param coord Baidu Map的坐标一般都是bd09 */
   static fromBaidu(t, e) {
-    return new D(t.lat, t.lng, e);
+    return new z(t.lat, t.lng, e);
   }
   /** @param coord Google Map的坐标依据地图类型不同是不一样的 */
   static fromGoogle(t, e) {
-    return new D(t.lat(), t.lng(), e);
+    return new z(t.lat(), t.lng(), e);
   }
   static fromHere(t, e) {
-    return new D(t.lat, t.lng, e);
+    return new z(t.lat, t.lng, e);
   }
   static fromLiteral(t) {
-    return new D(t.lat, t.lng, t.coord || He);
+    return new z(t.lat, t.lng, t.coord || He);
   }
   static fromLngLat(t, e, r = He) {
-    return new D(e, t, r);
+    return new z(e, t, r);
   }
   static create(t, e, r = He) {
-    return new D(t, e, r);
+    return new z(t, e, r);
   }
   /** 转换坐标到指定坐标系 */
   to(t) {
@@ -192,7 +192,7 @@ const He = "wgs84", D = class {
     if (this.coord === e)
       return this;
     const [r, s] = this._convert(e);
-    return new D(s, r, e);
+    return new z(s, r, e);
   }
   toBaidu(t) {
     let e = this.lat, r = this.lng;
@@ -233,8 +233,8 @@ const He = "wgs84", D = class {
     return JSON.stringify(this);
   }
 };
-let y = D;
-c(y, "ZERO", D.create(0, 0));
+let y = z;
+c(y, "ZERO", z.create(0, 0));
 const J = class {
   /**
    * 不推荐直接创建LatLngBounds, sw和ne的大小关系可能没法保证, 推荐用LatLngBounds.Builder或者LatLngBounds.from等静态方法来创建
@@ -356,9 +356,9 @@ function $r(i) {
   var t = Object.prototype.toString.call(i);
   return t === "[object RegExp]" || t === "[object Date]" || Nr(i);
 }
-var Dr = typeof Symbol == "function" && Symbol.for, zr = Dr ? Symbol.for("react.element") : 60103;
+var zr = typeof Symbol == "function" && Symbol.for, Dr = zr ? Symbol.for("react.element") : 60103;
 function Nr(i) {
-  return i.$$typeof === zr;
+  return i.$$typeof === Dr;
 }
 function Gr(i) {
   return Array.isArray(i) ? [] : {};
@@ -422,11 +422,11 @@ const jt = /* @__PURE__ */ Je(Ur), ke = ["3.0"], qr = {
     // 在build时会被静态替换, 导致使用者不能无法设置它
     // @see https://cn.vitejs.dev/guide/build.html#library-mode:~:text=%E6%A8%A1%E5%BC%8F%E4%B8%8B%EF%BC%8C%E6%89%80%E6%9C%89-,({}).*,-%E7%94%A8%E6%B3%95%E5%9C%A8%E6%9E%84
     // @see @vite_process_env_detail
-    key: ""
+    key: "kXOq8Hg9BZbZEWAjXKuzd1oGreynup8h"
   },
   google: {
     version: "quarterly",
-    key: "",
+    key: "AIzaSyBcyzMel3dYFNcfcr0LOklbBQNpWycyZXo",
     language: "en-us",
     libraries: ["places"]
   },
@@ -530,7 +530,7 @@ class qt {
     return this.target = t, this;
   }
 }
-class ze {
+class De {
   constructor(t, e) {
     c(this, "eventHub", new Yt());
     this.delegate = t, this.options = e;
@@ -627,6 +627,8 @@ let ne = Re;
 c(ne, "EVENT_TYPE_MAP", {
   drag: "dragging",
   closeclick: "clickclose",
+  // baidu不支持contextmenu事件, 将其映射为rightclick
+  contextmenu: "rightclick",
   "zoom-changed": "zoomend",
   "map-type-changed": "maptypechange"
 });
@@ -2840,7 +2842,7 @@ class ct extends pr {
     }, 0), n;
   }
   createDelegate() {
-    return this.eventHubDelegate = new ze(super.createDelegate(), {
+    return this.eventHubDelegate = new De(super.createDelegate(), {
       types: ["radius-changed", "center-changed"],
       onListen: (e) => {
         e === "radius-changed" ? (this.prevRadius = this.innerOverlay.getRadius(), this.innerOverlay.addEventListener("lineupdate", this.onRadiusChanged)) : (this.prevCenter = this.innerOverlay.getCenter(), this.innerOverlay.addEventListener("lineupdate", this.onCenterChanged));
@@ -3728,7 +3730,7 @@ class bt extends pr {
     this.isDoingSetPath = !0, this.innerOverlay.setPath(e), this.isDoingSetPath = !1;
   }
   createDelegate() {
-    return this.eventHubDelegate = new ze(super.createDelegate(), {
+    return this.eventHubDelegate = new De(super.createDelegate(), {
       types: [this.pathEditedEventType],
       onListen: () => {
         this.prevPath = this.innerOverlay.getPath(), this.innerOverlay.addEventListener("lineupdate", this.onLineUpdate);
@@ -3791,7 +3793,7 @@ class Tt extends Ge {
     (e = this.pathChangedListeners) == null || e.forEach((r) => r.remove()), this.pathChangedListeners = void 0;
   }
   createDelegate() {
-    return this.eventHubDelegate = new ze(super.createDelegate(), {
+    return this.eventHubDelegate = new De(super.createDelegate(), {
       types: ["path-edited"],
       onListen: () => this.setupPathChangedListeners(),
       onCancel: () => this.clearPathChangedListeners()
@@ -3868,7 +3870,7 @@ class Ct extends Ge {
     (e = this.pathChangedListeners) == null || e.forEach((r) => r.remove()), this.pathChangedListeners = void 0;
   }
   createDelegate() {
-    return this.eventHubDelegate = new ze(super.createDelegate(), {
+    return this.eventHubDelegate = new De(super.createDelegate(), {
       types: ["paths-edited"],
       onListen: () => this.setupPathChangedListeners(),
       onCancel: () => this.clearPathChangedListeners()
@@ -4457,7 +4459,7 @@ class Li extends lt {
     throw new Error("Method not implemented.");
   }
 }
-var z = /* @__PURE__ */ ((i) => (i.google = "google", i.baidu = "baidu", i.here = "here", i))(z || {}), Xe;
+var D = /* @__PURE__ */ ((i) => (i.google = "google", i.baidu = "baidu", i.here = "here", i))(D || {}), Xe;
 ((i) => {
   function t(e, r, s) {
     const n = Ke.create(s);
@@ -4476,16 +4478,16 @@ function xi({ type: i, config: t }) {
   const e = window, r = Pi(i);
   if (e[r])
     return Promise.resolve();
-  switch (i !== z.here && !t.key && E(`请先配置${i}地图的key`), i) {
-    case z.google:
+  switch (i !== D.here && !t.key && E(`请先配置${i}地图的key`), i) {
+    case D.google:
       return {}.VITE_FALSE ? (ti({
         key: t.key,
         v: "3.52"
         // v: config.version,
-      }), google.maps.importLibrary("core")) : Dt(`https://maps.googleapis.com/maps/api/js?key=${t.key}&language=${t.language}&v=${t.version}&libraries=${t.libraries.join(",")}`);
-    case z.baidu:
-      return Dt(`https://api.map.baidu.com/api?v=${t.version}&ak=${t.key}`);
-    case z.here:
+      }), google.maps.importLibrary("core")) : zt(`https://maps.googleapis.com/maps/api/js?key=${t.key}&language=${t.language}&v=${t.version}&libraries=${t.libraries.join(",")}`);
+    case D.baidu:
+      return zt(`https://api.map.baidu.com/api?v=${t.version}&ak=${t.key}`);
+    case D.here:
       return ue(de("core", t.version)).then(() => Promise.all([
         // 其他大多数模块都可以同时载入
         ue(de("service", t.version)),
@@ -4502,16 +4504,16 @@ function de(i, t = ke[0]) {
 }
 function Pi(i) {
   switch (i) {
-    case z.google:
+    case D.google:
       return "google";
-    case z.baidu:
+    case D.baidu:
       return "BMap";
-    case z.here:
+    case D.here:
       return "H";
   }
 }
 let ki = 0;
-function Dt(i, t = "callback") {
+function zt(i, t = "callback") {
   return new Promise((e, r) => {
     const s = `__callback${ki++}`;
     window[s] = e;
@@ -4662,7 +4664,7 @@ const Es = () => {
   inheritAttrs: !1,
   props: {
     /** type没做响应式, 但外部可以把type作为tg-map的key, 让type修改时完全重建tg-map */
-    type: N(z, z.google),
+    type: N(D, D.google),
     /**
      * 当对该属性使用双向绑定时, 改变center将触发update:center又反过来触发center改变, 最终导致无限循环...
      * 当前通过setCenter()时判断center是否有改变来避免该问题, 但为了避免可能存在的问题, 另外设计了如下机制:
@@ -4689,6 +4691,10 @@ const Es = () => {
      */
     lastCenter: m(y),
     zoom: R(Number),
+    /**
+     * 该属性不会响应式更新, 要让它立即生效, 请参考{@link file://./../views/map/InfoDemo.vue#L3}
+     * @see MapOptions.infoWindowMode
+     */
     infoWindowMode: Bi(vi),
     gestureHandling: N(Z),
     minZoom: m(Number),
@@ -4833,7 +4839,7 @@ function Ri(i, t, e, r, s, n) {
   ], 16);
 }
 const $i = /* @__PURE__ */ U(Ai, [["render", Ri]]);
-function Di(i) {
+function zi(i) {
   if (i == null)
     return;
   let t;
@@ -4844,7 +4850,7 @@ function Di(i) {
     t = i;
   return `${t}px`;
 }
-const zi = C({
+const Di = C({
   name: "tg-map-widget",
   props: {
     left: {
@@ -4870,7 +4876,7 @@ const zi = C({
     }
   },
   methods: {
-    dimen: Di
+    dimen: zi
   }
 });
 function Ni(i, t, e, r, s, n) {
@@ -4881,7 +4887,7 @@ function Ni(i, t, e, r, s, n) {
     G(i.$slots, "default")
   ], 6);
 }
-const Ls = /* @__PURE__ */ U(zi, [["render", Ni]]), Gi = C({
+const Ls = /* @__PURE__ */ U(Di, [["render", Ni]]), Gi = C({
   name: "tg-custom-control",
   mixins: [P],
   props: {
@@ -5142,7 +5148,7 @@ const Vi = /* @__PURE__ */ U(Hi, [["render", ji]]), Is = C({
     center(i) {
       if (this.emittedCenter != null) {
         const t = this.emittedCenter;
-        if (this.emittedCenter = void 0, t === De(i))
+        if (this.emittedCenter = void 0, t === ze(i))
           return;
       }
       this.overlay.setCenter(i);
@@ -5275,7 +5281,7 @@ const As = /* @__PURE__ */ U(Ui, [["render", qi]]), Yi = C({
     position(i) {
       if (this.emittedPosition != null) {
         const t = this.emittedPosition;
-        if (this.emittedPosition = void 0, t === De(i))
+        if (this.emittedPosition = void 0, t === ze(i))
           return;
       }
       this.marker.setPosition(i);
@@ -5563,7 +5569,7 @@ function rs(i, t, e, r, s, n) {
     G(i.$slots, "default")
   ], 16);
 }
-const Ds = /* @__PURE__ */ U(ts, [["render", rs]]), zs = C({
+const zs = /* @__PURE__ */ U(ts, [["render", rs]]), Ds = C({
   name: "tg-polygon",
   mixins: [P],
   inheritAttrs: !1,
@@ -5592,7 +5598,7 @@ const Ds = /* @__PURE__ */ U(ts, [["render", rs]]), zs = C({
       handler(i) {
         if (this.emittedPaths != null) {
           const t = this.emittedPaths;
-          if (this.emittedPaths = void 0, t.length === i.length && t.every((e, r) => e === De(i[r])))
+          if (this.emittedPaths = void 0, t.length === i.length && t.every((e, r) => e === ze(i[r])))
             return;
         }
         this.overlay.setPaths(i);
@@ -5659,7 +5665,7 @@ const Ds = /* @__PURE__ */ U(ts, [["render", rs]]), zs = C({
       handler(i) {
         if (this.emittedPath != null) {
           const t = this.emittedPath;
-          if (this.emittedPath = void 0, t === De(i))
+          if (this.emittedPath = void 0, t === ze(i))
             return;
         }
         this.overlay.setPath(i);
@@ -5809,7 +5815,7 @@ const Ds = /* @__PURE__ */ U(ts, [["render", rs]]), zs = C({
 function me(i) {
   return i * Math.PI / 180;
 }
-function zt(i) {
+function Dt(i) {
   return i * 180 / Math.PI;
 }
 function ns(i, t) {
@@ -5834,7 +5840,7 @@ function os(i, t, e) {
     u * x + d * O * o,
     (1 - n) * Math.sqrt(b * b + te * te)
   ), yr = Math.atan2(O * h, d * x - u * O * o), We = n / 16 * _ * (4 + n * (4 - 3 * _)), vr = yr - (1 - We) * n * b * (w + We * O * (v + We * x * (-1 + 2 * v * v)));
-  return { lng: i.lng + zt(vr), lat: zt(Ze) };
+  return { lng: i.lng + Dt(vr), lat: Dt(Ze) };
 }
 const Ws = {
   getDistance: ns,
@@ -5922,15 +5928,15 @@ export {
   As as TgElementOverlay,
   Rs as TgInfoBox,
   $s as TgInfoWindow,
-  Ds as TgLabel,
+  zs as TgLabel,
   $i as TgMap,
   Xe as TgMapFactory,
-  z as TgMapType,
+  D as TgMapType,
   Ps as TgMapTypeControl,
   Ls as TgMapWidget,
   xt as TgMarker,
   Vi as TgMarkerClusterer,
-  zs as TgPolygon,
+  Ds as TgPolygon,
   Ns as TgPolyline,
   Gs as TgRectangle,
   ks as TgScaleControl,