mrxy-yk 1.7.0-beta.2 → 1.7.0-beta.3

package/dist/components/coordinate-pickup/CoordinatePickup.vue.js

@@ -64,7 +64,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       emits("update:modelValue", false);
     };
     const coordinatePickupRef = shallowRef();
-    let aMapHook = useAMapClassicHook({
+    const aMapHook = useAMapClassicHook({
+      autoLoad: false,
       el: coordinatePickupRef,
       mapStyle: props.mapStyle,
       loaderOptions: {
@@ -74,16 +75,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }, loadAMap);
     function initAMap() {
-      if (aMapHook) return;
-      aMapHook = useAMapClassicHook({
-        el: coordinatePickupRef,
-        mapStyle: props.mapStyle,
-        loaderOptions: {
-          key: mapKey,
-          secret: mapSecret,
-          plugins: ["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geocoder"]
-        }
-      }, loadAMap);
+      if (aMapHook.map) return;
+      aMapHook.init();
     }
     function loadAMap() {
       const AMap = aMapHook.AMap;

package/dist/utils/amap/index.js

@@ -1,6 +1,6 @@
 import AMapLoader from "@amap/amap-jsapi-loader";
 import { AMapConfig } from "../../config/index.js";
-import { onMounted, shallowRef, useTemplateRef, onBeforeUnmount, toValue } from "vue";
+import { onMounted, onBeforeUnmount, shallowRef, useTemplateRef, toValue } from "vue";
 async function useAMapLoader(options) {
   const o = options || {};
   const win = window;
@@ -65,8 +65,8 @@ function newAMapInfoWindow(options, AMap) {
 function useAMapClassicHook(options, callback) {
   const o = options;
   const retRes = {};
-  let map = null;
-  onMounted(async () => {
+  async function initAMap() {
+    if (map) return;
     const mapPlugins = /* @__PURE__ */ new Set(["AMap.MarkerCluster", ...o?.plugins || [], ...o?.loaderOptions?.plugins || []]);
     const AMap = await useAMapLoader({
       ...o?.loaderOptions,
@@ -79,6 +79,10 @@ function useAMapClassicHook(options, callback) {
     } else if (o.el) {
       elRef = o.el;
     }
+    if (!elRef.value) {
+      console.warn("AMapClassicHook: Map el is required");
+      return;
+    }
     const mapOptions = typeof o?.mapOpts === "function" ? o.mapOpts() : o.mapOpts;
     map = newAMapMap({
       el: elRef.value,
@@ -111,6 +115,13 @@ function useAMapClassicHook(options, callback) {
       ...infoWindowOptions
     }, AMap);
     callback?.(retRes);
+  }
+  retRes.init = initAMap;
+  let map = null;
+  onMounted(async () => {
+    if (o.autoLoad !== false) {
+      await initAMap();
+    }
   });
   onBeforeUnmount(() => {
     map.destroy();

package/dist/utils/amap/type.d.ts

@@ -22,6 +22,8 @@ type InfoOptions = ConstructorParameters<typeof AMap.InfoWindow>[0]
 type MarkerClusterOptions = ConstructorParameters<typeof AMap.MarkerCluster>[2]
 type MapOptions = ConstructorParameters<typeof AMap.Map>[1]
 export type UseAMapHookOptions = {
+  // 是否自动加载地图（缺省值为true）
+  autoLoad?: boolean
   // 加载选项
   plugins?: PluginsType[]
   loaderOptions?: LoaderOptions
@@ -39,6 +41,7 @@ export type UseAMapHookOptions = {
 }
 
 export type UseAMapHookExample = {
+  init: () => Promise<void>
   map: AMap.Map
   markerCluster: AMap.MarkerCluster
   infoWindow: AMap.InfoWindow

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mrxy-yk",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.3",
   "private": false,
   "type": "module",
   "description": "A collection of Vue 3 components and utilities",