@heycar/heycars-map 2.0.0-switchMap9 → 2.1.0-speedupAmap1

package/dist/v2/App.js

@@ -22,6 +22,10 @@ const App = defineComponent({
         "supplier": supplierRef.value,
         "renderLoadFailedTitle": () => supplierRef.value === "gmap" ? "未能成功访问谷歌地图" : "高德地图加载失败",
         "renderLoadFailedDescription": () => supplierRef.value === "gmap" ? "请确认您的网络能正常访问谷歌地图， \n或切回高德地图" : void 0
+      },
+      "on": {
+        "success": () => console.log(`${supplierRef.value} load success`),
+        "fail": () => console.log(`${supplierRef.value} load failed`)
       }
     }, [h(DemoBusinessQuoting)]);
   }

package/dist/v2/components/MapProvider/MapProvider.d.ts

@@ -6,7 +6,7 @@ import { type MapSupplierPayolad } from "../../hooks/useMapSupplier";
 import type { AmapMap } from "../../types/interface";
 import { type AmapProps } from "../Amap";
 export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "renderLoadFailedTitle" | "renderLoadFailedDescription">;
-export declare const MapProvider: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<MapProviderProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<MapProviderProps, Required<MapProviderProps>>, "success" | "fail", MapProviderProps>;
+export declare const MapProvider: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<MapProviderProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<MapProviderProps, Required<MapProviderProps>>, "success" | "fail", MapProviderProps>;
 export interface HeycarMapProps extends Pick<GmapLoaderProps, "fallback" | "loading">, Pick<AmapProps, "center" | "zoom"> {
     mapRef?: SetMap<AmapMap> | SetMap<google.maps.Map>;
     outerArea?: () => VueNode;
@@ -16,4 +16,4 @@ export interface HeycarMapProps extends Pick<GmapLoaderProps, "fallback" | "load
     onZoomEnd?: (value: number) => any;
     onResize?: () => any;
 }
-export declare const HeycarMap: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<HeycarMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<HeycarMapProps, Required<HeycarMapProps>>, "resize" | "dragEnd" | "zoomEnd", HeycarMapProps>;
+export declare const HeycarMap: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<HeycarMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<HeycarMapProps, Required<HeycarMapProps>>, "resize" | "dragEnd" | "zoomEnd", HeycarMapProps>;

package/dist/v2/components/MapProvider/MapProvider.js

@@ -1,5 +1,6 @@
 import "../../css/MapProvider-156bfd53.css";
 import { h } from "vue";
+import { reactive, toRefs } from "vue-demi";
 import { L as LoadFailed, a as Loading, i as imgGrid } from "../../chunks/Loading.492acbc2.js";
 import { useMapLoader, Status } from "../../hooks/useMapLoader.js";
 import { provideMapSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
@@ -19,9 +20,16 @@ if (detectWebGL() === WEBGL_STATUS.ENABLED) {
   window.forceWebGL = true;
 }
 const MapProvider = defineLagecySetup("MapProvider", function(props, {
-  slots
+  slots,
+  emit
 }) {
-  const payload = useMapLoader(props);
+  const onSuccess = () => emit("success");
+  const onFail = () => emit("fail");
+  const payload = useMapLoader(reactive({
+    ...toRefs(props),
+    onSuccess,
+    onFail
+  }));
   const context = new Proxy(props, {
     get(target, name, receiver) {
       if (name === "status")

package/dist/v2/hooks/useMapLoader.d.ts

@@ -1,5 +1,5 @@
-import { load as loadAmap } from "@amap/amap-jsapi-loader";
 import { type LoaderOptions } from "@googlemaps/js-api-loader";
+import { load as loadAmap } from "@heycar/amap-jsapi-loader";
 import { type Ref } from "vue-demi";
 import type { VNodeChild } from "../demi-polyfill";
 import type { ConnectionStatus, Language } from "../types/interface";

package/dist/v2/hooks/useMapLoader.js

@@ -3,201 +3,6 @@ import { apiPingAmap, apiPingGmap } from "../api/pingConnection.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { createOneConcurrent, sleep, createRunOnce } from "../utils/helper.js";
 import { patchGoogleMapLoader } from "../utils/patchGoogleMapLoader.js";
-var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-var distExports = {};
-var dist = {
-  get exports() {
-    return distExports;
-  },
-  set exports(v) {
-    distExports = v;
-  }
-};
-(function(module, exports) {
-  (function(m, p) {
-    module.exports = p();
-  })(commonjsGlobal, function() {
-    function m(a) {
-      var b2 = [];
-      a.AMapUI && b2.push(p(a.AMapUI));
-      a.Loca && b2.push(r(a.Loca));
-      return Promise.all(b2);
-    }
-    function p(a) {
-      return new Promise(function(h, c) {
-        var f = [];
-        if (a.plugins)
-          for (var e = 0; e < a.plugins.length; e += 1)
-            -1 == d.AMapUI.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
-        if (g.AMapUI === b.failed)
-          c("前次请求 AMapUI 失败");
-        else if (g.AMapUI === b.notload) {
-          g.AMapUI = b.loading;
-          d.AMapUI.version = a.version || d.AMapUI.version;
-          e = d.AMapUI.version;
-          var l = document.body || document.head, k = document.createElement("script");
-          k.type = "text/javascript";
-          k.src = "https://webapi.amap.com/ui/" + e + "/main.js";
-          k.onerror = function(a2) {
-            g.AMapUI = b.failed;
-            c("请求 AMapUI 失败");
-          };
-          k.onload = function() {
-            g.AMapUI = b.loaded;
-            if (f.length)
-              window.AMapUI.loadUI(f, function() {
-                for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
-                  var c2 = f[a2].split("/").slice(-1)[0];
-                  window.AMapUI[c2] = arguments[a2];
-                }
-                for (h(); n.AMapUI.length; )
-                  n.AMapUI.splice(0, 1)[0]();
-              });
-            else
-              for (h(); n.AMapUI.length; )
-                n.AMapUI.splice(0, 1)[0]();
-          };
-          l.appendChild(k);
-        } else
-          g.AMapUI === b.loaded ? a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : f.length ? window.AMapUI.loadUI(f, function() {
-            for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
-              var c2 = f[a2].split("/").slice(-1)[0];
-              window.AMapUI[c2] = arguments[a2];
-            }
-            h();
-          }) : h() : a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : n.AMapUI.push(function(a2) {
-            a2 ? c(a2) : f.length ? window.AMapUI.loadUI(f, function() {
-              for (var a3 = 0, b2 = f.length; a3 < b2; a3++) {
-                var c2 = f[a3].split("/").slice(-1)[0];
-                window.AMapUI[c2] = arguments[a3];
-              }
-              h();
-            }) : h();
-          });
-      });
-    }
-    function r(a) {
-      return new Promise(function(h, c) {
-        if (g.Loca === b.failed)
-          c("前次请求 Loca 失败");
-        else if (g.Loca === b.notload) {
-          g.Loca = b.loading;
-          d.Loca.version = a.version || d.Loca.version;
-          var f = d.Loca.version, e = d.AMap.version.startsWith("2"), l = f.startsWith("2");
-          if (e && !l || !e && l)
-            c("JSAPI 与 Loca 版本不对应！！");
-          else {
-            e = d.key;
-            l = document.body || document.head;
-            var k = document.createElement("script");
-            k.type = "text/javascript";
-            k.src = "https://webapi.amap.com/loca?v=" + f + "&key=" + e;
-            k.onerror = function(a2) {
-              g.Loca = b.failed;
-              c("请求 AMapUI 失败");
-            };
-            k.onload = function() {
-              g.Loca = b.loaded;
-              for (h(); n.Loca.length; )
-                n.Loca.splice(0, 1)[0]();
-            };
-            l.appendChild(k);
-          }
-        } else
-          g.Loca === b.loaded ? a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : h() : a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : n.Loca.push(function(a2) {
-            a2 ? c(a2) : c();
-          });
-      });
-    }
-    if (!window)
-      throw Error("AMap JSAPI can only be used in Browser.");
-    var b;
-    (function(a) {
-      a.notload = "notload";
-      a.loading = "loading";
-      a.loaded = "loaded";
-      a.failed = "failed";
-    })(b || (b = {}));
-    var d = { key: "", AMap: { version: "1.4.15", plugins: [] }, AMapUI: { version: "1.1", plugins: [] }, Loca: { version: "1.3.2" } }, g = { AMap: b.notload, AMapUI: b.notload, Loca: b.notload }, n = { AMap: [], AMapUI: [], Loca: [] }, q = [], t = function(a) {
-      "function" == typeof a && (g.AMap === b.loaded ? a(window.AMap) : q.push(a));
-    };
-    return { load: function(a) {
-      return new Promise(function(h, c) {
-        if (g.AMap == b.failed)
-          c("");
-        else if (g.AMap == b.notload) {
-          var f = a.key, e = a.version, l = a.plugins;
-          f ? (window.AMap && "lbs.amap.com" !== location.host && c("禁止多种API加载方式混用"), d.key = f, d.AMap.version = e || d.AMap.version, d.AMap.plugins = l || d.AMap.plugins, g.AMap = b.loading, e = document.body || document.head, window.___onAPILoaded = function(d2) {
-            delete window.___onAPILoaded;
-            if (d2)
-              g.AMap = b.failed, c(d2);
-            else
-              for (g.AMap = b.loaded, m(a).then(function() {
-                h(window.AMap);
-              })["catch"](c); q.length; )
-                q.splice(0, 1)[0]();
-          }, l = document.createElement("script"), l.type = "text/javascript", l.src = "https://webapi.amap.com/maps?callback=___onAPILoaded&v=" + d.AMap.version + "&key=" + f + "&plugin=" + d.AMap.plugins.join(","), l.onerror = function(a2) {
-            g.AMap = b.failed;
-            c(a2);
-          }, e.appendChild(l)) : c("请填写key");
-        } else if (g.AMap == b.loaded)
-          if (a.key && a.key !== d.key)
-            c("多个不一致的 key");
-          else if (a.version && a.version !== d.AMap.version)
-            c("不允许多个版本 JSAPI 混用");
-          else {
-            f = [];
-            if (a.plugins)
-              for (e = 0; e < a.plugins.length; e += 1)
-                -1 == d.AMap.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
-            if (f.length)
-              window.AMap.plugin(f, function() {
-                m(a).then(function() {
-                  h(window.AMap);
-                })["catch"](c);
-              });
-            else
-              m(a).then(function() {
-                h(window.AMap);
-              })["catch"](c);
-          }
-        else if (a.key && a.key !== d.key)
-          c("多个不一致的 key");
-        else if (a.version && a.version !== d.AMap.version)
-          c("不允许多个版本 JSAPI 混用");
-        else {
-          var k = [];
-          if (a.plugins)
-            for (e = 0; e < a.plugins.length; e += 1)
-              -1 == d.AMap.plugins.indexOf(a.plugins[e]) && k.push(a.plugins[e]);
-          t(function() {
-            if (k.length)
-              window.AMap.plugin(k, function() {
-                m(a).then(function() {
-                  h(window.AMap);
-                })["catch"](c);
-              });
-            else
-              m(a).then(function() {
-                h(window.AMap);
-              })["catch"](c);
-          });
-        }
-      });
-    }, reset: function() {
-      delete window.AMap;
-      delete window.AMapUI;
-      delete window.Loca;
-      d = { key: "", AMap: { version: "1.4.15", plugins: [] }, AMapUI: { version: "1.1", plugins: [] }, Loca: { version: "1.3.2" } };
-      g = {
-        AMap: b.notload,
-        AMapUI: b.notload,
-        Loca: b.notload
-      };
-      n = { AMap: [], AMapUI: [], Loca: [] };
-    } };
-  });
-})(dist);
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function(resolve) {
@@ -539,6 +344,208 @@ class Loader {
     }
   }
 }
+var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
+var distExports = {};
+var dist = {
+  get exports() {
+    return distExports;
+  },
+  set exports(v) {
+    distExports = v;
+  }
+};
+(function(module, exports) {
+  (function(m, p) {
+    module.exports = p();
+  })(commonjsGlobal, function() {
+    function m(a) {
+      var b2 = [];
+      a.AMapUI && b2.push(p(a.AMapUI));
+      a.Loca && b2.push(r(a.Loca));
+      return Promise.all(b2);
+    }
+    function p(a) {
+      return new Promise(function(h, c) {
+        var f = [];
+        if (a.plugins)
+          for (var e = 0; e < a.plugins.length; e += 1)
+            -1 == d.AMapUI.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
+        if (g.AMapUI === b.failed)
+          c("前次请求 AMapUI 失败");
+        else if (g.AMapUI === b.notload) {
+          g.AMapUI = b.loading;
+          d.AMapUI.version = a.version || d.AMapUI.version;
+          e = d.AMapUI.version;
+          var l = document.body || document.head, k = document.createElement("script");
+          k.type = "text/javascript";
+          k.src = "https://webapi.amap.com/ui/" + e + "/main.js";
+          k.onerror = function(a2) {
+            g.AMapUI = b.failed;
+            c("请求 AMapUI 失败");
+          };
+          k.onload = function() {
+            g.AMapUI = b.loaded;
+            if (f.length)
+              window.AMapUI.loadUI(f, function() {
+                for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
+                  var c2 = f[a2].split("/").slice(-1)[0];
+                  window.AMapUI[c2] = arguments[a2];
+                }
+                for (h(); n.AMapUI.length; )
+                  n.AMapUI.splice(0, 1)[0]();
+              });
+            else
+              for (h(); n.AMapUI.length; )
+                n.AMapUI.splice(0, 1)[0]();
+          };
+          l.appendChild(k);
+        } else
+          g.AMapUI === b.loaded ? a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : f.length ? window.AMapUI.loadUI(f, function() {
+            for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
+              var c2 = f[a2].split("/").slice(-1)[0];
+              window.AMapUI[c2] = arguments[a2];
+            }
+            h();
+          }) : h() : a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : n.AMapUI.push(function(a2) {
+            a2 ? c(a2) : f.length ? window.AMapUI.loadUI(f, function() {
+              for (var a3 = 0, b2 = f.length; a3 < b2; a3++) {
+                var c2 = f[a3].split("/").slice(-1)[0];
+                window.AMapUI[c2] = arguments[a3];
+              }
+              h();
+            }) : h();
+          });
+      });
+    }
+    function r(a) {
+      return new Promise(function(h, c) {
+        if (g.Loca === b.failed)
+          c("前次请求 Loca 失败");
+        else if (g.Loca === b.notload) {
+          g.Loca = b.loading;
+          d.Loca.version = a.version || d.Loca.version;
+          var f = d.Loca.version, e = d.AMap.version.startsWith("2"), l = f.startsWith("2");
+          if (e && !l || !e && l)
+            c("JSAPI 与 Loca 版本不对应！！");
+          else {
+            e = d.key;
+            l = document.body || document.head;
+            var k = document.createElement("script");
+            k.type = "text/javascript";
+            k.src = "https://webapi.amap.com/loca?v=" + f + "&key=" + e;
+            k.onerror = function(a2) {
+              g.Loca = b.failed;
+              c("请求 AMapUI 失败");
+            };
+            k.onload = function() {
+              g.Loca = b.loaded;
+              for (h(); n.Loca.length; )
+                n.Loca.splice(0, 1)[0]();
+            };
+            l.appendChild(k);
+          }
+        } else
+          g.Loca === b.loaded ? a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : h() : a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : n.Loca.push(function(a2) {
+            a2 ? c(a2) : c();
+          });
+      });
+    }
+    var b;
+    (function(a) {
+      a.notload = "notload";
+      a.loading = "loading";
+      a.loaded = "loaded";
+      a.failed = "failed";
+    })(b || (b = {}));
+    var d = {
+      key: "",
+      AMap: { version: "1.4.15", plugins: [] },
+      AMapUI: { version: "1.1", plugins: [] },
+      Loca: { version: "1.3.2" }
+    }, g = { AMap: b.notload, AMapUI: b.notload, Loca: b.notload }, n = { AMap: [], AMapUI: [], Loca: [] }, q = [], t = function(a) {
+      "function" == typeof a && (g.AMap === b.loaded ? a(window.AMap) : q.push(a));
+    };
+    return {
+      load: function(a) {
+        return new Promise(function(h, c) {
+          if (g.AMap == b.failed)
+            c("");
+          else if (g.AMap == b.notload) {
+            var f = a.key, e = a.version, l = a.plugins;
+            f ? (window.AMap && "lbs.amap.com" !== location.host && c("禁止多种API加载方式混用"), d.key = f, d.AMap.version = e || d.AMap.version, d.AMap.plugins = l || d.AMap.plugins, g.AMap = b.loading, e = document.body || document.head, window.___onAPILoaded = function(d2) {
+              delete window.___onAPILoaded;
+              if (d2)
+                g.AMap = b.failed, c(d2);
+              else
+                for (g.AMap = b.loaded, m(a).then(function() {
+                  h(window.AMap);
+                })["catch"](c); q.length; )
+                  q.splice(0, 1)[0]();
+            }, l = document.createElement("script"), l.type = "text/javascript", l.async = true, l.fetchPriority = "high", l.src = "https://webapi.amap.com/maps?callback=___onAPILoaded&v=" + d.AMap.version + "&key=" + f + "&plugin=" + d.AMap.plugins.join(","), l.onerror = function(a2) {
+              g.AMap = b.failed;
+              c(a2);
+            }, e.appendChild(l)) : c("请填写key");
+          } else if (g.AMap == b.loaded)
+            if (a.key && a.key !== d.key)
+              c("多个不一致的 key");
+            else if (a.version && a.version !== d.AMap.version)
+              c("不允许多个版本 JSAPI 混用");
+            else {
+              f = [];
+              if (a.plugins)
+                for (e = 0; e < a.plugins.length; e += 1)
+                  -1 == d.AMap.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
+              if (f.length)
+                window.AMap.plugin(f, function() {
+                  m(a).then(function() {
+                    h(window.AMap);
+                  })["catch"](c);
+                });
+              else
+                m(a).then(function() {
+                  h(window.AMap);
+                })["catch"](c);
+            }
+          else if (a.key && a.key !== d.key)
+            c("多个不一致的 key");
+          else if (a.version && a.version !== d.AMap.version)
+            c("不允许多个版本 JSAPI 混用");
+          else {
+            var k = [];
+            if (a.plugins)
+              for (e = 0; e < a.plugins.length; e += 1)
+                -1 == d.AMap.plugins.indexOf(a.plugins[e]) && k.push(a.plugins[e]);
+            t(function() {
+              if (k.length)
+                window.AMap.plugin(k, function() {
+                  m(a).then(function() {
+                    h(window.AMap);
+                  })["catch"](c);
+                });
+              else
+                m(a).then(function() {
+                  h(window.AMap);
+                })["catch"](c);
+            });
+          }
+        });
+      },
+      reset: function() {
+        delete window.AMap;
+        delete window.AMapUI;
+        delete window.Loca;
+        d = {
+          key: "",
+          AMap: { version: "1.4.15", plugins: [] },
+          AMapUI: { version: "1.1", plugins: [] },
+          Loca: { version: "1.3.2" }
+        };
+        g = { AMap: b.notload, AMapUI: b.notload, Loca: b.notload };
+        n = { AMap: [], AMapUI: [], Loca: [] };
+      }
+    };
+  });
+})(dist);
 const MIN_MAP_RELOAD_INTERVAL = 5e3;
 const DEFAULT_AMAP_PLUGINS = [
   "AMap.Geocoder",

package/dist/v2/types/global.d.ts

@@ -20,6 +20,6 @@ declare global {
         deviceorientationabsolute: DeviceOrientationEvent;
     }
 }
-declare module "@amap/amap-jsapi-loader" {
+declare module "@heycar/amap-jsapi-loader" {
     const reset: () => void;
 }

package/dist/v2/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.0.0-switchMap9";
+const pkgVersion = "2.1.0-speedupAmap1";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/v3/App.js

@@ -20,7 +20,9 @@ const App = /* @__PURE__ */ defineComponent({
       "language": "en",
       "supplier": supplierRef.value,
       "renderLoadFailedTitle": () => supplierRef.value === "gmap" ? "未能成功访问谷歌地图" : "高德地图加载失败",
-      "renderLoadFailedDescription": () => supplierRef.value === "gmap" ? "请确认您的网络能正常访问谷歌地图， \n或切回高德地图" : void 0
+      "renderLoadFailedDescription": () => supplierRef.value === "gmap" ? "请确认您的网络能正常访问谷歌地图， \n或切回高德地图" : void 0,
+      "onSuccess": () => console.log(`${supplierRef.value} load success`),
+      "onFail": () => console.log(`${supplierRef.value} load failed`)
     }, {
       default: () => [createVNode(DemoBusinessQuoting, null, null)]
     });

package/dist/v3/components/MapProvider/MapProvider.d.ts

@@ -6,7 +6,7 @@ import { type MapSupplierPayolad } from "../../hooks/useMapSupplier";
 import type { AmapMap } from "../../types/interface";
 import { type AmapProps } from "../Amap";
 export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "renderLoadFailedTitle" | "renderLoadFailedDescription">;
-export declare const MapProvider: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<MapProviderProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<MapProviderProps, Required<MapProviderProps>>, "success" | "fail", import("vue").PublicProps, MapProviderProps, MapProviderProps, import("vue").SlotsType<{
+export declare const MapProvider: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<MapProviderProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<MapProviderProps, Required<MapProviderProps>>, "success" | "fail", import("vue-demi").PublicProps, MapProviderProps, MapProviderProps, import("vue-demi").SlotsType<{
     renderLoadFailedTitle?: ((status: Status) => string | undefined) | undefined;
     renderLoadFailedDescription?: ((status: Status) => string | undefined) | undefined;
 } & {
@@ -21,11 +21,11 @@ export interface HeycarMapProps extends Pick<GmapLoaderProps, "fallback" | "load
     onZoomEnd?: (value: number) => any;
     onResize?: () => any;
 }
-export declare const HeycarMap: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<HeycarMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<HeycarMapProps, Required<HeycarMapProps>>, "resize" | "dragEnd" | "zoomEnd", import("vue").PublicProps, HeycarMapProps, HeycarMapProps, import("vue").SlotsType<{
+export declare const HeycarMap: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<HeycarMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<HeycarMapProps, Required<HeycarMapProps>>, "resize" | "dragEnd" | "zoomEnd", import("vue-demi").PublicProps, HeycarMapProps, HeycarMapProps, import("vue-demi").SlotsType<{
     mapRef?: SetMap<import("../Amap/SafeAmap").SafeAmap> | SetMap<google.maps.Map> | undefined;
     outerArea?: (() => VueNode) | undefined;
-    fallback?: (() => import("vue").VNodeChild) | undefined;
-    loading?: (() => import("vue").VNodeChild) | undefined;
+    fallback?: (() => import("vue-demi").VNodeChild) | undefined;
+    loading?: (() => import("vue-demi").VNodeChild) | undefined;
 } & {
     default?: import("../../demi-polyfill").Slot | undefined;
 }>>;

package/dist/v3/components/MapProvider/MapProvider.js

@@ -1,5 +1,6 @@
 import "../../css/MapProvider-156bfd53.css";
 import { createVNode, isVNode } from "vue";
+import { reactive, toRefs } from "vue-demi";
 import { L as LoadFailed, a as Loading, i as imgGrid } from "../../chunks/Loading.21d8e759.js";
 import { useMapLoader, Status } from "../../hooks/useMapLoader.js";
 import { provideMapSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
@@ -22,9 +23,16 @@ if (detectWebGL() === WEBGL_STATUS.ENABLED) {
   window.forceWebGL = true;
 }
 const MapProvider = defineLagecySetup("MapProvider", function(props, {
-  slots
+  slots,
+  emit
 }) {
-  const payload = useMapLoader(props);
+  const onSuccess = () => emit("success");
+  const onFail = () => emit("fail");
+  const payload = useMapLoader(reactive({
+    ...toRefs(props),
+    onSuccess,
+    onFail
+  }));
   const context = new Proxy(props, {
     get(target, name, receiver) {
       if (name === "status")

package/dist/v3/hooks/useMapLoader.d.ts

@@ -1,5 +1,5 @@
-import { load as loadAmap } from "@amap/amap-jsapi-loader";
 import { type LoaderOptions } from "@googlemaps/js-api-loader";
+import { load as loadAmap } from "@heycar/amap-jsapi-loader";
 import { type Ref } from "vue-demi";
 import type { VNodeChild } from "../demi-polyfill";
 import type { ConnectionStatus, Language } from "../types/interface";

package/dist/v3/hooks/useMapLoader.js

@@ -3,201 +3,6 @@ import { apiPingAmap, apiPingGmap } from "../api/pingConnection.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { createOneConcurrent, sleep, createRunOnce } from "../utils/helper.js";
 import { patchGoogleMapLoader } from "../utils/patchGoogleMapLoader.js";
-var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-var distExports = {};
-var dist = {
-  get exports() {
-    return distExports;
-  },
-  set exports(v) {
-    distExports = v;
-  }
-};
-(function(module, exports) {
-  (function(m, p) {
-    module.exports = p();
-  })(commonjsGlobal, function() {
-    function m(a) {
-      var b2 = [];
-      a.AMapUI && b2.push(p(a.AMapUI));
-      a.Loca && b2.push(r(a.Loca));
-      return Promise.all(b2);
-    }
-    function p(a) {
-      return new Promise(function(h, c) {
-        var f = [];
-        if (a.plugins)
-          for (var e = 0; e < a.plugins.length; e += 1)
-            -1 == d.AMapUI.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
-        if (g.AMapUI === b.failed)
-          c("前次请求 AMapUI 失败");
-        else if (g.AMapUI === b.notload) {
-          g.AMapUI = b.loading;
-          d.AMapUI.version = a.version || d.AMapUI.version;
-          e = d.AMapUI.version;
-          var l = document.body || document.head, k = document.createElement("script");
-          k.type = "text/javascript";
-          k.src = "https://webapi.amap.com/ui/" + e + "/main.js";
-          k.onerror = function(a2) {
-            g.AMapUI = b.failed;
-            c("请求 AMapUI 失败");
-          };
-          k.onload = function() {
-            g.AMapUI = b.loaded;
-            if (f.length)
-              window.AMapUI.loadUI(f, function() {
-                for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
-                  var c2 = f[a2].split("/").slice(-1)[0];
-                  window.AMapUI[c2] = arguments[a2];
-                }
-                for (h(); n.AMapUI.length; )
-                  n.AMapUI.splice(0, 1)[0]();
-              });
-            else
-              for (h(); n.AMapUI.length; )
-                n.AMapUI.splice(0, 1)[0]();
-          };
-          l.appendChild(k);
-        } else
-          g.AMapUI === b.loaded ? a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : f.length ? window.AMapUI.loadUI(f, function() {
-            for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
-              var c2 = f[a2].split("/").slice(-1)[0];
-              window.AMapUI[c2] = arguments[a2];
-            }
-            h();
-          }) : h() : a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : n.AMapUI.push(function(a2) {
-            a2 ? c(a2) : f.length ? window.AMapUI.loadUI(f, function() {
-              for (var a3 = 0, b2 = f.length; a3 < b2; a3++) {
-                var c2 = f[a3].split("/").slice(-1)[0];
-                window.AMapUI[c2] = arguments[a3];
-              }
-              h();
-            }) : h();
-          });
-      });
-    }
-    function r(a) {
-      return new Promise(function(h, c) {
-        if (g.Loca === b.failed)
-          c("前次请求 Loca 失败");
-        else if (g.Loca === b.notload) {
-          g.Loca = b.loading;
-          d.Loca.version = a.version || d.Loca.version;
-          var f = d.Loca.version, e = d.AMap.version.startsWith("2"), l = f.startsWith("2");
-          if (e && !l || !e && l)
-            c("JSAPI 与 Loca 版本不对应！！");
-          else {
-            e = d.key;
-            l = document.body || document.head;
-            var k = document.createElement("script");
-            k.type = "text/javascript";
-            k.src = "https://webapi.amap.com/loca?v=" + f + "&key=" + e;
-            k.onerror = function(a2) {
-              g.Loca = b.failed;
-              c("请求 AMapUI 失败");
-            };
-            k.onload = function() {
-              g.Loca = b.loaded;
-              for (h(); n.Loca.length; )
-                n.Loca.splice(0, 1)[0]();
-            };
-            l.appendChild(k);
-          }
-        } else
-          g.Loca === b.loaded ? a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : h() : a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : n.Loca.push(function(a2) {
-            a2 ? c(a2) : c();
-          });
-      });
-    }
-    if (!window)
-      throw Error("AMap JSAPI can only be used in Browser.");
-    var b;
-    (function(a) {
-      a.notload = "notload";
-      a.loading = "loading";
-      a.loaded = "loaded";
-      a.failed = "failed";
-    })(b || (b = {}));
-    var d = { key: "", AMap: { version: "1.4.15", plugins: [] }, AMapUI: { version: "1.1", plugins: [] }, Loca: { version: "1.3.2" } }, g = { AMap: b.notload, AMapUI: b.notload, Loca: b.notload }, n = { AMap: [], AMapUI: [], Loca: [] }, q = [], t = function(a) {
-      "function" == typeof a && (g.AMap === b.loaded ? a(window.AMap) : q.push(a));
-    };
-    return { load: function(a) {
-      return new Promise(function(h, c) {
-        if (g.AMap == b.failed)
-          c("");
-        else if (g.AMap == b.notload) {
-          var f = a.key, e = a.version, l = a.plugins;
-          f ? (window.AMap && "lbs.amap.com" !== location.host && c("禁止多种API加载方式混用"), d.key = f, d.AMap.version = e || d.AMap.version, d.AMap.plugins = l || d.AMap.plugins, g.AMap = b.loading, e = document.body || document.head, window.___onAPILoaded = function(d2) {
-            delete window.___onAPILoaded;
-            if (d2)
-              g.AMap = b.failed, c(d2);
-            else
-              for (g.AMap = b.loaded, m(a).then(function() {
-                h(window.AMap);
-              })["catch"](c); q.length; )
-                q.splice(0, 1)[0]();
-          }, l = document.createElement("script"), l.type = "text/javascript", l.src = "https://webapi.amap.com/maps?callback=___onAPILoaded&v=" + d.AMap.version + "&key=" + f + "&plugin=" + d.AMap.plugins.join(","), l.onerror = function(a2) {
-            g.AMap = b.failed;
-            c(a2);
-          }, e.appendChild(l)) : c("请填写key");
-        } else if (g.AMap == b.loaded)
-          if (a.key && a.key !== d.key)
-            c("多个不一致的 key");
-          else if (a.version && a.version !== d.AMap.version)
-            c("不允许多个版本 JSAPI 混用");
-          else {
-            f = [];
-            if (a.plugins)
-              for (e = 0; e < a.plugins.length; e += 1)
-                -1 == d.AMap.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
-            if (f.length)
-              window.AMap.plugin(f, function() {
-                m(a).then(function() {
-                  h(window.AMap);
-                })["catch"](c);
-              });
-            else
-              m(a).then(function() {
-                h(window.AMap);
-              })["catch"](c);
-          }
-        else if (a.key && a.key !== d.key)
-          c("多个不一致的 key");
-        else if (a.version && a.version !== d.AMap.version)
-          c("不允许多个版本 JSAPI 混用");
-        else {
-          var k = [];
-          if (a.plugins)
-            for (e = 0; e < a.plugins.length; e += 1)
-              -1 == d.AMap.plugins.indexOf(a.plugins[e]) && k.push(a.plugins[e]);
-          t(function() {
-            if (k.length)
-              window.AMap.plugin(k, function() {
-                m(a).then(function() {
-                  h(window.AMap);
-                })["catch"](c);
-              });
-            else
-              m(a).then(function() {
-                h(window.AMap);
-              })["catch"](c);
-          });
-        }
-      });
-    }, reset: function() {
-      delete window.AMap;
-      delete window.AMapUI;
-      delete window.Loca;
-      d = { key: "", AMap: { version: "1.4.15", plugins: [] }, AMapUI: { version: "1.1", plugins: [] }, Loca: { version: "1.3.2" } };
-      g = {
-        AMap: b.notload,
-        AMapUI: b.notload,
-        Loca: b.notload
-      };
-      n = { AMap: [], AMapUI: [], Loca: [] };
-    } };
-  });
-})(dist);
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function(resolve) {
@@ -539,6 +344,208 @@ class Loader {
     }
   }
 }
+var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
+var distExports = {};
+var dist = {
+  get exports() {
+    return distExports;
+  },
+  set exports(v) {
+    distExports = v;
+  }
+};
+(function(module, exports) {
+  (function(m, p) {
+    module.exports = p();
+  })(commonjsGlobal, function() {
+    function m(a) {
+      var b2 = [];
+      a.AMapUI && b2.push(p(a.AMapUI));
+      a.Loca && b2.push(r(a.Loca));
+      return Promise.all(b2);
+    }
+    function p(a) {
+      return new Promise(function(h, c) {
+        var f = [];
+        if (a.plugins)
+          for (var e = 0; e < a.plugins.length; e += 1)
+            -1 == d.AMapUI.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
+        if (g.AMapUI === b.failed)
+          c("前次请求 AMapUI 失败");
+        else if (g.AMapUI === b.notload) {
+          g.AMapUI = b.loading;
+          d.AMapUI.version = a.version || d.AMapUI.version;
+          e = d.AMapUI.version;
+          var l = document.body || document.head, k = document.createElement("script");
+          k.type = "text/javascript";
+          k.src = "https://webapi.amap.com/ui/" + e + "/main.js";
+          k.onerror = function(a2) {
+            g.AMapUI = b.failed;
+            c("请求 AMapUI 失败");
+          };
+          k.onload = function() {
+            g.AMapUI = b.loaded;
+            if (f.length)
+              window.AMapUI.loadUI(f, function() {
+                for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
+                  var c2 = f[a2].split("/").slice(-1)[0];
+                  window.AMapUI[c2] = arguments[a2];
+                }
+                for (h(); n.AMapUI.length; )
+                  n.AMapUI.splice(0, 1)[0]();
+              });
+            else
+              for (h(); n.AMapUI.length; )
+                n.AMapUI.splice(0, 1)[0]();
+          };
+          l.appendChild(k);
+        } else
+          g.AMapUI === b.loaded ? a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : f.length ? window.AMapUI.loadUI(f, function() {
+            for (var a2 = 0, b2 = f.length; a2 < b2; a2++) {
+              var c2 = f[a2].split("/").slice(-1)[0];
+              window.AMapUI[c2] = arguments[a2];
+            }
+            h();
+          }) : h() : a.version && a.version !== d.AMapUI.version ? c("不允许多个版本 AMapUI 混用") : n.AMapUI.push(function(a2) {
+            a2 ? c(a2) : f.length ? window.AMapUI.loadUI(f, function() {
+              for (var a3 = 0, b2 = f.length; a3 < b2; a3++) {
+                var c2 = f[a3].split("/").slice(-1)[0];
+                window.AMapUI[c2] = arguments[a3];
+              }
+              h();
+            }) : h();
+          });
+      });
+    }
+    function r(a) {
+      return new Promise(function(h, c) {
+        if (g.Loca === b.failed)
+          c("前次请求 Loca 失败");
+        else if (g.Loca === b.notload) {
+          g.Loca = b.loading;
+          d.Loca.version = a.version || d.Loca.version;
+          var f = d.Loca.version, e = d.AMap.version.startsWith("2"), l = f.startsWith("2");
+          if (e && !l || !e && l)
+            c("JSAPI 与 Loca 版本不对应！！");
+          else {
+            e = d.key;
+            l = document.body || document.head;
+            var k = document.createElement("script");
+            k.type = "text/javascript";
+            k.src = "https://webapi.amap.com/loca?v=" + f + "&key=" + e;
+            k.onerror = function(a2) {
+              g.Loca = b.failed;
+              c("请求 AMapUI 失败");
+            };
+            k.onload = function() {
+              g.Loca = b.loaded;
+              for (h(); n.Loca.length; )
+                n.Loca.splice(0, 1)[0]();
+            };
+            l.appendChild(k);
+          }
+        } else
+          g.Loca === b.loaded ? a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : h() : a.version && a.version !== d.Loca.version ? c("不允许多个版本 Loca 混用") : n.Loca.push(function(a2) {
+            a2 ? c(a2) : c();
+          });
+      });
+    }
+    var b;
+    (function(a) {
+      a.notload = "notload";
+      a.loading = "loading";
+      a.loaded = "loaded";
+      a.failed = "failed";
+    })(b || (b = {}));
+    var d = {
+      key: "",
+      AMap: { version: "1.4.15", plugins: [] },
+      AMapUI: { version: "1.1", plugins: [] },
+      Loca: { version: "1.3.2" }
+    }, g = { AMap: b.notload, AMapUI: b.notload, Loca: b.notload }, n = { AMap: [], AMapUI: [], Loca: [] }, q = [], t = function(a) {
+      "function" == typeof a && (g.AMap === b.loaded ? a(window.AMap) : q.push(a));
+    };
+    return {
+      load: function(a) {
+        return new Promise(function(h, c) {
+          if (g.AMap == b.failed)
+            c("");
+          else if (g.AMap == b.notload) {
+            var f = a.key, e = a.version, l = a.plugins;
+            f ? (window.AMap && "lbs.amap.com" !== location.host && c("禁止多种API加载方式混用"), d.key = f, d.AMap.version = e || d.AMap.version, d.AMap.plugins = l || d.AMap.plugins, g.AMap = b.loading, e = document.body || document.head, window.___onAPILoaded = function(d2) {
+              delete window.___onAPILoaded;
+              if (d2)
+                g.AMap = b.failed, c(d2);
+              else
+                for (g.AMap = b.loaded, m(a).then(function() {
+                  h(window.AMap);
+                })["catch"](c); q.length; )
+                  q.splice(0, 1)[0]();
+            }, l = document.createElement("script"), l.type = "text/javascript", l.async = true, l.fetchPriority = "high", l.src = "https://webapi.amap.com/maps?callback=___onAPILoaded&v=" + d.AMap.version + "&key=" + f + "&plugin=" + d.AMap.plugins.join(","), l.onerror = function(a2) {
+              g.AMap = b.failed;
+              c(a2);
+            }, e.appendChild(l)) : c("请填写key");
+          } else if (g.AMap == b.loaded)
+            if (a.key && a.key !== d.key)
+              c("多个不一致的 key");
+            else if (a.version && a.version !== d.AMap.version)
+              c("不允许多个版本 JSAPI 混用");
+            else {
+              f = [];
+              if (a.plugins)
+                for (e = 0; e < a.plugins.length; e += 1)
+                  -1 == d.AMap.plugins.indexOf(a.plugins[e]) && f.push(a.plugins[e]);
+              if (f.length)
+                window.AMap.plugin(f, function() {
+                  m(a).then(function() {
+                    h(window.AMap);
+                  })["catch"](c);
+                });
+              else
+                m(a).then(function() {
+                  h(window.AMap);
+                })["catch"](c);
+            }
+          else if (a.key && a.key !== d.key)
+            c("多个不一致的 key");
+          else if (a.version && a.version !== d.AMap.version)
+            c("不允许多个版本 JSAPI 混用");
+          else {
+            var k = [];
+            if (a.plugins)
+              for (e = 0; e < a.plugins.length; e += 1)
+                -1 == d.AMap.plugins.indexOf(a.plugins[e]) && k.push(a.plugins[e]);
+            t(function() {
+              if (k.length)
+                window.AMap.plugin(k, function() {
+                  m(a).then(function() {
+                    h(window.AMap);
+                  })["catch"](c);
+                });
+              else
+                m(a).then(function() {
+                  h(window.AMap);
+                })["catch"](c);
+            });
+          }
+        });
+      },
+      reset: function() {
+        delete window.AMap;
+        delete window.AMapUI;
+        delete window.Loca;
+        d = {
+          key: "",
+          AMap: { version: "1.4.15", plugins: [] },
+          AMapUI: { version: "1.1", plugins: [] },
+          Loca: { version: "1.3.2" }
+        };
+        g = { AMap: b.notload, AMapUI: b.notload, Loca: b.notload };
+        n = { AMap: [], AMapUI: [], Loca: [] };
+      }
+    };
+  });
+})(dist);
 const MIN_MAP_RELOAD_INTERVAL = 5e3;
 const DEFAULT_AMAP_PLUGINS = [
   "AMap.Geocoder",

package/dist/v3/types/global.d.ts

@@ -20,6 +20,6 @@ declare global {
         deviceorientationabsolute: DeviceOrientationEvent;
     }
 }
-declare module "@amap/amap-jsapi-loader" {
+declare module "@heycar/amap-jsapi-loader" {
     const reset: () => void;
 }

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.0.0-switchMap9";
+const pkgVersion = "2.1.0-speedupAmap1";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.0.0-switchMap9",
+  "version": "2.1.0-speedupAmap1",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",
@@ -35,10 +35,10 @@
     "dist"
   ],
   "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.13",
     "@googlemaps/js-api-loader": "1.16.6",
     "@googlemaps/typescript-guards": "^2.0.3",
+    "@heycar/amap-jsapi-loader": "npm:@heycar/amap-jsapi-loader@1.0.1-fetchPriority",
     "@types/google.maps": "^3.54.10",
     "@types/lodash-es": "^4.17.6",
     "@use-gesture/vanilla": "^10.2.26",