@baishuyun/ui-base 6.7.0 → 6.7.1

package/dist/Amap/AmapMarker/index.js

@@ -1,5 +1,5 @@
 import "../AmapContext-CFmsMycg.js";
 import "../hooks-DwRvpafb.js";
-import "../useMarkerInfoWindowController-G-Bg-NDJ.js";
-import { t as e } from "../AmapMarker-CB66dQIG.js";
+import "../useMarkerInfoWindowController-BvP2jo7K.js";
+import { t as e } from "../AmapMarker-CMlzx_nj.js";
 export { e as AmapMarker, e as default };

package/dist/Amap/AmapMarker-CMlzx_nj.js

@@ -0,0 +1,153 @@
+import { n as e } from "./hooks-DwRvpafb.js";
+import { n as t, t as n } from "./useMarkerInfoWindowController-BvP2jo7K.js";
+import { Fragment as r, jsx as i } from "react/jsx-runtime";
+import { useCallback as a, useEffect as o, useRef as s } from "react";
+import { createRoot as c } from "react-dom/client";
+//#region src/components/Amap/AmapMarker/useMarkerInfoWindow.tsx
+var l = ({ AMap: e, map: t, mapReady: r, markerRef: i, infoWindow: s }) => {
+	let { scheduleInfoWindowOpen: c, scheduleInfoWindowClose: l, closeInfoWindow: u } = n({
+		AMap: e,
+		map: t,
+		mapReady: r
+	}), d = a(() => {
+		if (!s) return;
+		let e = i.current;
+		e && c(e, s);
+	}, [
+		s,
+		i,
+		c
+	]);
+	return o(() => {
+		if (s) return () => {
+			u();
+		};
+	}, [u, s]), {
+		scheduleInfoWindowOpen: d,
+		scheduleInfoWindowClose: l,
+		closeInfoWindow: u
+	};
+}, u = (e) => typeof e == "string" || typeof e == "number", d = (e) => e != null && typeof e != "boolean", f = (e) => d(e) && !u(e), p = (e) => {
+	queueMicrotask(() => e.unmount());
+};
+function m(n) {
+	let { AMap: a, map: m, mapReady: h } = e(), { content: g, infoWindow: _, options: v = {}, onClick: y, onMouseEnter: b, onMouseLeave: x } = n, S = !!_, C = s(null), w = s(null), T = s(null), E = s(!0), D = s(!0), O = s({
+		content: g,
+		infoWindow: _,
+		options: v
+	});
+	O.current = {
+		content: g,
+		infoWindow: _,
+		options: v
+	};
+	let { scheduleInfoWindowOpen: k, scheduleInfoWindowClose: A, closeInfoWindow: j } = l({
+		AMap: a,
+		map: m,
+		mapReady: h,
+		markerRef: C,
+		infoWindow: _
+	});
+	return o(() => {
+		if (!a || !m || !h || C.current) return;
+		let e = O.current, n = {
+			anchor: t,
+			...e.options,
+			map: m
+		};
+		if (u(e.content)) {
+			let t = document.createElement("div");
+			t.textContent = String(e.content), T.current = t, n.content = t;
+		} else if (f(e.content)) {
+			let e = document.createElement("div");
+			T.current = e, n.content = e;
+		}
+		let o = new a.Marker(n);
+		if (C.current = o, f(e.content) && T.current) {
+			let t = c(T.current);
+			w.current = t, t.render(/* @__PURE__ */ i(r, { children: e.content }));
+		}
+		return () => {
+			let e = w.current;
+			e && p(e), w.current = null, T.current = null, j(), o.setMap(null), C.current = null;
+		};
+	}, [
+		a,
+		j,
+		m,
+		h
+	]), o(() => {
+		let e = v.position;
+		if (!e) return;
+		let t = C.current?.getPosition?.(), n = t?.getLng?.() ?? t?.lng, r = t?.getLat?.() ?? t?.lat, i = Array.isArray(e) ? e[0] : e.lng, a = Array.isArray(e) ? e[1] : e.lat;
+		n === i && r === a || C.current?.setPosition(e);
+	}, [v.position]), o(() => {
+		if (D.current) {
+			D.current = !1;
+			return;
+		}
+		let e = C.current;
+		e && (v.visible === !1 ? e.hide?.() : v.visible === !0 && e.show?.());
+	}, [v.visible]), o(() => {
+		if (E.current) {
+			E.current = !1;
+			return;
+		}
+		let e = C.current;
+		if (e) {
+			if (!d(g)) {
+				w.current && p(w.current), w.current = null, T.current = null, e.setContent?.("");
+				return;
+			}
+			if (u(g)) {
+				if (w.current) {
+					let t = w.current;
+					p(t), w.current = null, T.current = document.createElement("div"), e.setContent?.(T.current);
+				}
+				T.current || (T.current = document.createElement("div"), e.setContent?.(T.current)), T.current.textContent = String(g);
+				return;
+			}
+			T.current || (T.current = document.createElement("div"), e.setContent?.(T.current)), w.current ||= c(T.current), w.current.render(/* @__PURE__ */ i(r, { children: g }));
+		}
+	}, [g]), o(() => {
+		let e = C.current;
+		if (!e) return;
+		let t = () => ({
+			marker: e,
+			AMap: a,
+			map: m
+		}), n = [];
+		if (y) {
+			let r = () => {
+				y?.(t());
+			};
+			e.on("click", r), n.push(() => e.off("click", r));
+		}
+		if (b || S) {
+			let r = () => {
+				S && k(), b?.(t());
+			};
+			e.on("mouseover", r), n.push(() => e.off("mouseover", r));
+		}
+		if (x || S) {
+			let r = () => {
+				S && A(), x?.(t());
+			};
+			e.on("mouseout", r), n.push(() => e.off("mouseout", r));
+		}
+		return () => {
+			n.forEach((e) => e());
+		};
+	}, [
+		a,
+		S,
+		m,
+		y,
+		b,
+		x,
+		A,
+		k
+	]), null;
+}
+//#endregion
+export { m as t };

package/dist/Amap/AmapMarkerCluster/index.js

@@ -1,5 +1,5 @@
 import "../AmapContext-CFmsMycg.js";
 import "../hooks-DwRvpafb.js";
-import "../useMarkerInfoWindowController-G-Bg-NDJ.js";
-import { t as e } from "../AmapMarkerCluster-DvXchCC0.js";
+import "../useMarkerInfoWindowController-BvP2jo7K.js";
+import { t as e } from "../AmapMarkerCluster-MDUfcIqP.js";
 export { e as AmapMarkerCluster, e as default };

package/dist/Amap/{AmapMarkerCluster-DvXchCC0.js → AmapMarkerCluster-MDUfcIqP.js}

@@ -1,8 +1,8 @@
 import { n as e } from "./hooks-DwRvpafb.js";
-import { t } from "./useMarkerInfoWindowController-G-Bg-NDJ.js";
-import { useCallback as n, useEffect as r, useMemo as i, useRef as a } from "react";
+import { n as t, t as n } from "./useMarkerInfoWindowController-BvP2jo7K.js";
+import { useCallback as r, useEffect as i, useMemo as a, useRef as o } from "react";
 //#region src/components/Amap/AmapMarkerCluster/utils.ts
-var o = "[ui-base] AmapMarkerCluster requires AMap.MarkerCluster plugin. Please add \"AMap.MarkerCluster\" to AmapProvider plugins.", s = {}, c = "bottom-center", l = /* @__PURE__ */ new WeakMap(), u = 0, d = (e) => Array.isArray(e) && e.length === 2 && Number.isFinite(e[0]) && Number.isFinite(e[1]), f = (e) => Array.isArray(e) ? e : [], p = (e) => e?.extData, m = (e) => {
+var s = "[ui-base] AmapMarkerCluster requires AMap.MarkerCluster plugin. Please add \"AMap.MarkerCluster\" to AmapProvider plugins.", c = {}, l = /* @__PURE__ */ new WeakMap(), u = 0, d = (e) => Array.isArray(e) && e.length === 2 && Number.isFinite(e[0]) && Number.isFinite(e[1]), f = (e) => Array.isArray(e) ? e : [], p = (e) => e?.extData, m = (e) => {
 	let t = { ...e };
 	return delete t.renderMarker, delete t.renderClusterMarker, t;
 }, h = (e) => l.get(e) || (u += 1, l.set(e, u), u), g = (e) => e === void 0 ? "empty" : typeof e == "string" ? `string:${e}` : `element:${h(e)}`, _ = (e) => e.map((e) => [
@@ -35,15 +35,14 @@ var o = "[ui-base] AmapMarkerCluster requires AMap.MarkerCluster plugin. Please
 `, x = (e, t, n = g(t)) => {
 	t === void 0 || e.__bsyAmapMarkerClusterContentSignature === n || (e.setContent?.(t), e.__bsyAmapMarkerClusterContentSignature = n);
 }, S = (e) => {
-	e.setAnchor?.(c);
+	e.setAnchor?.(t);
 }, C = (e, t, n) => {
-	if (n) {
-		if (Array.isArray(n) && typeof e.Pixel == "function") {
-			t.setOffset?.(new e.Pixel(n[0], n[1]));
-			return;
-		}
-		t.setOffset?.(n);
+	let r = n ?? [0, 0];
+	if (Array.isArray(r) && typeof e.Pixel == "function") {
+		t.setOffset?.(new e.Pixel(r[0], r[1]));
+		return;
 	}
+	t.setOffset?.(r);
 }, w = (e) => {
 	let t = e.__bsyAmapMarkerClusterRuntime;
 	if (!t) return;
@@ -52,16 +51,16 @@ var o = "[ui-base] AmapMarkerCluster requires AMap.MarkerCluster plugin. Please
 };
 //#endregion
 //#region src/components/Amap/AmapMarkerCluster/AmapMarkerCluster.tsx
-function T(c) {
-	let { AMap: l, map: u, mapReady: h } = e(), { data: T, getKey: E, getPosition: D, renderMarker: O, renderCluster: k, clusterOptions: A = s, markerOffset: j, onError: M } = c, { scheduleInfoWindowOpen: N, scheduleInfoWindowClose: P, closeInfoWindow: F } = t({
+function T(t) {
+	let { AMap: l, map: u, mapReady: h } = e(), { data: T, getKey: E, getPosition: D, renderMarker: O, renderCluster: k, clusterOptions: A = c, markerOffset: j, onError: M } = t, { scheduleInfoWindowOpen: N, scheduleInfoWindowClose: P, closeInfoWindow: F } = n({
 		AMap: l,
 		map: u,
 		mapReady: h
-	}), I = a(null), L = a(/* @__PURE__ */ new Set()), R = a(/* @__PURE__ */ new Map()), z = a(null), B = a(""), V = a(""), H = a(c), U = a([]), W = a(!0);
-	H.current = c, r(() => {
-		c.markerInfoWindow || F();
-	}, [F, c.markerInfoWindow]);
-	let G = i(() => {
+	}), I = o(null), L = o(/* @__PURE__ */ new Set()), R = o(/* @__PURE__ */ new Map()), z = o(null), B = o(""), V = o(""), H = o(t), U = o([]), W = o(!0);
+	H.current = t, i(() => {
+		t.markerInfoWindow || F();
+	}, [F, t.markerInfoWindow]);
+	let G = a(() => {
 		let e = [];
 		return T.forEach((t, n) => {
 			let r = D(t);
@@ -80,25 +79,25 @@ function T(c) {
 		D
 	]);
 	U.current = G.validItems;
-	let K = n((e) => {
+	let K = r((e) => {
 		let t = H.current, n = v(e), r = _(e);
 		n !== B.current && (B.current = n, t.onVisibleItemsChange?.(e.map((e) => e.item))), r !== V.current && (V.current = r, t.onMarkerRuntimeChange?.(e));
-	}, []), q = n(() => {
+	}, []), q = r(() => {
 		B.current = "", V.current = "";
 		let e = H.current;
 		e.onVisibleItemsChange?.([]), e.onMarkerRuntimeChange?.([]);
-	}, []), J = n(() => {
+	}, []), J = r(() => {
 		!H.current.onVisibleItemsChange && !H.current.onMarkerRuntimeChange || (z.current && clearTimeout(z.current), z.current = setTimeout(() => {
 			z.current = null, K(Array.from(R.current.values()));
 		}, 0));
-	}, [K]), Y = n(() => {
+	}, [K]), Y = r(() => {
 		R.current.clear(), J();
 	}, [J]);
-	return r(() => {
+	return i(() => {
 		if (!l || !u || !h) return;
 		let e = l.MarkerCluster || l.MarkerClusterer, t = R.current;
 		if (!e) {
-			M?.(Error(o));
+			M?.(Error(s));
 			return;
 		}
 		let n = () => {
@@ -148,8 +147,8 @@ function T(c) {
 			}
 			let r = n.map((e) => new l.Marker({ position: e }));
 			u.setFitView?.(r, !1, t.fitOptions?.padding, t.fitOptions?.maxZoom), r.forEach((e) => e.setMap?.(null));
-		}, s = m(A);
-		s.renderMarker = (e) => {
+		}, o = m(A);
+		o.renderMarker = (e) => {
 			let n = f(e.data)[0], a = H.current;
 			if (e.marker) {
 				let o = e.marker;
@@ -170,7 +169,7 @@ function T(c) {
 					}), J();
 				}
 			}
-		}, s.renderClusterMarker = (e) => {
+		}, o.renderClusterMarker = (e) => {
 			let t = H.current, n = f(e.data).map((e) => e.extData?.item).filter(Boolean);
 			if (e.marker) {
 				let i = e.marker;
@@ -182,7 +181,7 @@ function T(c) {
 				S(i), x(i, o, s);
 			}
 		};
-		let c = new e(u, U.current, s);
+		let c = new e(u, U.current, o);
 		I.current = c, W.current = !0;
 		let _ = (e) => {
 			let t = e?.marker || e?.target, n = f(e?.clusterData || e?.data).map((e) => e.extData?.item).filter(Boolean);
@@ -220,7 +219,7 @@ function T(c) {
 		q,
 		P,
 		N
-	]), r(() => {
+	]), i(() => {
 		if (I.current) {
 			if (W.current) {
 				W.current = !1;

package/dist/Amap/AmapProvider/index.js

@@ -1,5 +1,5 @@
 import "../../vendors/LocaleContext-CBcJzvUD.js";
 import "../../vendors/ConfigProvider-AQTr7T_c.js";
 import "../AmapContext-CFmsMycg.js";
-import { t as e } from "../AmapProvider-XCrqzo9W.js";
+import { t as e } from "../AmapProvider-BGzdby3i.js";
 export { e as AmapProvider, e as default };

package/dist/Amap/{AmapProvider-XCrqzo9W.js → AmapProvider-BGzdby3i.js}

@@ -2,52 +2,53 @@ import { n as e } from "../vendors/ConfigProvider-AQTr7T_c.js";
 import { n as t } from "./AmapContext-CFmsMycg.js";
 import { Fragment as n, jsx as r } from "react/jsx-runtime";
 import { useEffect as i, useState as a } from "react";
+import o from "@amap/amap-jsapi-loader";
 //#region src/components/Amap/loader.ts
-var o = "2.0", s = "[ui-base] AMap has already been loaded with a different key, version, or securityJsCode.", c = null, l = null, u = null, d = /* @__PURE__ */ new Map(), f = (e = []) => Array.from(new Set(e.filter(Boolean))), p = (e) => e || void 0, m = async () => (await import("@amap/amap-jsapi-loader")).default, h = (e) => {
-	if (l && (l.key !== e.key || l.version !== e.version || p(l.securityJsCode) !== p(e.securityJsCode))) throw Error(s);
+var s = "2.0", c = "[ui-base] AMap has already been loaded with a different key, version, or securityJsCode.", l = null, u = null, d = null, f = /* @__PURE__ */ new Map(), p = (e = []) => Array.from(new Set(e.filter(Boolean))), m = (e) => e || void 0, h = (e) => {
+	if (u && (u.key !== e.key || u.version !== e.version || m(u.securityJsCode) !== m(e.securityJsCode))) throw Error(c);
 }, g = (e) => {
-	f(e).forEach((e) => {
-		d.set(e, { status: "loaded" });
+	p(e).forEach((e) => {
+		f.set(e, { status: "loaded" });
 	});
 }, _ = async (e, t) => {
-	let n = f(t).filter((e) => d.get(e)?.status !== "loaded");
+	let n = p(t).filter((e) => f.get(e)?.status !== "loaded");
 	await Promise.all(n.map((t) => {
-		let n = d.get(t);
+		let n = f.get(t);
 		if (n?.status === "loading" && n.promise) return n.promise;
 		let r = new Promise((n, r) => {
 			try {
 				e.plugin([t], () => {
-					d.set(t, { status: "loaded" }), n();
+					f.set(t, { status: "loaded" }), n();
 				});
 			} catch (e) {
-				d.set(t, { status: "failed" }), r(e);
+				f.set(t, { status: "failed" }), r(e);
 			}
 		});
-		return d.set(t, {
+		return f.set(t, {
 			status: "loading",
 			promise: r
 		}), r;
 	}));
 }, v = async (e) => {
-	let t = e.version || o, n = f(e.plugins), r = {
+	let t = e.version || s, n = p(e.plugins), r = {
 		key: e.key,
-		securityJsCode: p(e.securityJsCode),
+		securityJsCode: m(e.securityJsCode),
 		version: t
 	};
 	if (!e.key) throw Error("[ui-base] AMap key is required.");
 	if (typeof window > "u") throw Error("[ui-base] AMap can only be loaded in the browser.");
-	if (window.AMap || (u = null, l = null, c = null, d.clear()), h(r), r.securityJsCode && (window._AMapSecurityConfig = { securityJsCode: r.securityJsCode }), u || window.AMap) {
-		let e = u || window.AMap;
-		return u = e, l = r, await _(e, n), e;
+	if (window.AMap || (d = null, u = null, l = null, f.clear()), h(r), r.securityJsCode && (window._AMapSecurityConfig = { securityJsCode: r.securityJsCode }), d || window.AMap) {
+		let e = d || window.AMap;
+		return d = e, u = r, await _(e, n), e;
 	}
-	c ||= (await m()).load({
+	l ||= o.load({
 		key: e.key,
 		version: t,
 		plugins: n
-	}).then((e) => (u = e, l = r, window.AMap = e, g(n), e)).catch((e) => {
-		throw c = null, u = null, l = null, d.clear(), e;
+	}).then((e) => (d = e, u = r, window.AMap = e, g(n), e)).catch((e) => {
+		throw l = null, d = null, u = null, f.clear(), e;
 	});
-	let i = await c;
+	let i = await l;
 	return await _(i, n), i;
 }, y = (e = []) => Array.from(new Set(e.filter(Boolean))), b = [], x = "
", S = (e, t) => typeof e == "function" ? e(t) : e ?? null, C = (e) => e ? y(e.split(x)) : b;
 function w(o) {

package/dist/Amap/index.js

@@ -1,11 +1,11 @@
 import "../vendors/LocaleContext-CBcJzvUD.js";
 import "../vendors/ConfigProvider-AQTr7T_c.js";
 import "./AmapContext-CFmsMycg.js";
-import { t as e } from "./AmapProvider-XCrqzo9W.js";
+import { t as e } from "./AmapProvider-BGzdby3i.js";
 import { t } from "./Amap-Dnvu_pUP.js";
 import { n, t as r } from "./hooks-DwRvpafb.js";
 import { t as i } from "./AmapCircle-Wfn43qco.js";
-import "./useMarkerInfoWindowController-G-Bg-NDJ.js";
-import { t as a } from "./AmapMarker-CB66dQIG.js";
-import { t as o } from "./AmapMarkerCluster-DvXchCC0.js";
+import "./useMarkerInfoWindowController-BvP2jo7K.js";
+import { t as a } from "./AmapMarker-CMlzx_nj.js";
+import { t as o } from "./AmapMarkerCluster-MDUfcIqP.js";
 export { t as Amap, i as AmapCircle, a as AmapMarker, o as AmapMarkerCluster, e as AmapProvider, n as useAmap, r as useCurrentLocation };

package/dist/Amap/{useMarkerInfoWindowController-G-Bg-NDJ.js → useMarkerInfoWindowController-BvP2jo7K.js}

@@ -2,10 +2,10 @@ import { Fragment as e, jsx as t } from "react/jsx-runtime";
 import { useCallback as n, useEffect as r, useRef as i } from "react";
 import { createRoot as a } from "react-dom/client";
 import { flushSync as o } from "react-dom";
-//#region src/components/Amap/AmapMarker/useMarkerInfoWindowController.tsx
-var s = (e) => {
+//#region src/components/Amap/utils/constants.ts
+var s = "bottom-center", c = (e) => {
 	queueMicrotask(() => e.unmount());
-}, c = "bottom-center", l = 250, u = (e, t) => Array.isArray(t) && typeof e.Pixel == "function" ? new e.Pixel(t[0], t[1]) : t, d = (e) => e.options?.offset !== void 0 && e.options?.offset !== null, f = ({ AMap: f, map: p, mapReady: m }) => {
+}, l = "bottom-center", u = 250, d = (e, t) => Array.isArray(t) && typeof e.Pixel == "function" ? new e.Pixel(t[0], t[1]) : t, f = (e) => e.options?.offset !== void 0 && e.options?.offset !== null, p = ({ AMap: s, map: p, mapReady: m }) => {
 	let h = i(null), g = i(null), _ = i(null), v = i(null), y = i(!1), b = i({
 		openDelay: null,
 		openFrame: null,
@@ -17,18 +17,18 @@ var s = (e) => {
 	}, []), w = n(() => {
 		S(), C(), v.current = null, x.current = !1, h.current?.close?.();
 	}, [C, S]), T = n(() => {
-		w(), _.current && (_.current.onmouseenter = null, _.current.onmouseleave = null), g.current && s(g.current), g.current = null, _.current = null, h.current = null, y.current = !1;
+		w(), _.current && (_.current.onmouseenter = null, _.current.onmouseleave = null), g.current && c(g.current), g.current = null, _.current = null, h.current = null, y.current = !1;
 	}, [w]), E = n(() => {
 		S(), C(), b.current.closeDelay = window.setTimeout(() => {
 			b.current.closeDelay = null, !x.current && w();
-		}, l);
+		}, u);
 	}, [
 		C,
 		S,
 		w
 	]), D = n((e) => {
-		if (!e || !f || !p || !m) return null;
-		let t = d(e);
+		if (!e || !s || !p || !m) return null;
+		let t = f(e);
 		if (y.current && !t && h.current && _.current && g.current && T(), h.current && _.current && g.current) return {
 			infoWindow: h.current,
 			contentElement: _.current,
@@ -38,10 +38,10 @@ var s = (e) => {
 			...e.options,
 			autoMove: !1,
 			isCustom: !0,
-			anchor: c
+			anchor: l
 		};
-		t && (r.offset = u(f, e.options?.offset));
-		let i = new f.InfoWindow(r), o = a(n);
+		t && (r.offset = d(s, e.options?.offset));
+		let i = new s.InfoWindow(r), o = a(n);
 		return n.onmouseenter = () => {
 			x.current = !0, C();
 		}, n.onmouseleave = () => {
@@ -52,30 +52,30 @@ var s = (e) => {
 			contentRoot: o
 		};
 	}, [
-		f,
+		s,
 		C,
 		p,
 		m,
 		T,
 		E
 	]), O = n((n, r) => {
-		!n || !r || !f || !p || !m || (v.current = n, C(), S(), b.current.openDelay = window.setTimeout(() => {
+		!n || !r || !s || !p || !m || (v.current = n, C(), S(), b.current.openDelay = window.setTimeout(() => {
 			b.current.openDelay = null;
 			let i = D(r);
 			if (!i || v.current !== n) return;
-			let { infoWindow: a, contentElement: s, contentRoot: l } = i, m = d(r);
-			if (a.setAnchor?.(c), m) {
-				let e = u(f, r.options?.offset);
+			let { infoWindow: a, contentElement: c, contentRoot: u } = i, m = f(r);
+			if (a.setAnchor?.(l), m) {
+				let e = d(s, r.options?.offset);
 				a.setOffset?.(e);
 			}
 			o(() => {
-				l.render(/* @__PURE__ */ t(e, { children: r.content }));
-			}), a.setContent?.(s), b.current.openFrame = window.requestAnimationFrame(() => {
+				u.render(/* @__PURE__ */ t(e, { children: r.content }));
+			}), a.setContent?.(c), b.current.openFrame = window.requestAnimationFrame(() => {
 				b.current.openFrame = null, v.current === n && a.open?.(p, n.getPosition?.());
 			});
-		}, l));
+		}, u));
 	}, [
-		f,
+		s,
 		C,
 		S,
 		D,
@@ -83,7 +83,7 @@ var s = (e) => {
 		m
 	]);
 	return r(() => () => {
-		w(), _.current && (_.current.onmouseenter = null, _.current.onmouseleave = null), g.current && s(g.current), g.current = null, _.current = null, h.current = null, y.current = !1;
+		w(), _.current && (_.current.onmouseenter = null, _.current.onmouseleave = null), g.current && c(g.current), g.current = null, _.current = null, h.current = null, y.current = !1;
 	}, [w]), {
 		scheduleInfoWindowOpen: O,
 		scheduleInfoWindowClose: E,
@@ -91,4 +91,4 @@ var s = (e) => {
 	};
 };
 //#endregion
-export { f as t };
+export { s as n, p as t };

package/dist/components/Amap/AmapMarkerCluster/utils.d.ts

@@ -3,7 +3,6 @@ import { AmapMarkerClusterContent, AmapMarkerClusterMarkerOffset, AmapMarkerClus
 import { ClusterPoint, ManagedMarker } from './AmapMarkerCluster.type';
 export declare const MARKER_CLUSTER_PLUGIN_ERROR = "[ui-base] AmapMarkerCluster requires AMap.MarkerCluster plugin. Please add \"AMap.MarkerCluster\" to AmapProvider plugins.";
 export declare const EMPTY_CLUSTER_OPTIONS: Record<string, any>;
-export declare const DEFAULT_MARKER_ANCHOR = "bottom-center";
 export declare const isValidPosition: (position: unknown) => position is LngLat;
 export declare const resolveClusterData: <T>(value: unknown) => Array<ClusterPoint<T>>;
 export declare const resolveItemContext: <T>(point?: ClusterPoint<T>) => {

package/dist/components/Amap/utils/constants.d.ts

@@ -0,0 +1,2 @@
+/** AmapMarker 与 AmapMarkerCluster 共用 */
+export declare const DEFAULT_MARKER_ANCHOR = "bottom-center";

package/dist/index.js

@@ -3,13 +3,13 @@ import { t } from "./Icon/Icon-SQ5tu-yG.js";
 import "./vendors/LocaleContext-CBcJzvUD.js";
 import { r as n, t as r } from "./vendors/ConfigProvider-AQTr7T_c.js";
 import "./Amap/AmapContext-CFmsMycg.js";
-import { t as i } from "./Amap/AmapProvider-XCrqzo9W.js";
+import { t as i } from "./Amap/AmapProvider-BGzdby3i.js";
 import { t as a } from "./Amap/Amap-Dnvu_pUP.js";
 import { n as o, t as s } from "./Amap/hooks-DwRvpafb.js";
 import { t as c } from "./Amap/AmapCircle-Wfn43qco.js";
-import "./Amap/useMarkerInfoWindowController-G-Bg-NDJ.js";
-import { t as l } from "./Amap/AmapMarker-CB66dQIG.js";
-import { t as u } from "./Amap/AmapMarkerCluster-DvXchCC0.js";
+import "./Amap/useMarkerInfoWindowController-BvP2jo7K.js";
+import { t as l } from "./Amap/AmapMarker-CMlzx_nj.js";
+import { t as u } from "./Amap/AmapMarkerCluster-MDUfcIqP.js";
 import { t as d } from "./Card/Card-BjWdQRjq.js";
 import { t as f } from "./Modal/Modal-GGHNlZv3.js";
 import { t as p } from "./ColorPicker/ColorPicker-Hjs4Vp5a.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/ui-base",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "type": "module",
   "description": "百数云低代码平台通用组件库",
   "author": "bsy-fe team",

package/dist/Amap/AmapMarker-CB66dQIG.js

@@ -1,152 +0,0 @@
-import { n as e } from "./hooks-DwRvpafb.js";
-import { t } from "./useMarkerInfoWindowController-G-Bg-NDJ.js";
-import { Fragment as n, jsx as r } from "react/jsx-runtime";
-import { useCallback as i, useEffect as a, useRef as o } from "react";
-import { createRoot as s } from "react-dom/client";
-//#region src/components/Amap/AmapMarker/useMarkerInfoWindow.tsx
-var c = ({ AMap: e, map: n, mapReady: r, markerRef: o, infoWindow: s }) => {
-	let { scheduleInfoWindowOpen: c, scheduleInfoWindowClose: l, closeInfoWindow: u } = t({
-		AMap: e,
-		map: n,
-		mapReady: r
-	}), d = i(() => {
-		if (!s) return;
-		let e = o.current;
-		e && c(e, s);
-	}, [
-		s,
-		o,
-		c
-	]);
-	return a(() => {
-		if (s) return () => {
-			u();
-		};
-	}, [u, s]), {
-		scheduleInfoWindowOpen: d,
-		scheduleInfoWindowClose: l,
-		closeInfoWindow: u
-	};
-}, l = (e) => typeof e == "string" || typeof e == "number", u = (e) => e != null && typeof e != "boolean", d = (e) => u(e) && !l(e), f = (e) => {
-	queueMicrotask(() => e.unmount());
-};
-function p(t) {
-	let { AMap: i, map: p, mapReady: m } = e(), { content: h, infoWindow: g, options: _ = {}, onClick: v, onMouseEnter: y, onMouseLeave: b } = t, x = !!g, S = o(null), C = o(null), w = o(null), T = o(!0), E = o(!0), D = o({
-		content: h,
-		infoWindow: g,
-		options: _
-	});
-	D.current = {
-		content: h,
-		infoWindow: g,
-		options: _
-	};
-	let { scheduleInfoWindowOpen: O, scheduleInfoWindowClose: k, closeInfoWindow: A } = c({
-		AMap: i,
-		map: p,
-		mapReady: m,
-		markerRef: S,
-		infoWindow: g
-	});
-	return a(() => {
-		if (!i || !p || !m || S.current) return;
-		let e = D.current, t = {
-			...e.options,
-			map: p
-		};
-		if (l(e.content)) {
-			let n = document.createElement("div");
-			n.textContent = String(e.content), w.current = n, t.content = n;
-		} else if (d(e.content)) {
-			let e = document.createElement("div");
-			w.current = e, t.content = e;
-		}
-		let a = new i.Marker(t);
-		if (S.current = a, d(e.content) && w.current) {
-			let t = s(w.current);
-			C.current = t, t.render(/* @__PURE__ */ r(n, { children: e.content }));
-		}
-		return () => {
-			let e = C.current;
-			e && f(e), C.current = null, w.current = null, A(), a.setMap(null), S.current = null;
-		};
-	}, [
-		i,
-		A,
-		p,
-		m
-	]), a(() => {
-		let e = _.position;
-		if (!e) return;
-		let t = S.current?.getPosition?.(), n = t?.getLng?.() ?? t?.lng, r = t?.getLat?.() ?? t?.lat, i = Array.isArray(e) ? e[0] : e.lng, a = Array.isArray(e) ? e[1] : e.lat;
-		n === i && r === a || S.current?.setPosition(e);
-	}, [_.position]), a(() => {
-		if (E.current) {
-			E.current = !1;
-			return;
-		}
-		let e = S.current;
-		e && (_.visible === !1 ? e.hide?.() : _.visible === !0 && e.show?.());
-	}, [_.visible]), a(() => {
-		if (T.current) {
-			T.current = !1;
-			return;
-		}
-		let e = S.current;
-		if (e) {
-			if (!u(h)) {
-				C.current && f(C.current), C.current = null, w.current = null, e.setContent?.("");
-				return;
-			}
-			if (l(h)) {
-				if (C.current) {
-					let t = C.current;
-					f(t), C.current = null, w.current = document.createElement("div"), e.setContent?.(w.current);
-				}
-				w.current || (w.current = document.createElement("div"), e.setContent?.(w.current)), w.current.textContent = String(h);
-				return;
-			}
-			w.current || (w.current = document.createElement("div"), e.setContent?.(w.current)), C.current ||= s(w.current), C.current.render(/* @__PURE__ */ r(n, { children: h }));
-		}
-	}, [h]), a(() => {
-		let e = S.current;
-		if (!e) return;
-		let t = () => ({
-			marker: e,
-			AMap: i,
-			map: p
-		}), n = [];
-		if (v) {
-			let r = () => {
-				v?.(t());
-			};
-			e.on("click", r), n.push(() => e.off("click", r));
-		}
-		if (y || x) {
-			let r = () => {
-				x && O(), y?.(t());
-			};
-			e.on("mouseover", r), n.push(() => e.off("mouseover", r));
-		}
-		if (b || x) {
-			let r = () => {
-				x && k(), b?.(t());
-			};
-			e.on("mouseout", r), n.push(() => e.off("mouseout", r));
-		}
-		return () => {
-			n.forEach((e) => e());
-		};
-	}, [
-		i,
-		x,
-		p,
-		v,
-		y,
-		b,
-		k,
-		O
-	]), null;
-}
-//#endregion
-export { p as t };