fix: change by review

Author: chilingling

packages/common/js/preview.js

@@ -98,7 +98,7 @@ const sendSchemaUpdate = (data) => {
       type: 'schema',
       data
     },
-    '*'
+    previewWindow.origin || window.location.origin
   )
 }
 
@@ -166,8 +166,10 @@ export const setupSchemaChangeListener = () => {
 // 监听来自预览页面的消息
 const setupMessageListener = () => {
   window.addEventListener('message', async (event) => {
+    const parsedOrigin = new URL(event.origin)
+    const parsedHost = new URL(window.location.href)
     // 确保消息来源安全
-    if (event.origin === window.location.origin || event.origin.includes(window.location.hostname)) {
+    if (parsedOrigin.origin === parsedHost.origin || parsedOrigin.host === parsedHost.host) {
       const { event: eventType, source } = event.data || {}
       // 通过 heartbeat 消息来重新建立连接，避免刷新页面后 previewWindow 为 null
       if (source === 'preview' && eventType === 'connect' && !previewWindow) {
@@ -211,8 +213,11 @@ const handleHistoryPreview = (params, url) => {
               styles
             })
           },
-          '*'
+          previewWindow.origin || window.location.origin
         )
+
+        // 历史页面不需要实时更新预览，发送完消息后移除监听
+        window.removeEventListener('message', handlePreviewReady)
       }
     }
   }

packages/design-core/src/preview/src/preview/usePreviewCommunication.ts

@@ -8,7 +8,10 @@ let onSchemaReceivedAction: PreviewCommunicationOptions['onSchemaReceived'] | nu
 let previewChannel: BroadcastChannel | null = null
 
 const handleMessage = async (event: MessageEvent) => {
-  if (event.origin === window.location.origin || event.origin.includes(window.location.hostname)) {
+  const parsedOrigin = new URL(event.origin)
+  const parsedHost = new URL(window.location.href)
+
+  if (parsedOrigin.origin === parsedHost.origin || parsedOrigin.host === parsedHost.host) {
     const { type, data, source } = event.data || {}
 
     if (source === 'designer' && type === 'schema' && data && onSchemaReceivedAction) {
@@ -21,7 +24,7 @@ const handleBroadcastMessage = async (event: MessageEvent) => {
   const { event: eventType, source } = event.data || {}
   // 初始化了，重新建立连接
   if (source === 'designer' && eventType === 'connect' && window.opener) {
-    window.opener.postMessage({ event: 'connect', source: 'preview' }, '*')
+    window.opener.postMessage({ event: 'connect', source: 'preview' }, window.opener.origin || window.location.origin)
   }
 }
 
@@ -31,13 +34,22 @@ const sendReadyMessage = () => {
   // 尝试获取父窗口引用
   const opener = window.opener
 
-  if (opener) {
-    opener.postMessage({ event: 'onMounted', source: 'preview' }, '*')
-  } else {
+  const fallbackHandler = () => {
     const logger = console
     logger.warn('无法获取主窗口引用，将使用 URL 参数初始化预览')
     loadInitialData?.()
   }
+
+  if (opener) {
+    try {
+      opener.postMessage({ event: 'onMounted', source: 'preview' }, opener.origin || window.location.origin)
+    } catch (error) {
+      fallbackHandler()
+    }
+    return
+  }
+
+  fallbackHandler()
 }
 
 const cleanupCommunication = () => {

packages/design-core/src/preview/src/preview/usePreviewData.ts

@@ -102,7 +102,7 @@ const getPageOrBlockByApi = async (): Promise<{ currentPage: IPage | null; ances
   const history = searchParams.get('history')
 
   if (pageId) {
-    let ancestors = await getPageRecursively(pageId)
+    let ancestors = (await getPageRecursively(pageId)).reverse()
     let currentPage = await getPageById(pageId)
     if (history) {
       const historyList: IPage[] = await fetchPageHistory(pageId)

packages/plugins/page/src/composable/usePage.ts

@@ -502,12 +502,12 @@ const handlePageDetail = async (pages: any[]) => {
   }
 }
 
-const getFamily = async (previewParams: { id: string }) => {
+const getFamily = async (currentPage: { id: string }) => {
   if (pageSettingState.pages.length === 0) {
     await getPageList()
   }
 
-  const familyPages = getAncestorsRecursively(previewParams.id)
+  const familyPages = getAncestorsRecursively(currentPage.id)
     .filter((item) => item.isPage)
     .reverse()
     .map((item) => ({
@@ -526,7 +526,7 @@ const getFamily = async (previewParams: { id: string }) => {
 
   await handlePageDetail(familyPages)
 
-  updatePageContent(familyPages, previewParams)
+  updatePageContent(familyPages, currentPage)
 
   return familyPages
 }