xzw 2 年之前
父節點
當前提交
d142634ad7
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      src/custom/utils/Common.js
  2. 1 1
      src/custom/viewer/ViewerNew.js

+ 3 - 3
src/custom/utils/Common.js

@@ -427,12 +427,12 @@ var Common = {
         
     }, 
         
-    getRootWindow(){
+    getRootWindow(){//获取包含Potree的根window
         let win = window
-        while(win.parent!=win){
+        while(win.parent!=win && win.parent.Potree){
             win = win.parent
         }
-        return win
+        if(window != win)return win
     },
     
     

+ 1 - 1
src/custom/viewer/ViewerNew.js

@@ -88,7 +88,7 @@ let shelterHistory = []
 Potree.isIframeChild = window.parent!=window  //子页面
 if(Potree.isIframeChild){ 
     let rootWin = Common.getRootWindow() 
-    rootWin.viewer.dispatchEvent({type:'createIframe', window}) //给祖先页面发送信息
+    rootWin && rootWin.viewer.dispatchEvent({type:'createIframe', window}) //给祖先页面发送信息
 } 
 /* window.addEventListener('focus',()=>{
     console.log('focus',window.winIndex)