fix: safe type & global use option not working

yue1123 · Sep 20, 2022 · 6c40261 · 6c40261
1 parent dc1152e
commit 6c40261
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/components/overlay/bm-marker/index.vue b/src/components/overlay/bm-marker/index.vue
@@ -182,7 +182,7 @@
 			return defaultIcons[icon as string]
 		} else {
 			// @ts-ignore
-			const { anchor, imageOffset, imageSize, imageUrl, printImageUrl } = props.icon
+			const { anchor, imageOffset, imageSize, imageUrl, printImageUrl } = icon as MarkerCustomIcon
 			const iconOptions: BMapGL.IconOptions = {
 				imageSize: new BMapGL.Size(imageSize.width, imageSize.height)
 			}
@@ -216,4 +216,4 @@
 	function setRotation(rotation: number) {
 		marker.setRotation(rotation)
 	}
-</script>
+</script>
diff --git a/src/index.ts b/src/index.ts
@@ -10,7 +10,11 @@ import Polyline from './components/overlay/bm-polyline'
 import Polygon from './components/overlay/bm-polygon'
 import Circle from './components/overlay/bm-circle'
 
-import useBaseMapEffect from './hooks/useBaseMapEffect'
+// import useMarkerDefaultIcons from './hooks/useMarkerDefaultIcons'
+
+interface InitOptions {
+	ak?: string
+}
 const components = [
 	{
 		name: 'baidu-map',
@@ -54,11 +58,13 @@ const components = [
 	}
 ]
 // 全局注册
-const install = (app: App) => {
+const install = (app: App, options?: InitOptions) => {
+	const { ak } = options || {}
 	components.forEach((item: any) => {
 		item.com.name = item.name
 		app.use(item.com)
 	})
+	ak && app.provide('baiduMapAk', ak)
 }
 
 // 局部注册
@@ -73,8 +79,8 @@ export {
 	Polyline,
 	Polygon,
 	Circle,
-	install,
-	useBaseMapEffect
+	install
+	// useMarkerDefaultIcons
 }
 
 export default {