@heycar/heycars-map 2.0.0-switchMap2 → 2.0.0-switchMap3

package/dist/index.d.ts

@@ -1 +1 @@
-export * from "./v2"
+export * from "./v3"

package/dist/index.js

@@ -1 +1 @@
-export * from "./v2"
+export * from "./v3"

package/dist/v2/Demo/DemoBusinessRecomendPlace.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.5be4fdcf.js";
+import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.f589ebf7.js";
 import { useBusinessRecomendPlaceMap } from "../hooks-business/useBusinessRecomendPlaceMap.js";
 import { defineSetup } from "../types/helper.js";
 import { d as demo } from "../chunks/Demo.css.e921a2f6.js";

package/dist/v2/business-components/BusinessQuotingMap/BusinessQuotingMap.js

@@ -4,7 +4,7 @@ import { createElement } from "../../demi-polyfill/demi-polyfill.js";
 import { useHeycarMap } from "../../hooks/useHeycarMap.js";
 import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapFitView } from "../../hooks/useMapFitView.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapSupplier, useMapAssertSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { generateCreateElementV2PropsOn } from "../../utils/compare.js";
 import { place2point, pipeDefer } from "../../utils/transform.js";
@@ -25,6 +25,9 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
   const {
     language
   } = useMapSupplier();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const {
     mapRef,
     setMap
@@ -40,7 +43,7 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
     mapRef,
     padding: BUSINESS_QUOTING_FITVIEW_PANDING
   });
-  mapContext.setFitView = () => setFitView(false);
+  mapContext.setFitView = assertSupplier(() => setFitView(false));
   const fittableRegistryOverlay = createFittableRegisterOverlay({
     registerOverlay,
     immediate: true

package/dist/v2/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.js

@@ -14,6 +14,7 @@ import "../../hooks/useMapSupplier.js";
 import "../../hooks/useMapZoom.js";
 import "../../types/helper.js";
 import "../../types/interface.js";
+import "../../utils/ManualAbortError.js";
 import "../../utils/compare.js";
 import "../../utils/helper.js";
 import "../../utils/platform.js";
@@ -25,7 +26,7 @@ import "../GreenZone/GreenZone.js";
 import "../PassengerCircle/PassengerCircle.js";
 import "../PickupPoints/PickupPoints.js";
 import "./useCacheCenterPlace.js";
-import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.5be4fdcf.js";
+import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.f589ebf7.js";
 export {
   B as BusinessRecomendPlaceMap,
   f as BusinessRecomendPlaceMapInner,

package/dist/v2/business-components/BusinessRecomendPlaceMap/index.js

@@ -1,4 +1,4 @@
-import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.5be4fdcf.js";
+import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.f589ebf7.js";
 export {
   B as BusinessRecomendPlaceMap,
   f as BusinessRecomendPlaceMapInner,

package/dist/v2/business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { reactive, watch, watchEffect } from "vue-demi";
+import { reactive, watch, watchEffect, onUnmounted } from "vue-demi";
 import { apiMemoryShouldSkipByKey } from "../../api/memory.js";
 import { HeycarMap } from "../../components/MapProvider/MapProvider.js";
 import { createElement } from "../../demi-polyfill/demi-polyfill.js";
@@ -9,17 +9,18 @@ import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapDrag } from "../../hooks/useMapDrag.js";
 import { useMapGeometry } from "../../hooks/useMapGeometry.js";
 import { useMapRecomendPlace } from "../../hooks/useMapRecomendPlace.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapAssertSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { useMapZoom } from "../../hooks/useMapZoom.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { CenterPlaceStatus } from "../../types/interface.js";
+import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../../utils/ManualAbortError.js";
 import { watchPostEffectOnce, generateCreateElementV2PropsOn } from "../../utils/compare.js";
 import { equalAssign, isPlacesInclude } from "../../utils/helper.js";
 import { detectBrowserPlatform } from "../../utils/platform.js";
 import { place2point, isPlaceEqual, pipeOnlyLastEffect, isZoneEqual, geoPositionError2businessTimeout } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinatePointType, toCoordinateRecommendZonePlacesType } from "../../utils/typeChecking.js";
 import { AbsoluteAddressBox } from "../AbsoluteAddressBox/AbsoluteAddressBox.js";
-import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_LARGE_LIMIT, a as RECOMMEND_PLACE_DRAG_LIMIT, Z as ZONE_ZOOM, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM } from "../../chunks/BusinessRecomendPlaceMap.5be4fdcf.js";
+import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_LARGE_LIMIT, a as RECOMMEND_PLACE_DRAG_LIMIT, Z as ZONE_ZOOM, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM } from "../../chunks/BusinessRecomendPlaceMap.f589ebf7.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
 import { GreenZone } from "../GreenZone/GreenZone.js";
 import { PassengerCircle } from "../PassengerCircle/PassengerCircle.js";
@@ -41,6 +42,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       ...EMPTY_PLACE
     }
   } = props;
+  const abortController = new AbortController();
   const {
     coordinatifyPoint,
     unCoordinatifyPoint,
@@ -68,6 +70,9 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     mapRef,
     defaultValue: DEFAULT_ZOOM
   });
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const defaultPlace = unCoordinatifyPlace(toCoordinatePlaceType(inputDefaultPlace));
   const centerPlace = reactive({
     lng: defaultPlace.lng,
@@ -148,19 +153,19 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       emitGeoErrorOnce(error);
     }
   });
-  mapContext.apiMapDistance = (from, to) => {
+  mapContext.apiMapDistance = assertSupplier((from, to) => {
     return apiMapDistance(unCoordinatifyPoint(toCoordinatePointType(from)), unCoordinatifyPoint(toCoordinatePointType(to)));
-  };
-  mapContext.setCenterPlaceByUserSpecified = setCenterPlaceByUserSpecified;
-  mapContext.setCenterPlaceByUserSpecifiedInZone = setCenterPlaceByUserSpecifiedInZone;
-  mapContext.panToGeoPositionByRecomend = () => {
+  });
+  mapContext.setCenterPlaceByUserSpecified = assertSupplier(setCenterPlaceByUserSpecified);
+  mapContext.setCenterPlaceByUserSpecifiedInZone = assertSupplier(setCenterPlaceByUserSpecifiedInZone);
+  mapContext.panToGeoPositionByRecomend = assertSupplier(() => {
     if (geoError.value)
       return false;
     updateCenterPlaceByPoint(geoPosition.value, {
       source: "geo"
     });
     return true;
-  };
+  });
   const {
     isDragging
   } = useMapDrag({
@@ -183,6 +188,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     emptyPlaceName: emptyTitle,
     queryingPlaceName: queryingTitle,
     context: centerSource,
+    signal: abortController.signal,
     getAvailable: pipedGetAvailable,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context) => {
@@ -202,7 +208,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       ...place
     }),
     onChangePlace: (place) => emit("changePlace", coordinatifyPlace(place)),
-    onChange: async ({
+    onChange: ({
       place,
       inputPlace,
       isInZone,
@@ -224,7 +230,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       }));
     }
   });
-  watchPostEffectOnce(() => updateRecommendPlaceOnlyInZone(defaultPlace));
+  watchPostEffectOnce(() => updateRecommendPlaceOnlyInZone(defaultPlace).catch(throwNoneManualAbortError));
   watch(centerPlace, (place) => {
     equalAssign(mapContext.centerPlace, coordinatifyPlace({
       ...place
@@ -236,6 +242,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
   watchEffect(() => {
     mapContext.centerPlaceStatusRef.value = isQueryingRef.value ? CenterPlaceStatus.QUERYING_INFO : !availableRef.value ? CenterPlaceStatus.SERVICE_UNAVAILABLE : CenterPlaceStatus.OK;
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     var _a, _b, _c;
     const {

package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { ref, watch } from "vue-demi";
+import { ref, watch, onUnmounted } from "vue-demi";
 import { apiGetAuxiliaryGrapStatus } from "../../api/browser.js";
 import { setGlobalGoogleSnapRoadProxyUrl } from "../../api/googleSnapRoad.js";
 import { HeycarMap } from "../../components/MapProvider/MapProvider.js";
@@ -8,9 +8,10 @@ import { useGeoLocation } from "../../hooks/useGeoLocation.js";
 import { useHeycarMap } from "../../hooks/useHeycarMap.js";
 import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapFitView } from "../../hooks/useMapFitView.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapAssertSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
-import { assertNotEmptyArray } from "../../utils/helper.js";
+import { MANUAL_ABORT_MESSAGE } from "../../utils/ManualAbortError.js";
+import { createAbortable, assertNotEmptyArray } from "../../utils/helper.js";
 import { place2point, pipeDefer, lnglat2point } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
 import { AuxiliaryGraspRoad } from "../AuxiliaryGraspRoad/AuxiliaryGraspRoad.js";
@@ -26,7 +27,6 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     interval,
     disablePassenger,
     mapContext,
-    getDriverPositionTrack,
     renderStartSerivceTitle,
     renderInServiceTitle
   } = props;
@@ -36,6 +36,12 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     setMap,
     mapElementRef
   } = useHeycarMap();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
+  const abortController = new AbortController();
+  const abortable = createAbortable(abortController.signal);
+  const getDriverPositionTrack = abortable(props.getDriverPositionTrack);
   const {
     unCoordinatifyPlace,
     unCoordinatifyTrackPoint
@@ -47,7 +53,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     mapRef,
     padding: BUSINESS_TAXI_SERVICE_FITVIEW_PANDING
   });
-  mapContext.setFitView = () => setFitView(false);
+  mapContext.setFitView = assertSupplier(() => setFitView(false));
   const deferedSetFitView = pipeDefer(() => registerOverlay.setFitView(true));
   const {
     geoLoading,
@@ -79,6 +85,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
   }, {
     immediate: true
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     const {
       driverStatus,

package/dist/v2/chunks/{BusinessRecomendPlaceMap.5be4fdcf.js → BusinessRecomendPlaceMap.f589ebf7.js}

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { computed, watch, watchEffect } from "vue-demi";
+import { computed, watch, watchEffect, onUnmounted } from "vue-demi";
 import { apiSaveCenterPlaceToCache } from "../api/browser.js";
 import { apiMemoryShouldSkipByKey } from "../api/memory.js";
 import { HeycarMap } from "../components/MapProvider/MapProvider.js";
@@ -10,10 +10,11 @@ import { useMapCoordinatify } from "../hooks/useMapCoordinatify.js";
 import { useMapDrag } from "../hooks/useMapDrag.js";
 import { useMapGeometry } from "../hooks/useMapGeometry.js";
 import { useMapRecomendPlace } from "../hooks/useMapRecomendPlace.js";
-import { useMapSupplier } from "../hooks/useMapSupplier.js";
+import { useMapSupplier, useMapAssertSupplier } from "../hooks/useMapSupplier.js";
 import { useMapZoom } from "../hooks/useMapZoom.js";
 import { defineSetup, defineLagecySetup } from "../types/helper.js";
 import { CenterPlaceStatus } from "../types/interface.js";
+import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../utils/ManualAbortError.js";
 import { watchPostEffectOnce, generateCreateElementV2PropsOn } from "../utils/compare.js";
 import { equalAssign, isPlacesInclude } from "../utils/helper.js";
 import { detectBrowserPlatform } from "../utils/platform.js";
@@ -286,6 +287,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     getRecomendPlace,
     mapContext
   } = props;
+  const abortController = new AbortController();
   const {
     coordinatifyPoint,
     unCoordinatifyPoint,
@@ -316,6 +318,9 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   const {
     readyPromise
   } = useMapSupplier();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const {
     centerPlace,
     isFirstLoad,
@@ -418,19 +423,19 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       emitGeoErrorOnce(error);
     }
   });
-  mapContext.apiMapDistance = (from, to) => {
+  mapContext.apiMapDistance = assertSupplier((from, to) => {
     return apiMapDistance(unCoordinatifyPoint(toCoordinatePointType(from)), unCoordinatifyPoint(toCoordinatePointType(to)));
-  };
-  mapContext.setCenterPlaceByUserSpecified = setCenterPlaceByUserSpecified;
-  mapContext.setCenterPlaceByUserSpecifiedInZone = setCenterPlaceByUserSpecifiedInZone;
-  mapContext.panToGeoPositionByRecomend = () => {
+  });
+  mapContext.setCenterPlaceByUserSpecified = assertSupplier(setCenterPlaceByUserSpecified);
+  mapContext.setCenterPlaceByUserSpecifiedInZone = assertSupplier(setCenterPlaceByUserSpecifiedInZone);
+  mapContext.panToGeoPositionByRecomend = assertSupplier(() => {
     if (geoError.value)
       return false;
     updateCenterPlaceByPoint(geoPosition.value, {
       source: "geo"
     });
     return true;
-  };
+  });
   const {
     isDragging
   } = useMapDrag({
@@ -454,6 +459,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     emptyPlaceName: emptyTitle,
     queryingPlaceName: queryingTitle,
     context: centerSource,
+    signal: abortController.signal,
     getAvailable: pipedGetAvailable,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context) => {
@@ -473,7 +479,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       ...place
     }),
     onChangePlace: (place) => emit("changePlace", coordinatifyPlace(place)),
-    onChange: async ({
+    onChange: ({
       place,
       inputPlace,
       isInZone,
@@ -498,7 +504,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   const centerPlaceStatusRef = computed(() => isFirstLoad && geoLoading.value ? CenterPlaceStatus.GEO_LOADING : isQueryingRef.value ? CenterPlaceStatus.QUERYING_INFO : !availableRef.value ? CenterPlaceStatus.SERVICE_UNAVAILABLE : CenterPlaceStatus.OK);
   watchPostEffectOnce(() => {
     if (!isFirstLoad)
-      updateRecommendPlaceOnlyInZone(defaultCenterPlace);
+      updateRecommendPlaceOnlyInZone(defaultCenterPlace).catch(throwNoneManualAbortError);
   });
   watch(centerPlace, (place) => {
     if (centerPlaceStatusRef.value === CenterPlaceStatus.OK) {
@@ -516,6 +522,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   watchEffect(() => {
     mapContext.centerPlaceStatusRef.value = centerPlaceStatusRef.value;
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     var _a, _b, _c;
     const {

package/dist/v2/hooks/useMapLoader.js

@@ -1,6 +1,7 @@
 import { shallowRef, computed, ref } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { createRunOnce } from "../utils/helper.js";
+import { patchGoogleMapLoader } from "../utils/patchGoogleMapLoader.js";
 import { t as throttle } from "../chunks/throttle.8bdd8d3b.js";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var distExports = {};
@@ -639,11 +640,13 @@ const useGmapLoader = (props) => {
       if (statusRef.value === "SUCCESS")
         return;
       const loader = new Loader(options);
+      patchGoogleMapLoader(loader);
       clearTimeout(timerRef.value);
       timerRef.value = window.setTimeout(() => {
         statusRef.value = "TIMEOUT";
       }, GMAP_LOAD_TIMEOUT);
       if (loader.status !== LoaderStatus.INITIALIZED) {
+        window.google = void 0;
         loader.reset();
       }
       statusRef.value = "LOADING";

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

@@ -3,6 +3,7 @@ import type { Place, Point } from "../types/interface";
 export interface UseMapPlaceProps {
     pointRef: Ref<Point>;
     emptyPlaceName: string;
+    signal?: AbortSignal;
     onChange?: (value: Place) => any;
 }
 export declare const useAmapPlace: (props: UseMapPlaceProps) => {

package/dist/v2/hooks/useMapPlace.js

@@ -1,13 +1,13 @@
 import { ref, reactive, watch } from "vue-demi";
 import { REGEO_TIMEOUT } from "../api/contants.js";
 import { createPipeTw } from "../utils/cn2tw.js";
-import { equalAssign } from "../utils/helper.js";
+import { equalAssign, createAbortable } from "../utils/helper.js";
 import { amapPlaceName2DisplayName, gmapPlaceName2DisplayName } from "../utils/transform.js";
 import { inChina } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 const useAmapPlace = (props) => {
-  const { onChange, emptyPlaceName } = props;
+  const { signal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language } = useMapSupplier();
@@ -17,6 +17,7 @@ const useAmapPlace = (props) => {
     name: "",
     displayName: ""
   });
+  const abortable = createAbortable(signal);
   const { idx: placeKey, update } = useUpdate();
   const updatePlace = (value) => {
     pointRef.value = value;
@@ -28,7 +29,7 @@ const useAmapPlace = (props) => {
     place.name = value.name;
     place.displayName = value.displayName;
   };
-  const getPlaceByRegeo = ([lng, lat]) => {
+  const getPlaceByRegeo = abortable(([lng, lat]) => {
     return new Promise((resolve) => {
       const geocoder = new AMap.Geocoder({ lang: language === "en" ? "en" : "zh_cn" });
       const pipeTw = createPipeTw(language === "zh-TW");
@@ -58,7 +59,7 @@ const useAmapPlace = (props) => {
         resolve({ lng, lat, name, displayName });
       }, REGEO_TIMEOUT);
     });
-  };
+  });
   watch(
     () => [placeKey.value],
     async () => {
@@ -71,7 +72,7 @@ const useAmapPlace = (props) => {
   return { place, updatePlace, setPlace, getPlaceByRegeo };
 };
 const useGmapPlace = (props) => {
-  const { onChange, emptyPlaceName } = props;
+  const { signal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language } = useMapSupplier();
@@ -82,6 +83,7 @@ const useGmapPlace = (props) => {
     name: "",
     displayName: ""
   });
+  const abortable = createAbortable(signal);
   const updatePlace = (value) => {
     pointRef.value = value;
     update();
@@ -92,7 +94,7 @@ const useGmapPlace = (props) => {
     place.name = value.name;
     place.displayName = value.displayName;
   };
-  const getPlaceByRegeo = ([lng, lat]) => {
+  const getPlaceByRegeo = abortable(([lng, lat]) => {
     return new Promise((resolve) => {
       const geocoder = new google.maps.Geocoder();
       const pipeTw = createPipeTw(language === "zh-TW");
@@ -113,7 +115,7 @@ const useGmapPlace = (props) => {
         resolve({ lng, lat, name, displayName });
       }, REGEO_TIMEOUT);
     });
-  };
+  });
   watch(
     () => placeKey.value,
     async () => {

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

@@ -5,6 +5,7 @@ export interface UseMapRecomendPlaceProps<C = Record<string, any>> {
     context?: C;
     emptyPlaceName: string;
     queryingPlaceName: string;
+    signal?: AbortSignal;
     getLimit: (context?: C) => number;
     getAvailable?: (place: Place) => Promise<boolean>;
     getRecomendPlace: (place: Place, context?: C) => Promise<RecommendZonePlaces | undefined>;

package/dist/v2/hooks/useMapRecomendPlace.js

@@ -1,6 +1,7 @@
 import { ref, reactive } from "vue-demi";
 import { GET_RECOMMEND_PLACE_TIMEOUT } from "../api/contants.js";
-import { equalAssign, isPlacesInclude } from "../utils/helper.js";
+import { logNoneManualAbortError } from "../utils/ManualAbortError.js";
+import { equalAssign, createAbortable, isPlacesInclude } from "../utils/helper.js";
 import { isZoneEqual, place2point, isPlaceEqual, businessCandidatesToAdsorptionPlace } from "../utils/transform.js";
 import { useMapGeometry } from "./useMapGeometry.js";
 import { useMapPlace } from "./useMapPlace.js";
@@ -11,9 +12,9 @@ function mergeGetRecommendPlaceAndGetAvailable(getRecomendPlace, getAvailable, t
       getAvailable == null ? void 0 : getAvailable(place).then((value) => {
         if (!value)
           resolve({ available: false });
-      }).catch((error) => console.error(error));
+      }).catch(logNoneManualAbortError);
       getRecomendPlace(place, context).then((result) => resolve(result != null ? result : { available })).catch((error) => {
-        console.error(error);
+        logNoneManualAbortError(error);
         resolve({ available });
       });
       setTimeout(() => resolve({ available }), timeout);
@@ -42,6 +43,7 @@ const useMapRecomendPlace = (props) => {
     context,
     emptyPlaceName,
     queryingPlaceName,
+    signal,
     onChange,
     onQueryingPlace,
     onChangePlace
@@ -50,10 +52,12 @@ const useMapRecomendPlace = (props) => {
   const forceRef = ref(false);
   const placeCandidatesRef = ref([]);
   const zoneRef = ref();
+  const abortable = createAbortable(signal);
   const { apiMapIsPointInRing, apiMapDistance } = useMapGeometry();
   const { getPlaceByRegeo } = useMapPlace({
     emptyPlaceName,
-    pointRef: ref([...defaultPoint])
+    pointRef: ref([...defaultPoint]),
+    signal
   });
   const recomendPlace = reactive({
     lng: defaultPoint[0],
@@ -63,11 +67,11 @@ const useMapRecomendPlace = (props) => {
   });
   const isQueryingRef = ref(false);
   const getRecomendPlaceNoFail = mergeGetRecommendPlaceAndGetAvailable(
-    getRecomendPlace,
-    getAvailable,
+    abortable(getRecomendPlace),
+    abortable(getAvailable),
     GET_RECOMMEND_PLACE_TIMEOUT
   );
-  const findAttachedPlace = async (place) => {
+  const findAttachedPlace = abortable(async (place) => {
     const {
       places: placeCandidates,
       zone,
@@ -90,38 +94,40 @@ const useMapRecomendPlace = (props) => {
     const limit = getLimit(context);
     const resultPlace = zone || shortestDistance <= limit ? shortestPlace : place;
     return { place: { ...resultPlace }, zone, candidates: placeCandidates, available, force };
-  };
-  const getRecommendPlaceZoneState = async (point, prevState) => {
-    const [lng, lat] = point;
-    const zone = zoneRef.value;
-    if (!zone || !apiMapIsPointInRing(point, zone.path)) {
-      const reGeoPlacePromise = getPlaceByRegeo(point);
-      const {
-        place: closestPlace,
-        candidates,
-        available,
-        force,
-        zone: zone2
-      } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
-      if (isPlacesInclude(candidates, closestPlace)) {
-        return { place: { ...closestPlace }, zone: zone2, available, candidates, force };
+  });
+  const getRecommendPlaceZoneState = abortable(
+    async (point, prevState) => {
+      const [lng, lat] = point;
+      const zone = zoneRef.value;
+      if (!zone || !apiMapIsPointInRing(point, zone.path)) {
+        const reGeoPlacePromise = getPlaceByRegeo(point);
+        const {
+          place: closestPlace,
+          candidates,
+          available,
+          force,
+          zone: zone2
+        } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
+        if (isPlacesInclude(candidates, closestPlace)) {
+          return { place: { ...closestPlace }, zone: zone2, available, candidates, force };
+        }
+        const regeoPlace = await reGeoPlacePromise;
+        return { place: { ...regeoPlace }, zone: zone2, available, candidates, force };
       }
-      const regeoPlace = await reGeoPlacePromise;
-      return { place: { ...regeoPlace }, zone: zone2, available, candidates, force };
+      const { shortestPlace: resultPlace } = findNearestPlace(
+        { lng, lat, name: "", displayName: "" },
+        prevState.candidates,
+        apiMapDistance
+      );
+      return {
+        place: { ...resultPlace },
+        zone,
+        available: prevState.available,
+        force: prevState.force,
+        candidates: prevState.candidates
+      };
     }
-    const { shortestPlace: resultPlace } = findNearestPlace(
-      { lng, lat, name: "", displayName: "" },
-      prevState.candidates,
-      apiMapDistance
-    );
-    return {
-      place: { ...resultPlace },
-      zone,
-      available: prevState.available,
-      force: prevState.force,
-      candidates: prevState.candidates
-    };
-  };
+  );
   const updateIntermediateQueryingState = (point) => {
     const zone = zoneRef.value;
     if (zone && apiMapIsPointInRing(point, zone.path))
@@ -141,7 +147,7 @@ const useMapRecomendPlace = (props) => {
     equalAssign(recomendPlace, { ...intermediateQueryingPlace });
     onQueryingPlace == null ? void 0 : onQueryingPlace({ ...intermediateQueryingPlace });
   };
-  const updatePlace = async (point) => {
+  const updatePlace = abortable(async (point) => {
     updateIntermediateQueryingState(point);
     const {
       place: resultPlace,
@@ -166,29 +172,31 @@ const useMapRecomendPlace = (props) => {
     onChangePlace == null ? void 0 : onChangePlace({ ...resultPlace });
     const inputPlace = { name: "", displayName: "", lng: point[0], lat: point[1] };
     onChange == null ? void 0 : onChange({ place: { ...resultPlace }, inputPlace, isInZone: !!zone, isSameZone });
-  };
-  const updatePlaceCandidates = async (place) => {
-    updateIntermediateQueryingState(place2point(place));
-    const {
-      places: placeCandidates,
-      zone,
-      available = false,
-      force = false
-    } = await getRecomendPlaceNoFail({ ...place }, context);
-    const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
-    isQueryingRef.value = false;
-    availableRef.value = !!available;
-    forceRef.value = !!force;
-    zoneRef.value = zone;
-    placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
-    return {
-      inputPlace: { ...place },
-      isInZone: !!zone,
-      place: { ...place },
-      isSameZone
-    };
-  };
-  const updateRecommendPlace = async (place) => {
+  });
+  const updatePlaceCandidates = abortable(
+    async (place) => {
+      updateIntermediateQueryingState(place2point(place));
+      const {
+        places: placeCandidates,
+        zone,
+        available = false,
+        force = false
+      } = await getRecomendPlaceNoFail({ ...place }, context);
+      const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
+      isQueryingRef.value = false;
+      availableRef.value = !!available;
+      forceRef.value = !!force;
+      zoneRef.value = zone;
+      placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
+      return {
+        inputPlace: { ...place },
+        isInZone: !!zone,
+        place: { ...place },
+        isSameZone
+      };
+    }
+  );
+  const updateRecommendPlace = abortable(async (place) => {
     updateIntermediateQueryingState(place2point(place));
     const {
       place: resultPlace,
@@ -211,8 +219,8 @@ const useMapRecomendPlace = (props) => {
       isInZone: !!zone,
       isSameZone
     });
-  };
-  const updateRecommendPlaceOnlyInZone = async (place) => {
+  });
+  const updateRecommendPlaceOnlyInZone = abortable(async (place) => {
     var _a;
     updateIntermediateQueryingState(place2point(place));
     const {
@@ -237,7 +245,7 @@ const useMapRecomendPlace = (props) => {
       isInZone: !!zone,
       isSameZone
     });
-  };
+  });
   const setPlaceCandidatesAndZone = ({ zone, places: placeCandidates }) => {
     availableRef.value = true;
     forceRef.value = !!zone;