Merge branch 'master' of http://xny.yj-3d.com:3000/zh/sdk4.0_new

src/Global/FlyRoam/index.js

@@ -322,11 +322,12 @@ const close = () => {
   //   _DialogObject = null
   // }
   let contentElm = document.getElementsByClassName('fly-roam')[0]
-
-  let tableBody = contentElm.getElementsByClassName('table-body')[0];
-  let trList = tableBody.getElementsByClassName('tr')
-  for (let i = trList.length - 1; i >= 0; i--) {
-    tableBody.removeChild(trList[i])
+  if(contentElm) {
+    let tableBody = contentElm.getElementsByClassName('table-body')[0];
+    let trList = tableBody.getElementsByClassName('tr')
+    for (let i = trList.length - 1; i >= 0; i--) {
+      tableBody.removeChild(trList[i])
+    }
   }
 
   repeat = 0

src/Global/MapX/index.js

@@ -166,5 +166,15 @@ function close(sdk) {
   }
   sdk.viewer.scene.preRender.removeEventListener(syncViewer, syncObject)
 }
+function destroy(sdk) {
+  if (mapx.viewer) {
+    if (mapx.viewer.entities) {
+      mapx.viewer.entities.removeAll()
+    }
+    mapx.viewer.destroy && mapx.viewer.destroy()
+  }
+  mapx = {}
+  sdk.viewer.scene.preRender.removeEventListener(syncViewer, syncObject)
+}
 
-export { open, close }
+export { open, close, destroy }