@summeruse/ol 0.2.0-alpha.3 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @summeruse/ol
 
+## 0.3.0
+
+### Minor Changes
+
+- 95fc65d: refactor(usePointermove): 重构指针移动事件处理逻辑
+
+## 0.2.0
+
+### Minor Changes
+
+- c2ad696: 将 n-ol-pointermove 组件重构为 usePointermove 组合式函数
+- 6fbc681: 重构右键菜单功能为组合式 API
+- f605ee4: 移除对 naive-ui 的依赖并调整相关配置
+
+### Patch Changes
+
+- fd8d77c: 修复 createFeature 中样式不生效
+- 9275a0b: refactor(utils): 移除计算和格式化工具模块
+- 66a195e: refactor(utils/layer): 移除 T_MAP_TYPE 的外部依赖并内联定义
+- 93d2746: refactor(usePointermove): 重构指针移动逻辑并添加新配置选项
+- 3317ecf: feat(utils): 添加角度和旋转格式化函数
+- c466dde: build(ol): 清理 package.json 中未使用的依赖项
+- 03fc086: feat(ol-map): 添加地图事件监听和 emit 功能
+- ba32d77: refactor(utils/layer): 重构地图图层工具函数，优化类型定义和参数结构
+
 ## 0.2.0-alpha.3
 
 ### Patch Changes

package/dist/index.js

@@ -619,96 +619,90 @@ function useGraticule(a) {
 		deep: !0
 	}), { showGraticule: u };
 }
-function usePointermove({ mapRef: u, items: d, enabled: f = !0, forceUpdate: m = !1 }) {
-	let h = ref(!1), g = ref({
+function usePointermove({ mapRef: u, items: d, forceUpdate: f = !1 }) {
+	let m = ref(!1), h = ref({
 		x: 0,
 		y: 0
-	}), _ = ref(), y = ref(), b = ref({
+	}), g = ref(), _ = ref(), y = ref({
 		x: 0,
 		y: 0
-	}), S = ref(), w = ref(), T = computed(() => ({
-		x: g.value.x + b.value.x,
-		y: g.value.y + b.value.y
-	})), E = () => typeof f == "function" ? f() : f, D, O, k = "";
-	function A(a) {
+	}), b = ref(), S = ref(), w = computed(() => ({
+		x: h.value.x + y.value.x,
+		y: h.value.y + y.value.y
+	})), T, E, D = "";
+	function O(a) {
 		let u = toValue(d);
 		return u.sort((a, u) => (u.priority ?? 0) - (a.priority ?? 0)), u.find((u) => {
 			let d = u.visible;
 			return typeof d == "function" ? d(a) : d ?? !0;
 		});
 	}
-	function j(a) {
-		if (!E()) {
-			M();
-			return;
-		}
-		if (!D || !O) return;
-		let u = D.getEventCoordinate(a);
-		S.value = u;
-		let d = D.getEventPixel(a), f, p;
-		if (D.forEachFeatureAtPixel(d, (a, u) => (f = a, p = u, !0)), !f) {
-			M();
+	function k(a) {
+		if (a.dragging || !T || !E) return;
+		let u = a.coordinate;
+		b.value = u;
+		let d = a.pixel, p, v;
+		if (T.forEachFeatureAtPixel(d, (a, u) => (p = a, v = u, !0)), !p) {
+			A();
 			return;
 		}
-		if (!m && _.value && _.value.getId() === f.getId()) return;
-		_.value = f;
-		let v = {
-			map: D,
+		if (!f && g.value && g.value.getId() === p.getId()) return;
+		g.value = p;
+		let { top: x, left: C } = E.getBoundingClientRect(), w = {
+			map: T,
 			position: {
-				x: a.clientX,
-				y: a.clientY
+				x: d[0] + C,
+				y: d[1] + x
 			},
 			coordinate: u,
-			feature: f,
-			layer: p
-		}, x = A(v);
-		if (x) {
-			let { content: a, cursor: u, visible: d, fixedFeatureCenter: f, offset: p, priority: m,...h } = x;
-			w.value = { ...h };
+			feature: p,
+			layer: v
+		}, D = O(w);
+		if (D) {
+			let { content: a, cursor: u, visible: d, fixedFeatureCenter: f, offset: p, priority: m,...h } = D;
+			S.value = { ...h };
 		}
-		if (!x) {
-			M();
+		if (!D) {
+			A();
 			return;
 		}
-		b.value = {
-			x: x.offset?.x ?? 0,
-			y: x.offset?.y ?? 0
+		y.value = {
+			x: D.offset?.x ?? 0,
+			y: D.offset?.y ?? 0
 		};
-		let C = m === !1 ? !0 : x.fixedFeatureCenter ?? !0, T = f.getGeometry();
-		if (C && T) {
-			let a = getCenter(T.getExtent()), u = D.getPixelFromCoordinate(a), { top: d, left: f } = O.getBoundingClientRect();
-			g.value.x = u[0] + f, g.value.y = u[1] + d;
-		} else g.value = {
-			x: a.clientX,
-			y: a.clientY
-		};
-		let k = x.content;
-		y.value = typeof k == "function" ? () => k(v) : k;
-		let j = x.cursor, N = typeof j == "function" ? j(v) : j;
-		N !== void 0 && N !== O.style.cursor && (O.style.cursor = N), h.value = !0;
+		let k = f === !1 ? !0 : D.fixedFeatureCenter ?? !0, j = p.getGeometry();
+		if (k && j) {
+			let a = getCenter(j.getExtent());
+			d = T.getPixelFromCoordinate(a);
+		}
+		h.value.x = d[0] + C, h.value.y = d[1] + x;
+		let M = D.content;
+		_.value = typeof M == "function" ? () => M(w) : M;
+		let N = D.cursor, P = typeof N == "function" ? N(w) : N;
+		P !== void 0 && P !== E.style.cursor && (E.style.cursor = P), m.value = !0;
 	}
-	function M() {
-		h.value = !1, _.value = void 0, O && O.style.cursor !== k && (O.style.cursor = k);
+	function A() {
+		m.value = !1, g.value = void 0, E && E.style.cursor !== D && (E.style.cursor = D);
 	}
-	function N(a) {
-		a.addEventListener("pointermove", j);
+	function j(a) {
+		a.on("pointermove", k);
 	}
-	function P(a) {
-		a.removeEventListener("pointermove", j);
+	function M(a) {
+		a.un("pointermove", k);
 	}
 	return watch(() => toValue(u), (a, u) => {
-		u !== a && (D = a, a && (O = a.getViewport(), P(O), N(O), k = O.style.cursor));
+		u && M(u), u !== a && (T = a, a && (E = a.getViewport(), j(a), D = E.style.cursor));
 	}, { immediate: !0 }), onBeforeUnmount(() => {
-		O && P(O);
+		T && M(T);
 	}), {
-		visible: computed(() => h.value),
-		position: computed(() => T.value),
-		originalPosition: computed(() => g.value),
-		feature: computed(() => _.value),
-		content: computed(() => y.value),
-		coordinate: computed(() => S.value),
-		option: computed(() => w.value),
-		hide: M
+		visible: computed(() => m.value),
+		position: computed(() => w.value),
+		originalPosition: computed(() => h.value),
+		feature: computed(() => g.value),
+		content: computed(() => _.value),
+		coordinate: computed(() => b.value),
+		option: computed(() => S.value),
+		hide: A
 	};
 }
 function useSwitchBaseLayer(a) {

package/es/composables/usePointermove/index.d.ts

@@ -40,12 +40,10 @@ export interface UsePointermoveOptions<T extends Option = Option> {
     mapRef: MaybeRefOrGetter<OLMap | undefined>;
     /** 提示配置列表 */
     items: MaybeRefOrGetter<PointermoveList<T>>;
-    /** 前置判断条件 */
-    enabled?: boolean | (() => boolean | undefined | void);
     /** 强制更新 （开启后，无论 feature 是否变化，都强制更新提示） */
     forceUpdate?: boolean;
 }
-export declare function usePointermove<T extends Option>({ mapRef, items, enabled, forceUpdate }: UsePointermoveOptions<T>): {
+export declare function usePointermove<T extends Option>({ mapRef, items, forceUpdate }: UsePointermoveOptions<T>): {
     visible: import('vue').ComputedRef<boolean>;
     position: import('vue').ComputedRef<{
         x: number;

package/es/composables/usePointermove/index.mjs

@@ -1,95 +1,89 @@
 import { computed, onBeforeUnmount, ref, toValue, watch } from "vue";
 import { getCenter } from "ol/extent";
-function usePointermove({ mapRef: o, items: s, enabled: c = !0, forceUpdate: l = !1 }) {
-	let u = ref(!1), d = ref({
+function usePointermove({ mapRef: o, items: s, forceUpdate: c = !1 }) {
+	let l = ref(!1), u = ref({
 		x: 0,
 		y: 0
-	}), f = ref(), p = ref(), m = ref({
+	}), d = ref(), f = ref(), p = ref({
 		x: 0,
 		y: 0
-	}), h = ref(), g = ref(), _ = computed(() => ({
-		x: d.value.x + m.value.x,
-		y: d.value.y + m.value.y
-	})), v = () => typeof c == "function" ? c() : c, y, b, x = "";
-	function S(e) {
+	}), m = ref(), h = ref(), g = computed(() => ({
+		x: u.value.x + p.value.x,
+		y: u.value.y + p.value.y
+	})), _, v, y = "";
+	function b(e) {
 		let t = toValue(s);
 		return t.sort((e, t) => (t.priority ?? 0) - (e.priority ?? 0)), t.find((t) => {
 			let n = t.visible;
 			return typeof n == "function" ? n(e) : n ?? !0;
 		});
 	}
-	function C(e) {
-		if (!v()) {
-			w();
-			return;
-		}
-		if (!y || !b) return;
-		let t = y.getEventCoordinate(e);
-		h.value = t;
-		let n = y.getEventPixel(e), r, i;
-		if (y.forEachFeatureAtPixel(n, (e, t) => (r = e, i = t, !0)), !r) {
-			w();
+	function x(e) {
+		if (e.dragging || !_ || !v) return;
+		let t = e.coordinate;
+		m.value = t;
+		let n = e.pixel, r, i;
+		if (_.forEachFeatureAtPixel(n, (e, t) => (r = e, i = t, !0)), !r) {
+			S();
 			return;
 		}
-		if (!l && f.value && f.value.getId() === r.getId()) return;
-		f.value = r;
-		let o = {
-			map: y,
+		if (!c && d.value && d.value.getId() === r.getId()) return;
+		d.value = r;
+		let { top: o, left: s } = v.getBoundingClientRect(), g = {
+			map: _,
 			position: {
-				x: e.clientX,
-				y: e.clientY
+				x: n[0] + s,
+				y: n[1] + o
 			},
 			coordinate: t,
 			feature: r,
 			layer: i
-		}, s = S(o);
-		if (s) {
-			let { content: e, cursor: t, visible: n, fixedFeatureCenter: r, offset: i, priority: a,...o } = s;
-			g.value = { ...o };
+		}, y = b(g);
+		if (y) {
+			let { content: e, cursor: t, visible: n, fixedFeatureCenter: r, offset: i, priority: a,...o } = y;
+			h.value = { ...o };
 		}
-		if (!s) {
-			w();
+		if (!y) {
+			S();
 			return;
 		}
-		m.value = {
-			x: s.offset?.x ?? 0,
-			y: s.offset?.y ?? 0
+		p.value = {
+			x: y.offset?.x ?? 0,
+			y: y.offset?.y ?? 0
 		};
-		let c = l === !1 ? !0 : s.fixedFeatureCenter ?? !0, _ = r.getGeometry();
-		if (c && _) {
-			let e = getCenter(_.getExtent()), t = y.getPixelFromCoordinate(e), { top: n, left: r } = b.getBoundingClientRect();
-			d.value.x = t[0] + r, d.value.y = t[1] + n;
-		} else d.value = {
-			x: e.clientX,
-			y: e.clientY
-		};
-		let x = s.content;
-		p.value = typeof x == "function" ? () => x(o) : x;
-		let C = s.cursor, T = typeof C == "function" ? C(o) : C;
-		T !== void 0 && T !== b.style.cursor && (b.style.cursor = T), u.value = !0;
+		let x = c === !1 ? !0 : y.fixedFeatureCenter ?? !0, C = r.getGeometry();
+		if (x && C) {
+			let e = getCenter(C.getExtent());
+			n = _.getPixelFromCoordinate(e);
+		}
+		u.value.x = n[0] + s, u.value.y = n[1] + o;
+		let w = y.content;
+		f.value = typeof w == "function" ? () => w(g) : w;
+		let T = y.cursor, E = typeof T == "function" ? T(g) : T;
+		E !== void 0 && E !== v.style.cursor && (v.style.cursor = E), l.value = !0;
 	}
-	function w() {
-		u.value = !1, f.value = void 0, b && b.style.cursor !== x && (b.style.cursor = x);
+	function S() {
+		l.value = !1, d.value = void 0, v && v.style.cursor !== y && (v.style.cursor = y);
 	}
-	function T(e) {
-		e.addEventListener("pointermove", C);
+	function C(e) {
+		e.on("pointermove", x);
 	}
-	function E(e) {
-		e.removeEventListener("pointermove", C);
+	function w(e) {
+		e.un("pointermove", x);
 	}
 	return watch(() => toValue(o), (e, t) => {
-		t !== e && (y = e, e && (b = e.getViewport(), E(b), T(b), x = b.style.cursor));
+		t && w(t), t !== e && (_ = e, e && (v = e.getViewport(), C(e), y = v.style.cursor));
 	}, { immediate: !0 }), onBeforeUnmount(() => {
-		b && E(b);
+		_ && w(_);
 	}), {
-		visible: computed(() => u.value),
-		position: computed(() => _.value),
-		originalPosition: computed(() => d.value),
-		feature: computed(() => f.value),
-		content: computed(() => p.value),
-		coordinate: computed(() => h.value),
-		option: computed(() => g.value),
-		hide: w
+		visible: computed(() => l.value),
+		position: computed(() => g.value),
+		originalPosition: computed(() => u.value),
+		feature: computed(() => d.value),
+		content: computed(() => f.value),
+		coordinate: computed(() => m.value),
+		option: computed(() => h.value),
+		hide: S
 	};
 }
 export { usePointermove };

package/lib/composables/usePointermove/index.d.ts

@@ -40,12 +40,10 @@ export interface UsePointermoveOptions<T extends Option = Option> {
     mapRef: MaybeRefOrGetter<OLMap | undefined>;
     /** 提示配置列表 */
     items: MaybeRefOrGetter<PointermoveList<T>>;
-    /** 前置判断条件 */
-    enabled?: boolean | (() => boolean | undefined | void);
     /** 强制更新 （开启后，无论 feature 是否变化，都强制更新提示） */
     forceUpdate?: boolean;
 }
-export declare function usePointermove<T extends Option>({ mapRef, items, enabled, forceUpdate }: UsePointermoveOptions<T>): {
+export declare function usePointermove<T extends Option>({ mapRef, items, forceUpdate }: UsePointermoveOptions<T>): {
     visible: import('vue').ComputedRef<boolean>;
     position: import('vue').ComputedRef<{
         x: number;

package/lib/composables/usePointermove/index.js

@@ -1 +1 @@
-const e=require(`../../_virtual/rolldown_runtime.js`);let t=require(`vue`);t=e.__toESM(t);let n=require(`ol/extent`);n=e.__toESM(n);function r({mapRef:e,items:r,enabled:i=!0,forceUpdate:a=!1}){let o=(0,t.ref)(!1),s=(0,t.ref)({x:0,y:0}),c=(0,t.ref)(),l=(0,t.ref)(),u=(0,t.ref)({x:0,y:0}),d=(0,t.ref)(),f=(0,t.ref)(),p=(0,t.computed)(()=>({x:s.value.x+u.value.x,y:s.value.y+u.value.y})),m=()=>typeof i==`function`?i():i,h,g,_=``;function v(e){let n=(0,t.toValue)(r);return n.sort((e,t)=>(t.priority??0)-(e.priority??0)),n.find(t=>{let n=t.visible;return typeof n==`function`?n(e):n??!0})}function y(e){if(!m()){b();return}if(!h||!g)return;let t=h.getEventCoordinate(e);d.value=t;let r=h.getEventPixel(e),i,p;if(h.forEachFeatureAtPixel(r,(e,t)=>(i=e,p=t,!0)),!i){b();return}if(!a&&c.value&&c.value.getId()===i.getId())return;c.value=i;let _={map:h,position:{x:e.clientX,y:e.clientY},coordinate:t,feature:i,layer:p},y=v(_);if(y){let{content:e,cursor:t,visible:n,fixedFeatureCenter:r,offset:i,priority:a,...o}=y;f.value={...o}}if(!y){b();return}u.value={x:y.offset?.x??0,y:y.offset?.y??0};let x=a===!1?!0:y.fixedFeatureCenter??!0,S=i.getGeometry();if(x&&S){let e=(0,n.getCenter)(S.getExtent()),t=h.getPixelFromCoordinate(e),{top:r,left:i}=g.getBoundingClientRect();s.value.x=t[0]+i,s.value.y=t[1]+r}else s.value={x:e.clientX,y:e.clientY};let C=y.content;l.value=typeof C==`function`?()=>C(_):C;let w=y.cursor,T=typeof w==`function`?w(_):w;T!==void 0&&T!==g.style.cursor&&(g.style.cursor=T),o.value=!0}function b(){o.value=!1,c.value=void 0,g&&g.style.cursor!==_&&(g.style.cursor=_)}function x(e){e.addEventListener(`pointermove`,y)}function S(e){e.removeEventListener(`pointermove`,y)}return(0,t.watch)(()=>(0,t.toValue)(e),(e,t)=>{t!==e&&(h=e,e&&(g=e.getViewport(),S(g),x(g),_=g.style.cursor))},{immediate:!0}),(0,t.onBeforeUnmount)(()=>{g&&S(g)}),{visible:(0,t.computed)(()=>o.value),position:(0,t.computed)(()=>p.value),originalPosition:(0,t.computed)(()=>s.value),feature:(0,t.computed)(()=>c.value),content:(0,t.computed)(()=>l.value),coordinate:(0,t.computed)(()=>d.value),option:(0,t.computed)(()=>f.value),hide:b}}exports.usePointermove=r;
+const e=require(`../../_virtual/rolldown_runtime.js`);let t=require(`vue`);t=e.__toESM(t);let n=require(`ol/extent`);n=e.__toESM(n);function r({mapRef:e,items:r,forceUpdate:i=!1}){let a=(0,t.ref)(!1),o=(0,t.ref)({x:0,y:0}),s=(0,t.ref)(),c=(0,t.ref)(),l=(0,t.ref)({x:0,y:0}),u=(0,t.ref)(),d=(0,t.ref)(),f=(0,t.computed)(()=>({x:o.value.x+l.value.x,y:o.value.y+l.value.y})),p,m,h=``;function g(e){let n=(0,t.toValue)(r);return n.sort((e,t)=>(t.priority??0)-(e.priority??0)),n.find(t=>{let n=t.visible;return typeof n==`function`?n(e):n??!0})}function _(e){if(e.dragging||!p||!m)return;let t=e.coordinate;u.value=t;let r=e.pixel,f,h;if(p.forEachFeatureAtPixel(r,(e,t)=>(f=e,h=t,!0)),!f){v();return}if(!i&&s.value&&s.value.getId()===f.getId())return;s.value=f;let{top:_,left:y}=m.getBoundingClientRect(),b={map:p,position:{x:r[0]+y,y:r[1]+_},coordinate:t,feature:f,layer:h},x=g(b);if(x){let{content:e,cursor:t,visible:n,fixedFeatureCenter:r,offset:i,priority:a,...o}=x;d.value={...o}}if(!x){v();return}l.value={x:x.offset?.x??0,y:x.offset?.y??0};let S=i===!1?!0:x.fixedFeatureCenter??!0,C=f.getGeometry();if(S&&C){let e=(0,n.getCenter)(C.getExtent());r=p.getPixelFromCoordinate(e)}o.value.x=r[0]+y,o.value.y=r[1]+_;let w=x.content;c.value=typeof w==`function`?()=>w(b):w;let T=x.cursor,E=typeof T==`function`?T(b):T;E!==void 0&&E!==m.style.cursor&&(m.style.cursor=E),a.value=!0}function v(){a.value=!1,s.value=void 0,m&&m.style.cursor!==h&&(m.style.cursor=h)}function y(e){e.on(`pointermove`,_)}function b(e){e.un(`pointermove`,_)}return(0,t.watch)(()=>(0,t.toValue)(e),(e,t)=>{t&&b(t),t!==e&&(p=e,e&&(m=e.getViewport(),y(e),h=m.style.cursor))},{immediate:!0}),(0,t.onBeforeUnmount)(()=>{p&&b(p)}),{visible:(0,t.computed)(()=>a.value),position:(0,t.computed)(()=>f.value),originalPosition:(0,t.computed)(()=>o.value),feature:(0,t.computed)(()=>s.value),content:(0,t.computed)(()=>c.value),coordinate:(0,t.computed)(()=>u.value),option:(0,t.computed)(()=>d.value),hide:v}}exports.usePointermove=r;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@summeruse/ol",
   "type": "module",
-  "version": "0.2.0-alpha.3",
+  "version": "0.3.0",
   "description": "",
   "author": "finalsummer",
   "license": "ISC",