fix: does not work properly on the mars3d platform

zouyaoji · Aug 12, 2022 · da89520 · da89520
1 parent 6eeec48
commit da89520
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -6,8 +6,9 @@ _2022-08-12_
 
 #### Bug 修复
 
-- Fix some incorrect types definitions.
-- Fix the problem of failing to get viewer through useVueCesium.
+- Fixed some incorrect types definitions.
+- Fixed the problem that failing to get viewer through useVueCesium.
+- Fixed the problem that the vc-overview-map component does not work properly on the mars3d platform.
 
 ### 3.0.16
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -8,6 +8,7 @@ _2022-08-12_
 
 - 修复部分 types 定义不正确的问题。
 - 修复非子组件情况下通过 useVueCesium 获取 viewer 失败的问题。
+- 修复在 mars3d 平台鹰眼组件不正常问题。
 
 ### 3.0.16
 

diff --git a/packages/components/controls/vc-overview-map/index.ts b/packages/components/controls/vc-overview-map/index.ts
@@ -113,7 +113,8 @@ export default defineComponent({
         {
           removeCesiumScript: false,
           showCredit: false,
-          sceneMode: 2
+          sceneMode: 2,
+          containerId: 'vc-overview-map'
         },
         props.viewerOpts
       )

diff --git a/packages/components/viewer/src/useViewer.ts b/packages/components/viewer/src/useViewer.ts
@@ -726,7 +726,10 @@ export default function (props: VcViewerProps, ctx, vcInstance: VcComponentInter
       viewer = props.viewerCreator(vcInstance, $(viewerRef), options)
     } else {
       if (globalThis.mars3d) {
-        vcInstance.map = new mars3d.Map($(viewerRef).id, options)
+        vcInstance.map = new mars3d.Map($(viewerRef).id, {
+          scene: options,
+          control: options
+        })
         viewer = vcInstance.map?._viewer
       } else if (globalThis.DC) {
         vcInstance.dcViewer = new DC.Viewer($(viewerRef).id, options)

diff --git a/website/docs/zh-CN/platforms/vc-demo-mars3d.md b/website/docs/zh-CN/platforms/vc-demo-mars3d.md
@@ -32,7 +32,7 @@ app.mount('#app')
 <el-row ref="viewerContainer" class="demo-viewer">
   <vc-viewer
     ref="vcViewer"
-    :mars3d-config="mars3dConfig"
+    :mars3d-config="viewerOpts.mars3dConfig"
     :animation="animation"
     :timeline="timeline"
     :fullscreenButton="fullscreenButton"
@@ -53,6 +53,16 @@ app.mount('#app')
     <vc-layer-imagery :sort-order="10">
       <vc-imagery-provider-tianditu map-style="img_c" token="436ce7e50d27eede2f2929307e6b33c0"></vc-imagery-provider-tianditu>
     </vc-layer-imagery>
+    <vc-overview-map ref="overview" :viewerOpts="viewerOpts" :offset="[5, 120]" position="bottom-left">
+      <!-- 天地图注记 -->
+      <vc-layer-imagery :sort-order="20">
+        <vc-imagery-provider-tianditu map-style="cva_c" token="436ce7e50d27eede2f2929307e6b33c0"></vc-imagery-provider-tianditu>
+      </vc-layer-imagery>
+      <!-- 天地图影像 -->
+      <vc-layer-imagery :sort-order="10">
+        <vc-imagery-provider-tianditu map-style="img_c" token="436ce7e50d27eede2f2929307e6b33c0"></vc-imagery-provider-tianditu>
+      </vc-layer-imagery>
+    </vc-overview-map>
   </vc-viewer>
   <el-row class="demo-toolbar">
     <el-row>
@@ -85,8 +95,10 @@ app.mount('#app')
           offset: [0, 32],
           position: 'bottom-right'
         },
-        mars3dConfig: {
-          include: 'mars3d'
+        viewerOpts: {
+          mars3dConfig: {
+            include: 'mars3d'
+          }
         }
       }
     },