@rpascene/shared 0.30.13 → 0.30.14

package/src/extractor/web-extractor.ts

@@ -322,12 +322,10 @@ export async function extractTreeNode(
   initNode: globalThis.Node,
   debugMode: boolean = false,
   basePoint: Point = { left: 0, top: 0 },
-  baseZoom: number = 1,
-  containerPaths: any[] = []
+  baseZoom: number = 1
 ): Promise<WebElementNode> {
   setDebugMode(debugMode);
   indexId = 0;
-  let containerPathClone = [...containerPaths]
   const topDocument = getTopDocument();
   const startNode = initNode || topDocument;
   const topChildren: WebElementNode[] = [];
@@ -358,11 +356,6 @@ export async function extractTreeNode(
       false
     );
 
-    if (elementInfo) {
-      const allPaths = getLocators(node);
-      elementInfo.allPaths = allPaths;
-      elementInfo.containerPaths = containerPathClone;
-    }
     if (node instanceof currentWindow.HTMLIFrameElement) {
       if (
         (node as HTMLIFrameElement).contentWindow &&
@@ -449,51 +442,25 @@ export async function extractTreeNode(
     for (let i = 0; i < iframes.length; i++) {
       const iframe = iframes[i];
       const iframeInfo = collectElementInfo(iframe, window, document, 1);
-      const baseZoom = getCssScale(iframe).cssScaleX;
-      const containerPath = getContainerPath(iframe);
-      containerPathClone = containerPathClone.concat(containerPath)
+      // 这里不再生成containerPath
+       const baseZoom = getCssScale(iframe).cssScaleX;
       if (iframeInfo) {
-        if (iframe.contentDocument && iframe.contentWindow) {
-          console.log('iframe同域')
-          // when the iframe is in the viewport, we need to collect its children
-          const iframeChildren = dfs(
-            iframe.contentDocument.body,
-            iframe.contentWindow as any,
-            iframe.contentDocument,
-            baseZoom,
-            {
+        const iframeChildren = await postWindowMessage(iframe.contentWindow, window, {
+          action: 'extractTreeNode',
+          data: {
+            basePoint: {
               left: iframeInfo.rect.left,
               top: iframeInfo.rect.top,
             },
-          );
-          if (Array.isArray(iframeChildren)) {
-            topChildren.push(...iframeChildren);
-          } else if (iframeChildren) {
-            topChildren.push(iframeChildren);
-          }
-        } else {
-          console.log(iframeInfo, 'iframe跨域了')
-
-          // 跨域了,请求获取tree
-          const iframeChildren = await postWindowMessage(iframe.contentWindow, window, {
-            action: 'extractTreeNode',
-            data: {
-              basePoint: {
-                left: iframeInfo.rect.left,
-                top: iframeInfo.rect.top,
-              },
-              baseZoom,
-              containerPaths: containerPathClone
-            },
-          })
-          if (Array.isArray(iframeChildren)) {
-            topChildren.push(...iframeChildren);
-          } else if (iframeChildren) {
-            topChildren.push(iframeChildren);
-          }
+            baseZoom,
+          },
+        })
+        if (Array.isArray(iframeChildren)) {
+          topChildren.push(...iframeChildren);
+        } else if (iframeChildren) {
+          topChildren.push(iframeChildren);
         }
       }
-
     }
   }
 
@@ -548,7 +515,7 @@ if (typeof window !== 'undefined') {
     if (action === 'extractTreeNode') {
       // @ts-ignore
       try {
-        return await extractTreeNode(document.body, false, data.basePoint, data.baseZoom, data.containerPaths)
+        return await extractTreeNode(document.body, false, data.basePoint, data.baseZoom)
       } catch (error) {
         return {
           error: 'error message'