@heycar/heycars-map 2.2.0-fitZone4 → 2.3.0-drag2

package/dist/v2/Demo/DemoBusinessRecomendPlace.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.3567a399.js";
+import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.81a4b640.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/api/pingConnection.js

@@ -4,6 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+import { MANUAL_ABORT_MESSAGE } from "../utils/ManualAbortError.js";
 import { sleep } from "../utils/helper.js";
 const PING_AMAP_URL = "https://webapi.amap.com/maps";
 const PING_AMAP_TIMEOUT = 5e3;
@@ -58,7 +59,7 @@ class PingConnection {
   }
   check(url, timeout, fetchOption) {
     const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeout);
+    const timer = setTimeout(() => controller.abort(MANUAL_ABORT_MESSAGE), timeout);
     return fetch(toUncachableUrl(url, timeout.toString()), {
       signal: controller.signal,
       ...fetchOption

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

@@ -27,7 +27,7 @@ import "../GreenZone/GreenZone.js";
 import "../PassengerCircle/PassengerCircle.js";
 import "../PickupPoints/PickupPoints.js";
 import "./useCacheCenterPlace.js";
-import { B, f, D, E, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.3567a399.js";
+import { B, f, D, E, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.81a4b640.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, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.3567a399.js";
+import { B, f, D, E, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.81a4b640.js";
 export {
   B as BusinessRecomendPlaceMap,
   f as BusinessRecomendPlaceMapInner,

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

@@ -18,10 +18,10 @@ import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../../utils/Man
 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, pipeDefer } from "../../utils/transform.js";
+import { place2point, isPlaceEqual, isZoneEqual, geoPositionError2businessTimeout, pipeDefer } 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_DRAG_LIMIT, a as RECOMMEND_PLACE_LARGE_LIMIT, 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, Z as ZONE_FITVIEW_PANDING } from "../../chunks/BusinessRecomendPlaceMap.3567a399.js";
+import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_DRAG_LIMIT, a as RECOMMEND_PLACE_LARGE_LIMIT, 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, Z as ZONE_FITVIEW_PANDING } from "../../chunks/BusinessRecomendPlaceMap.81a4b640.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
 import { GreenZone } from "../GreenZone/GreenZone.js";
 import { PassengerCircle } from "../PassengerCircle/PassengerCircle.js";
@@ -35,8 +35,8 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     emptyTitle,
     queryingTitle,
     geoErrorOnceNotificationKey = `BusinessRecomendPlaceMap_${Date.now()}`,
-    getAvailable,
-    getRecomendPlace,
+    getAvailable: inputGetAvailable,
+    getRecomendPlace: inputGetRecomendPlace,
     mapContext,
     disableLocator,
     defaultPlace: inputDefaultPlace = {
@@ -53,8 +53,8 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     coordinatifyValueOfOnChangeRecommendPlace,
     coordinatifyGeoPosition
   } = useMapCoordinatify();
-  const pipedGetAvailable = getAvailable && pipeOnlyLastEffect((p) => getAvailable(coordinatifyPlace(p)));
-  const pipedGetRecomendPlace = pipeOnlyLastEffect((p, context) => getRecomendPlace(coordinatifyPlace(p), context).then((r) => r && unCoordinatifyRecommendZonePlaces(toCoordinateRecommendZonePlacesType(r))));
+  const getAvailable = inputGetAvailable && ((p) => inputGetAvailable(coordinatifyPlace(p)));
+  const getRecomendPlace = (p, context) => inputGetRecomendPlace(coordinatifyPlace(p), context).then((r) => r && unCoordinatifyRecommendZonePlaces(toCoordinateRecommendZonePlacesType(r)));
   const {
     apiMapDistance
   } = useMapGeometry();
@@ -178,6 +178,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     isDragging
   } = useMapDrag({
     mapRef,
+    onDragStart: () => abortUpdatePlace(),
     onChange: (point) => {
       centerSource.source = "drag";
       updatePlace(point);
@@ -185,6 +186,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
   });
   const {
     updatePlace,
+    abortUpdatePlace,
     updateRecommendPlaceOnlyInZone,
     setPlaceCandidatesAndZone,
     placeCandidates,
@@ -197,8 +199,8 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     queryingPlaceName: queryingTitle,
     context: centerSource,
     signal: abortController.signal,
-    getAvailable: pipedGetAvailable,
-    getRecomendPlace: pipedGetRecomendPlace,
+    getAvailable,
+    getRecomendPlace,
     getLimit: (context) => {
       const source = context == null ? void 0 : context.source;
       switch (source) {

package/dist/v2/chunks/{BusinessRecomendPlaceMap.3567a399.js → BusinessRecomendPlaceMap.81a4b640.js}

@@ -19,7 +19,7 @@ import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../utils/Manual
 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, pipeDefer } from "../utils/transform.js";
+import { place2point, isPlaceEqual, isZoneEqual, geoPositionError2businessTimeout, pipeDefer } from "../utils/transform.js";
 import { toCoordinatePointType, toCoordinateRecommendZonePlacesType, toCoordinatePlaceType } from "../utils/typeChecking.js";
 import { AbsoluteAddressBox } from "../business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
 import { DeviceOrientation } from "../business-components/DeviceOrientation/DeviceOrientation.js";
@@ -284,8 +284,8 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     emptyTitle,
     queryingTitle,
     geoErrorOnceNotificationKey = `BusinessRecomendPlaceMap_${Date.now()}`,
-    getAvailable,
-    getRecomendPlace,
+    getAvailable: inputGetAvailable,
+    getRecomendPlace: inputGetRecomendPlace,
     mapContext
   } = props;
   const abortController = new AbortController();
@@ -298,8 +298,8 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     coordinatifyValueOfOnChangeRecommendPlace,
     coordinatifyGeoPosition
   } = useMapCoordinatify();
-  const pipedGetAvailable = getAvailable && pipeOnlyLastEffect((p) => getAvailable(coordinatifyPlace(p)));
-  const pipedGetRecomendPlace = pipeOnlyLastEffect((p, context) => getRecomendPlace(coordinatifyPlace(p), context).then((r) => r && unCoordinatifyRecommendZonePlaces(toCoordinateRecommendZonePlacesType(r))));
+  const getAvailable = inputGetAvailable && ((p) => inputGetAvailable(coordinatifyPlace(p)));
+  const getRecomendPlace = (p, context) => inputGetRecomendPlace(coordinatifyPlace(p), context).then((r) => r && unCoordinatifyRecommendZonePlaces(toCoordinateRecommendZonePlacesType(r)));
   const {
     apiMapDistance
   } = useMapGeometry();
@@ -451,6 +451,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     isDragging
   } = useMapDrag({
     mapRef,
+    onDragStart: () => abortUpdatePlace(),
     onChange: (point) => {
       centerSource.source = "drag";
       updatePlace(point);
@@ -459,6 +460,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   });
   const {
     updatePlace,
+    abortUpdatePlace,
     updateRecommendPlaceOnlyInZone,
     setPlaceCandidatesAndZone,
     placeCandidates,
@@ -471,8 +473,8 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     queryingPlaceName: queryingTitle,
     context: centerSource,
     signal: abortController.signal,
-    getAvailable: pipedGetAvailable,
-    getRecomendPlace: pipedGetRecomendPlace,
+    getAvailable,
+    getRecomendPlace,
     getLimit: (context) => {
       const source = context == null ? void 0 : context.source;
       switch (source) {

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

@@ -6,6 +6,7 @@ export declare const DRAGEND_DETECTING_ANIMATION_DELAY = 50;
 export interface UseMapDragProps<M = AmapMap | google.maps.Map> {
     mapRef: ShallowRef<M | undefined>;
     onChange?: (value: Point) => any;
+    onDragStart?: () => void;
 }
 export declare const useAmapDrag: (props: UseMapDragProps<AmapMap>) => {
     centerRef: import("vue-demi").Ref<[number, number]>;

package/dist/v2/hooks/useMapDrag.js

@@ -7,7 +7,7 @@ const ON_CHANGE_CENTER_INTERVAL = 200;
 const DRAGEND_DETECTING_ANIMATION_DELAY = 50;
 const GMAP_DRAG_END_DELAY_TO_TOUCH_END = 20;
 const useAmapDrag = (props) => {
-  const { mapRef, onChange } = props;
+  const { mapRef, onChange, onDragStart } = props;
   const centerRef = ref([0, 0]);
   const isDragging = ref(false);
   const isDragEndWaitingMovingEndRef = ref(false);
@@ -17,6 +17,7 @@ const useAmapDrag = (props) => {
   const emitDragStart = () => {
     pipeAsync(() => {
       isDragging.value = true;
+      onDragStart == null ? void 0 : onDragStart();
     })();
   };
   const handleZoomStart = () => {
@@ -76,12 +77,13 @@ const useAmapDrag = (props) => {
   return { centerRef, isDragging };
 };
 const useGmapDrag = (props) => {
-  const { mapRef, onChange } = props;
+  const { mapRef, onChange, onDragStart } = props;
   const centerRef = ref([0, 0]);
   const isDragging = ref(false);
   const emitDragStart = () => {
     pipeAsync(() => {
       isDragging.value = true;
+      onDragStart == null ? void 0 : onDragStart();
     })();
   };
   const emitDragEnd = async () => {

package/dist/v2/hooks/useMapLoader.js

@@ -1,5 +1,6 @@
 import { shallowRef, computed } from "vue-demi";
 import { apiPingAmap, apiPingGmap } from "../api/pingConnection.js";
+import { MANUAL_ABORT_MESSAGE } from "../utils/ManualAbortError.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { createOneConcurrent, sleep, createRunOnce } from "../utils/helper.js";
 import { patchGoogleMapLoader } from "../utils/patchGoogleMapLoader.js";
@@ -718,7 +719,7 @@ const useGmapLoader = (props) => {
       const reloadPromise = reload(options, controller.signal);
       pingStatusRef.value = await apiPingGmap();
       if (pingStatusRef.value === "unconnected") {
-        controller.abort();
+        controller.abort(MANUAL_ABORT_MESSAGE);
         continue;
       }
       await reloadPromise;

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

@@ -1,5 +1,6 @@
 import { type Ref } from "vue-demi";
 import type { Place, Point } from "../types/interface";
+import { type AbortSignalOption } from "../utils/helper";
 export interface UseMapPlaceProps {
     pointRef: Ref<Point>;
     emptyPlaceName: string;
@@ -15,7 +16,7 @@ export declare const useAmapPlace: (props: UseMapPlaceProps) => {
     };
     updatePlace: (value: Point) => void;
     setPlace: (value: Place) => void;
-    getPlaceByRegeo: ([lng, lat]: Point) => Promise<Place>;
+    getPlaceByRegeo: ([lng, lat]: Point, opt?: AbortSignalOption) => Promise<Place>;
 };
 export declare const useGmapPlace: (props: UseMapPlaceProps) => {
     place: {
@@ -26,7 +27,7 @@ export declare const useGmapPlace: (props: UseMapPlaceProps) => {
     };
     updatePlace: (value: Point) => void;
     setPlace: (value: Place) => void;
-    getPlaceByRegeo: ([lng, lat]: Point) => Promise<Place>;
+    getPlaceByRegeo: ([lng, lat]: Point, opt?: AbortSignalOption) => Promise<Place>;
 };
 export declare const useMapPlace: (props: UseMapPlaceProps) => {
     place: {
@@ -37,5 +38,5 @@ export declare const useMapPlace: (props: UseMapPlaceProps) => {
     };
     updatePlace: (value: Point) => void;
     setPlace: (value: Place) => void;
-    getPlaceByRegeo: ([lng, lat]: Point) => Promise<Place>;
+    getPlaceByRegeo: ([lng, lat]: Point, opt?: AbortSignalOption) => Promise<Place>;
 };

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, createAbortable } from "../utils/helper.js";
-import { amapPlaceName2DisplayName, gmapPlaceName2DisplayName } from "../utils/transform.js";
+import { equalAssign, AbortSignalAny } from "../utils/helper.js";
+import { amapPlaceName2DisplayName, signal2promise, gmapPlaceName2DisplayName } from "../utils/transform.js";
 import { inChina } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 const useAmapPlace = (props) => {
-  const { signal, onChange, emptyPlaceName } = props;
+  const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language } = useMapSupplier();
@@ -17,7 +17,6 @@ const useAmapPlace = (props) => {
     name: "",
     displayName: ""
   });
-  const abortable = createAbortable(signal);
   const { idx: placeKey, update } = useUpdate();
   const updatePlace = (value) => {
     pointRef.value = value;
@@ -29,8 +28,9 @@ const useAmapPlace = (props) => {
     place.name = value.name;
     place.displayName = value.displayName;
   };
-  const getPlaceByRegeo = abortable(([lng, lat]) => {
-    return new Promise((resolve) => {
+  const getPlaceByRegeo = ([lng, lat], opt) => {
+    const signal = AbortSignalAny([opt == null ? void 0 : opt.signal, inputSignal]);
+    const regeoPromise = new Promise((resolve) => {
       const handleFailed = () => {
         const name = emptyPlaceName;
         const displayName = emptyPlaceName;
@@ -64,7 +64,8 @@ const useAmapPlace = (props) => {
         handleFailed();
       }, REGEO_TIMEOUT);
     });
-  });
+    return Promise.race([regeoPromise, signal2promise(signal)]);
+  };
   watch(
     () => [placeKey.value],
     async () => {
@@ -77,7 +78,7 @@ const useAmapPlace = (props) => {
   return { place, updatePlace, setPlace, getPlaceByRegeo };
 };
 const useGmapPlace = (props) => {
-  const { signal, onChange, emptyPlaceName } = props;
+  const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language } = useMapSupplier();
@@ -88,7 +89,6 @@ const useGmapPlace = (props) => {
     name: "",
     displayName: ""
   });
-  const abortable = createAbortable(signal);
   const updatePlace = (value) => {
     pointRef.value = value;
     update();
@@ -99,8 +99,9 @@ const useGmapPlace = (props) => {
     place.name = value.name;
     place.displayName = value.displayName;
   };
-  const getPlaceByRegeo = abortable(([lng, lat]) => {
-    return new Promise((resolve) => {
+  const getPlaceByRegeo = ([lng, lat], opt) => {
+    const signal = AbortSignalAny([opt == null ? void 0 : opt.signal, inputSignal]);
+    const regeoPromise = new Promise((resolve) => {
       const handleFailed = (err) => {
         if (err)
           console.error(err);
@@ -122,7 +123,8 @@ const useGmapPlace = (props) => {
         handleFailed();
       }, REGEO_TIMEOUT);
     });
-  });
+    return Promise.race([regeoPromise, signal2promise(signal)]);
+  };
   watch(
     () => placeKey.value,
     async () => {

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

@@ -1,4 +1,5 @@
 import type { Place, Point, RecommendZonePlaces, ValueOfOnChangeRecommendPlace, Zone } from "../types/interface";
+import { type AbortSignalOption } from "../utils/helper";
 import { type UseMapPlaceProps } from "./useMapPlace";
 export interface UseMapRecomendPlaceProps<C = Record<string, any>> {
     defaultPoint: Point;
@@ -30,9 +31,10 @@ export declare const useMapRecomendPlace: <C>(props: UseMapRecomendPlaceProps<C>
     availableRef: import("vue-demi").Ref<boolean>;
     forceRef: import("vue-demi").Ref<boolean>;
     isQueryingRef: import("vue-demi").Ref<boolean>;
-    updateRecommendPlace: (place: Place) => Promise<void>;
-    updateRecommendPlaceOnlyInZone: (place: Place) => Promise<void>;
-    updatePlaceCandidates: (place: Place) => Promise<ValueOfOnChangeRecommendPlace>;
+    updateRecommendPlace: (place: Place, opt?: AbortSignalOption) => Promise<void>;
+    updateRecommendPlaceOnlyInZone: (place: Place, opt?: AbortSignalOption) => Promise<void>;
+    updatePlaceCandidates: (place: Place, opt?: AbortSignalOption) => Promise<ValueOfOnChangeRecommendPlace>;
     updatePlace: (point: Point) => Promise<void>;
+    abortUpdatePlace: () => void;
     setPlaceCandidatesAndZone: ({ zone, places: placeCandidates }: RecommendZonePlaces) => void;
 };

package/dist/v2/hooks/useMapRecomendPlace.js

@@ -1,7 +1,7 @@
 import { ref, reactive } from "vue-demi";
 import { GET_RECOMMEND_PLACE_TIMEOUT } from "../api/contants.js";
 import { logNoneManualAbortError } from "../utils/ManualAbortError.js";
-import { equalAssign, createAbortable, isPlacesInclude } from "../utils/helper.js";
+import { createAbortableOneConcurrent, AbortSignalAny, equalAssign, isPlacesInclude, createAbortable } from "../utils/helper.js";
 import { isZoneEqual, place2point, isPlaceEqual, businessCandidatesToAdsorptionPlace } from "../utils/transform.js";
 import { useMapGeometry, apiLocalIsPointInRing } from "./useMapGeometry.js";
 import { useMapPlace } from "./useMapPlace.js";
@@ -43,7 +43,7 @@ const useMapRecomendPlace = (props) => {
     context,
     emptyPlaceName,
     queryingPlaceName,
-    signal,
+    signal: inputSignal,
     onChange,
     onQueryingPlace,
     onChangePlace
@@ -52,12 +52,12 @@ const useMapRecomendPlace = (props) => {
   const forceRef = ref(false);
   const placeCandidatesRef = ref([]);
   const zoneRef = ref();
-  const abortable = createAbortable(signal);
+  const abortable = createAbortable(inputSignal);
   const { apiMapDistance } = useMapGeometry();
   const { getPlaceByRegeo } = useMapPlace({
     emptyPlaceName,
     pointRef: ref([...defaultPoint]),
-    signal
+    signal: inputSignal
   });
   const recomendPlace = reactive({
     lng: defaultPoint[0],
@@ -71,7 +71,8 @@ const useMapRecomendPlace = (props) => {
     abortable(getAvailable),
     GET_RECOMMEND_PLACE_TIMEOUT
   );
-  const findAttachedPlace = abortable(async (place) => {
+  const findAttachedPlace = async (place, opt) => {
+    var _a;
     const {
       places: placeCandidates,
       zone,
@@ -79,6 +80,7 @@ const useMapRecomendPlace = (props) => {
       force = false,
       adsorption = false
     } = await getRecomendPlaceNoFail({ ...place }, context);
+    (_a = opt == null ? void 0 : opt.signal) == null ? void 0 : _a.throwIfAborted();
     if (!available || !placeCandidates) {
       return { place: { ...place }, zone, candidates: [], available, force };
     }
@@ -94,40 +96,38 @@ const useMapRecomendPlace = (props) => {
     const limit = getLimit(context);
     const resultPlace = zone || shortestDistance <= limit ? shortestPlace : place;
     return { place: { ...resultPlace }, zone, candidates: placeCandidates, available, force };
-  });
-  const getRecommendPlaceZoneState = abortable(
-    async (point, prevState) => {
-      const [lng, lat] = point;
-      const zone = zoneRef.value;
-      if (!zone || !apiLocalIsPointInRing(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 getRecommendPlaceZoneState = async (point, prevState, opt) => {
+    const [lng, lat] = point;
+    const zone = zoneRef.value;
+    if (!zone || !apiLocalIsPointInRing(point, zone.path)) {
+      const reGeoPlacePromise = getPlaceByRegeo(point, opt);
+      const {
+        place: closestPlace,
+        candidates,
+        available,
+        force,
+        zone: zone2
+      } = await findAttachedPlace({ lng, lat, name: "", displayName: "" }, opt);
+      if (isPlacesInclude(candidates, closestPlace)) {
+        return { place: { ...closestPlace }, 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 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 updateIntermediateQueryingState = (point) => {
     const zone = zoneRef.value;
     if (zone && apiLocalIsPointInRing(point, zone.path))
@@ -147,56 +147,64 @@ const useMapRecomendPlace = (props) => {
     equalAssign(recomendPlace, { ...intermediateQueryingPlace });
     onQueryingPlace == null ? void 0 : onQueryingPlace({ ...intermediateQueryingPlace });
   };
-  const updatePlace = abortable(async (point) => {
-    updateIntermediateQueryingState(point);
-    const {
-      place: resultPlace,
-      candidates,
-      zone,
-      available,
-      force
-    } = await getRecommendPlaceZoneState(point, {
-      place: recomendPlace,
-      available: availableRef.value,
-      force: forceRef.value,
-      candidates: placeCandidatesRef.value,
-      zone: zoneRef.value
-    });
-    const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
-    isQueryingRef.value = false;
-    availableRef.value = available;
-    forceRef.value = force;
-    zoneRef.value = zone;
-    placeCandidatesRef.value = candidates;
-    equalAssign(recomendPlace, { ...resultPlace });
-    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 = abortable(
-    async (place) => {
-      updateIntermediateQueryingState(place2point(place));
+  const { fn: updatePlace, abort: abortUpdatePlace } = createAbortableOneConcurrent(
+    (concurrentSignal) => async (point) => {
+      const signal = AbortSignalAny([concurrentSignal, inputSignal]);
+      updateIntermediateQueryingState(point);
       const {
-        places: placeCandidates,
+        place: resultPlace,
+        candidates,
         zone,
-        available = false,
-        force = false
-      } = await getRecomendPlaceNoFail({ ...place }, context);
+        available,
+        force
+      } = await getRecommendPlaceZoneState(
+        point,
+        {
+          place: recomendPlace,
+          available: availableRef.value,
+          force: forceRef.value,
+          candidates: placeCandidatesRef.value,
+          zone: zoneRef.value
+        },
+        { signal }
+      );
       const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
       isQueryingRef.value = false;
-      availableRef.value = !!available;
-      forceRef.value = !!force;
+      availableRef.value = available;
+      forceRef.value = force;
       zoneRef.value = zone;
-      placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
-      return {
-        inputPlace: { ...place },
-        isInZone: !!zone,
-        place: { ...place },
-        isSameZone
-      };
-    }
+      placeCandidatesRef.value = candidates;
+      equalAssign(recomendPlace, { ...resultPlace });
+      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 });
+    },
+    { silent: true }
   );
-  const updateRecommendPlace = abortable(async (place) => {
+  const updatePlaceCandidates = async (place, opt) => {
+    const signal = AbortSignalAny([opt == null ? void 0 : opt.signal, inputSignal]);
+    updateIntermediateQueryingState(place2point(place));
+    const {
+      places: placeCandidates,
+      zone,
+      available = false,
+      force = false
+    } = await getRecomendPlaceNoFail({ ...place }, context);
+    signal.throwIfAborted();
+    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, opt) => {
     updateIntermediateQueryingState(place2point(place));
     const {
       place: resultPlace,
@@ -204,7 +212,7 @@ const useMapRecomendPlace = (props) => {
       available,
       force,
       zone
-    } = await findAttachedPlace(place);
+    } = await findAttachedPlace(place, opt);
     const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
     isQueryingRef.value = false;
     availableRef.value = available;
@@ -219,8 +227,8 @@ const useMapRecomendPlace = (props) => {
       isInZone: !!zone,
       isSameZone
     });
-  });
-  const updateRecommendPlaceOnlyInZone = abortable(async (place) => {
+  };
+  const updateRecommendPlaceOnlyInZone = async (place, opt) => {
     var _a;
     updateIntermediateQueryingState(place2point(place));
     const {
@@ -229,7 +237,7 @@ const useMapRecomendPlace = (props) => {
       available,
       force,
       zone
-    } = await findAttachedPlace(place);
+    } = await findAttachedPlace(place, opt);
     const resultPlace = zone ? foundPlace : (_a = candidates.find((p) => isPlaceEqual(p, place))) != null ? _a : place;
     const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
     isQueryingRef.value = false;
@@ -245,7 +253,7 @@ const useMapRecomendPlace = (props) => {
       isInZone: !!zone,
       isSameZone
     });
-  });
+  };
   const setPlaceCandidatesAndZone = ({ zone, places: placeCandidates }) => {
     availableRef.value = true;
     forceRef.value = !!zone;
@@ -263,6 +271,7 @@ const useMapRecomendPlace = (props) => {
     updateRecommendPlaceOnlyInZone,
     updatePlaceCandidates,
     updatePlace,
+    abortUpdatePlace,
     setPlaceCandidatesAndZone
   };
 };

package/dist/v2/hooks-business/useBusinessRecomendPlaceMap.js

@@ -1,5 +1,5 @@
 import { reactive, ref, readonly } from "vue-demi";
-import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.3567a399.js";
+import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.81a4b640.js";
 import { CenterPlaceStatus } from "../types/interface.js";
 import { proxyFunctionalProperty, assertAssingedBeforeUsed } from "../utils/helper.js";
 const useBusinessRecomendPlaceMap = () => {

package/dist/v2/index.js

@@ -2,7 +2,7 @@ import "./utils/alipayPolyfill.js";
 import { AbsoluteAddressBox } from "./business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
 import { AddressBox } from "./business-components/AddressBox/AddressBox.js";
 import { BusinessQuotingMap } from "./business-components/BusinessQuotingMap/BusinessQuotingMap.js";
-import { B } from "./chunks/BusinessRecomendPlaceMap.3567a399.js";
+import { B } from "./chunks/BusinessRecomendPlaceMap.81a4b640.js";
 import { BusinessReselectPlaceMap } from "./business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js";
 import { BusinessTaxiEndMap } from "./business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js";
 import { BusinessTaxiServiceMap } from "./business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js";