Merge remote-tracking branch 'origin/master'

DrissionPage/chromium_base.py

@@ -335,6 +335,11 @@ class ChromiumBase(BasePage):
         """返回页面加载策略，有3种：'none'、'normal'、'eager'"""
         return self._page_load_strategy
 
+    @property
+    def user_agent(self):
+        """返回user agent"""
+        return self.run_cdp('Runtime.evaluate', expression='navigator.userAgent;')['result']['value']
+
     @property
     def scroll(self):
         """返回用于滚动滚动条的对象"""
@@ -1075,10 +1080,10 @@ class ChromiumPageScroll(ChromiumScroll):
         self.t1 = 'window'
         self.t2 = 'document.documentElement'
 
-    def to_see(self, loc_or_ele, center=False):
+    def to_see(self, loc_or_ele, center=None):
         """滚动页面直到元素可见
         :param loc_or_ele: 元素的定位信息，可以是loc元组，或查询字符串
-        :param center: 是否尽量滚动到页面正中
+        :param center: 是否尽量滚动到页面正中，为None时如果被遮挡，则滚动到页面正中
         :return: None
         """
         ele = self._driver._ele(loc_or_ele)
@@ -1087,17 +1092,22 @@ class ChromiumPageScroll(ChromiumScroll):
     def _to_see(self, ele, center):
         """执行滚动页面直到元素可见
         :param ele: 元素对象
-        :param center: 是否尽量滚动到页面正中
+        :param center: 是否尽量滚动到页面正中，为None时如果被遮挡，则滚动到页面正中
         :return: None
         """
-        if center:
+        txt = 'true' if center else 'false'
-            ele.run_js('this.scrollIntoViewIfNeeded();')
+        ele.run_js(f'this.scrollIntoViewIfNeeded({txt});')
-            self._wait_scrolled()
+        if center or (center is not False and ele.states.is_covered):
-            return
+            ele.run_js('''function getWindowScrollTop() {var scroll_top = 0;
-
+                    if (document.documentElement && document.documentElement.scrollTop) {
-        ele.run_js('this.scrollIntoViewIfNeeded(false);')
+                      scroll_top = document.documentElement.scrollTop;
-        if ele.states.is_covered:
+                    } else if (document.body) {scroll_top = document.body.scrollTop;}
-            ele.run_js('this.scrollIntoViewIfNeeded();')
+                    return scroll_top;}
+            const { top, height } = this.getBoundingClientRect();
+                    const elCenter = top + height / 2;
+                    const center = window.innerHeight / 2;
+                    window.scrollTo({top: getWindowScrollTop() - (center - elCenter),
+                    behavior: 'instant'});''')
         self._wait_scrolled()
 
 

DrissionPage/chromium_base.pyi

@@ -115,6 +115,9 @@ class ChromiumBase(BasePage):
     @property
     def page_load_strategy(self) -> str: ...
 
+    @property
+    def user_agent(self) -> str: ...
+
     @property
     def scroll(self) -> ChromiumPageScroll: ...
 
@@ -244,9 +247,9 @@ class ChromiumBaseWaiter(object):
 class ChromiumPageScroll(ChromiumScroll):
     def __init__(self, page: ChromiumBase): ...
 
-    def to_see(self, loc_or_ele: Union[str, tuple, ChromiumElement], center: bool = False) -> None: ...
+    def to_see(self, loc_or_ele: Union[str, tuple, ChromiumElement], center: Union[bool, None] = None) -> None: ...
 
-    def _to_see(self, ele: ChromiumElement, center: bool) -> None: ...
+    def _to_see(self, ele: ChromiumElement, center: Union[bool, None]) -> None: ...
 
 
 class ChromiumBaseSetter(object):

DrissionPage/chromium_element.py

@@ -1771,9 +1771,9 @@ class ChromiumScroll(object):
 
 
 class ChromiumElementScroll(ChromiumScroll):
-    def to_see(self, center=False):
+    def to_see(self, center=None):
         """滚动页面直到元素可见
-        :param center: 是否尽量滚动到页面正中
+        :param center: 是否尽量滚动到页面正中，为None时如果被遮挡，则滚动到页面正中
         :return: None
         """
         self._driver.page.scroll.to_see(self._driver, center=center)

DrissionPage/chromium_element.pyi

@@ -496,7 +496,7 @@ class ChromiumScroll(object):
 
 class ChromiumElementScroll(ChromiumScroll):
 
-    def to_see(self, center: bool = False) -> None: ...
+    def to_see(self, center: Union[bool, None] = None) -> None: ...
 
 
 class ChromiumSelect(object):

DrissionPage/chromium_frame.py

@@ -640,10 +640,10 @@ class ChromiumFrameScroll(ChromiumPageScroll):
         self.t1 = self.t2 = 'this.documentElement'
         self._wait_complete = False
 
-    def to_see(self, loc_or_ele, center=False):
+    def to_see(self, loc_or_ele, center=None):
         """滚动页面直到元素可见
         :param loc_or_ele: 元素的定位信息，可以是loc元组，或查询字符串
-        :param center: 是否尽量滚动到页面正中
+        :param center: 是否尽量滚动到页面正中，为None时如果被遮挡，则滚动到页面正中
         :return: None
         """
         ele = loc_or_ele if isinstance(loc_or_ele, ChromiumElement) else self._driver._ele(loc_or_ele)

DrissionPage/chromium_frame.pyi

@@ -203,7 +203,7 @@ class ChromiumFrameIds(object):
 class ChromiumFrameScroll(ChromiumPageScroll):
     def __init__(self, frame: ChromiumFrame) -> None: ...
 
-    def to_see(self, loc_or_ele: Union[str, tuple, ChromiumElement], center: bool = False) -> None: ...
+    def to_see(self, loc_or_ele: Union[str, tuple, ChromiumElement], center: Union[None, bool] = None) -> None: ...
 
 
 class ChromiumFrameSetter(ChromiumBaseSetter):

DrissionPage/chromium_tab.py

@@ -124,6 +124,14 @@ class WebPageTab(SessionPage, ChromiumTab):
         """以dict方式返回cookies"""
         return super().cookies
 
+    @property
+    def user_agent(self):
+        """返回user agent"""
+        if self._mode == 's':
+            return super().user_agent
+        elif self._mode == 'd':
+            return super(SessionPage, self).user_agent
+
     @property
     def session(self):
         """返回Session对象，如未初始化则按配置信息创建"""

DrissionPage/chromium_tab.pyi

@@ -67,6 +67,9 @@ class WebPageTab(SessionPage, ChromiumTab):
     @property
     def cookies(self) -> dict: ...
 
+    @property
+    def user_agent(self) -> str: ...
+
     @property
     def session(self) -> Session: ...
 

DrissionPage/session_page.py

@@ -98,6 +98,11 @@ class SessionPage(BasePage):
         except Exception:
             return None
 
+    @property
+    def user_agent(self):
+        """返回user agent"""
+        return self.session.headers.get('user-agent', '')
+
     @property
     def download_path(self):
         """返回下载路径"""

DrissionPage/session_page.pyi

@@ -60,6 +60,9 @@ class SessionPage(BasePage):
     @property
     def json(self) -> Union[dict, None]: ...
 
+    @property
+    def user_agent(self) -> str: ...
+
     @property
     def download_path(self) -> str: ...
 

DrissionPage/web_page.py

@@ -182,6 +182,14 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
         """以dict方式返回cookies"""
         return super().cookies
 
+    @property
+    def user_agent(self):
+        """返回user agent"""
+        if self._mode == 's':
+            return super().user_agent
+        elif self._mode == 'd':
+            return super(SessionPage, self).user_agent
+
     @property
     def session(self):
         """返回Session对象，如未初始化则按配置信息创建"""
@@ -339,8 +347,8 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
             return
 
         if copy_user_agent:
-            selenium_user_agent = self.run_cdp('Runtime.evaluate', expression='navigator.userAgent;')['result']['value']
+            user_agent = self.run_cdp('Runtime.evaluate', expression='navigator.userAgent;')['result']['value']
-            self.session.headers.update({"User-Agent": selenium_user_agent})
+            self.session.headers.update({"User-Agent": user_agent})
 
         set_session_cookies(self.session, self._get_driver_cookies())
 

DrissionPage/web_page.pyi

@@ -66,6 +66,9 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
     @property
     def cookies(self) -> dict: ...
 
+    @property
+    def user_agent(self) -> str: ...
+
     @property
     def session(self) -> Session: ...