From 94b6c2f339b1e9c1ca6c652df8e1377b61a576fa Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Sun, 27 Nov 2022 18:02:34 +0800
Subject: [PATCH] =?UTF-8?q?3.0.15=E7=BB=A7=E7=BB=AD=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8D=E7=A8=B3=E5=AE=9A=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/chromium_base.py | 49 +++++++++++++++++++++++++----------
 setup.py                      |  2 +-
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/DrissionPage/chromium_base.py b/DrissionPage/chromium_base.py
index e9d5a9c..348607b 100644
--- a/DrissionPage/chromium_base.py
+++ b/DrissionPage/chromium_base.py
@@ -72,9 +72,11 @@ class ChromiumBase(BasePage):
         self._tab_obj.DOM.enable()
         self._tab_obj.Page.enable()
 
+        self._tab_obj.Page.frameStoppedLoading = self._onFrameStoppedLoading
+        self._tab_obj.Page.frameStartedLoading = self._onFrameStartedLoading
         self._tab_obj.DOM.documentUpdated = self._onDocumentUpdated
         self._tab_obj.Page.loadEventFired = self._onLoadEventFired
-        # self._tab_obj.Page.frameNavigated = self._onFrameNavigated
+        self._tab_obj.Page.frameNavigated = self._onFrameNavigated
 
     def _get_document(self) -> None:
         """刷新cdp使用的document数据"""
@@ -113,25 +115,47 @@ class ChromiumBase(BasePage):
         self.stop_loading()
         return False
 
+    def _onFrameStartedLoading(self, **kwargs):
+        """页面跳转时触发"""
+        # print('FrameStartedLoading')
+        if kwargs['frameId'] == self.tab_id:
+            self._is_loading = True
+            if self._debug:
+                print('FrameStartedLoading')
+
+    def _onFrameStoppedLoading(self, **kwargs):
+        """页面跳转时触发"""
+        # print('FrameStoppedLoading')
+        if kwargs['frameId'] == self.tab_id and self._first_run is False and self._is_loading:
+            if self._debug:
+                print('FrameStoppedLoading')
+            self._get_document()
+
     def _onLoadEventFired(self, **kwargs):
         """在页面刷新、变化后重新读取页面内容"""
-        if self._first_run is False and self._is_loading:
-            if self._debug:
-                print('loadEventFired')
-            self._get_document()
+        if self._debug:
+            print('loadEventFired')
+        # if self._first_run is False and self._is_loading:
+        #     if self._debug:
+        #         print('loadEventFired')
+        #     self._get_document()
 
     def _onDocumentUpdated(self, **kwargs):
         """页面跳转时触发"""
-        self._is_loading = True
         if self._debug:
             print('docUpdated')
+        # self._is_loading = True
+        # if self._debug:
+        #     print('docUpdated')
 
-    # def _onFrameNavigated(self, **kwargs):
-    #     """页面跳转时触发"""
-    #     if not kwargs['frame'].get('parentId', None):
-    #         self._is_loading = True
-    #         if self._debug:
-    #             print('nav')
+    def _onFrameNavigated(self, **kwargs):
+        """页面跳转时触发"""
+        if self._debug:
+            print('nav')
+        # if not kwargs['frame'].get('parentId', None):
+        #     self._is_loading = True
+        #     if self._debug:
+        #         print('nav')
 
     def _set_options(self) -> None:
         pass
@@ -588,7 +612,6 @@ class ChromiumBase(BasePage):
         if err:
             if show_errmsg:
                 raise err if err is not None else ConnectionError('连接异常。')
-            self._get_document()
 
         return False if err else True
 
diff --git a/setup.py b/setup.py
index 7ceb6d8..14eea8b 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setup(
     name="DrissionPage",
-    version="3.0.14",
+    version="3.0.15",
     author="g1879",
     author_email="g1879@qq.com",
     description="A module that integrates selenium and requests session, encapsulates common page operations.",