fix: 修复资源注册问题 (#15)

antvis · Jun 20, 2022 · 7f75987 · 7f75987
1 parent 933a552
commit 7f75987
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 6 deletions.
diff --git a/src/components/CustomControl/index.md b/src/components/CustomControl/index.md
@@ -1,5 +1,6 @@
 ---
 toc: content
+order: 3
 group:
   title: 控件组件
   order: 2

diff --git a/src/components/LarkMap/index.tsx b/src/components/LarkMap/index.tsx
@@ -38,10 +38,10 @@ export const LarkMap = forwardRef<LarkMapRefAttributes, LarkMapProps>((props, re
         contextValue.layerManager = layerManager;
 
         scene.once('loaded', () => {
-          setSceneInstance(scene);
           if (onSceneLoaded) {
             onSceneLoaded(scene);
           }
+          setSceneInstance(scene);
         });
       })
       .catch((error) => {

diff --git a/src/components/Marker/index.md b/src/components/Marker/index.md
@@ -1,5 +1,6 @@
 ---
 toc: content
+order: 1
 group:
   title: 分析组件
   order: 3

diff --git a/src/components/Marker/index.tsx b/src/components/Marker/index.tsx
@@ -21,6 +21,7 @@ export const Marker = memo<MarkerProps>((props): React.ReactPortal => {
       ...props,
       element: hasChildren ? document.createElement('div') : null,
     };
+    // @ts-ignore
     const l7marker = new L7Marker(options);
 
     l7marker.on('click', (e: MouseEvent) => {

diff --git a/src/components/Marker/types.ts b/src/components/Marker/types.ts
@@ -1,4 +1,23 @@
-import type { anchorType, ILngLat } from '@antv/l7';
+import type { ILngLat } from '@antv/l7';
+
+/**
+ * 锚点相对位置
+ */
+export type AnchorType =
+  | 'right'
+  | 'top-right'
+  | 'left'
+  | 'bottom-right'
+  | 'left'
+  | 'top-left'
+  | 'bottom-left'
+  | 'bottom'
+  | 'bottom-right'
+  | 'bottom-left'
+  | 'top'
+  | 'top-right'
+  | 'top-left'
+  | 'center';
 
 /**
  * 组件类型定义
@@ -9,7 +28,7 @@ export interface MarkerProps {
   /** 锚点相对位置，支持 'center', 'top', 'bottom', 'left', 'right', 'top-left', 'top-right', 'bottom-left', 'bottom-right'
    * @default "center"
    */
-  anchor?: anchorType;
+  anchor?: AnchorType;
   /** 设置默认 marker 的颜色
    * @default "#5B8FF9"
    */

diff --git a/src/components/Popup/demos/default.tsx b/src/components/Popup/demos/default.tsx
@@ -12,7 +12,7 @@ export default () => {
 
   return (
     <LarkMap mapType="GaodeV1" style={{ height: '300px' }} onSceneLoaded={onSceneLoaded}>
-      <Popup lngLat={lngLat} closeButton={false} closeOnClick={false}>
+      <Popup lngLat={lngLat} closeButton={false} closeOnClick={false} anchor="bottom-left">
         <p>lat: {lngLat.lat}</p>
         <p>lng: {lngLat.lng}</p>
       </Popup>

diff --git a/src/components/Popup/index.md b/src/components/Popup/index.md
@@ -1,5 +1,6 @@
 ---
 toc: content
+order: 2
 group:
   title: 分析组件
   order: 3

diff --git a/src/components/Popup/types.ts b/src/components/Popup/types.ts
@@ -1,4 +1,5 @@
-import type { anchorType, ILngLat } from '@antv/l7';
+import type { ILngLat } from '@antv/l7';
+import type { AnchorType } from '../Marker/types';
 
 /**
  * 组件类型定义
@@ -9,7 +10,7 @@ export interface PopupProps {
   /** 锚点相对位置，支持 'center', 'top', 'bottom', 'left', 'right', 'top-left', 'top-right', 'bottom-left', 'bottom-right'
    * @default "bottom"
    */
-  anchor?: anchorType;
+  anchor?: AnchorType;
   /** 偏移量 [0, 0] 分别表示 X, Y 的偏移量，单位为像素。
    * @default [0, 0]
    */

diff --git a/src/components/Scale/index.md b/src/components/Scale/index.md
@@ -1,5 +1,6 @@
 ---
 toc: content
+order: 1
 group:
   title: 控件组件
   order: 2

diff --git a/src/components/Template/index.md b/src/components/Template/index.md
@@ -1,5 +1,6 @@
 ---
 toc: content
+order: 3
 group:
   title: 分析组件
   order: 3

diff --git a/src/components/Zoom/index.md b/src/components/Zoom/index.md
@@ -1,5 +1,6 @@
 ---
 toc: content
+order: 2
 group:
   title: 控件组件
   order: 2