blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

改进滚动到元素或坐标功能

Browse Source
This commit is contained in:
g1879 2023-01-10 16:48:07 +08:00
parent 568a2a3444
commit 9ddbe27b6c
7 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DrissionPage/action_chains.py
View File

@ -37,6 +37,7 @@ class ActionChains:
ly = ele_or_loc[1] + offset_y
elif isinstance(ele_or_loc, str) or 'ChromiumElement' in str(type(ele_or_loc)):
ele_or_loc = self.page(ele_or_loc)
self.page.scroll_to_see(ele_or_loc)
x, y = ele_or_loc.location if offset_x or offset_y else ele_or_loc.midpoint
lx = x + offset_x
ly = y + offset_y
@ -44,7 +45,7 @@ class ActionChains:
raise TypeError('ele_or_loc参数只能接受坐标(x, y)或ChromiumElement对象。')
if not location_in_viewport(self.page, lx, ly):
# 把元素滚动到页面中间
# 把坐标滚动到页面中间
clientWidth = self.page.run_js('return document.body.clientWidth;')
clientHeight = self.page.run_js('return document.body.clientHeight;')
self.page.scroll.to_location(lx - clientWidth // 2, ly - clientHeight // 2)

8
DrissionPage/chromium_base.py
View File

@ -10,7 +10,7 @@ from requests import Session
from .base import BasePage
from .chromium_element import ChromiumElementWaiter, ChromiumScroll, ChromiumElement, run_js, make_chromium_ele
from .common import get_loc
from .common import get_loc, offset_scroll
from .config import cookies_to_tuple
from .session_element import make_session_ele
from .chromium_driver import ChromiumDriver
@ -459,12 +459,16 @@ class ChromiumBase(BasePage):
:param loc_or_ele: 元素的定位信息，可以是loc元组，或查询字符串（详见ele函数注释）
:return: None
"""
node_id = self.ele(loc_or_ele).node_id
ele = self.ele(loc_or_ele)
node_id = ele.node_id
try:
self._wait_driver.DOM.scrollIntoViewIfNeeded(nodeId=node_id)
except Exception:
self.ele(loc_or_ele).run_js("this.scrollIntoView();")
if not ele.is_in_viewport:
offset_scroll(ele, 0, 0)
def refresh(self, ignore_cache=False):
"""刷新当前页面 \n
:param ignore_cache: 是否忽略缓存

44
DrissionPage/chromium_element.py
View File

@ -9,7 +9,8 @@ from pathlib import Path
from time import perf_counter, sleep
from .base import DrissionElement, BaseElement
from .common import make_absolute_link, get_loc, get_ele_txt, format_html, is_js_func, location_in_viewport
from .common import make_absolute_link, get_loc, get_ele_txt, format_html, is_js_func, location_in_viewport, \
offset_scroll
from .keys import _keys_to_typing, _keyDescriptionForString, _keyDefinitions
from .session_element import make_session_ele
@ -318,7 +319,7 @@ class ChromiumElement(DrissionElement):
@property
def is_in_viewport(self):
"""返回元素是否出现在视口中，以元素可以接受点击的点为判断"""
x, y = self.location
x, y = self._click_point
return location_in_viewport(self.page, x, y) if x else False
def attr(self, attr):
@ -648,7 +649,8 @@ class ChromiumElement(DrissionElement):
:param button: 左键还是右键
:return: None
"""
x, y = _offset_scroll(self, offset_x, offset_y)
self.page.scroll_to_see(self)
x, y = offset_scroll(self, offset_x, offset_y)
self._click(x, y, button)
def r_click(self):
@ -657,12 +659,6 @@ class ChromiumElement(DrissionElement):
x, y = self._client_click_point
self._click(x, y, 'right')
def m_click(self):
"""中键单击"""
self.page.scroll_to_see(self)
x, y = self._client_click_point
self._click(x, y, 'middle')
def r_click_at(self, offset_x=None, offset_y=None):
"""带偏移量右键单击本元素，相对于左上角坐标。不传入x或y值时点击元素中点 \n
:param offset_x: 相对元素左上角坐标的x轴偏移量
@ -671,6 +667,12 @@ class ChromiumElement(DrissionElement):
"""
self.click_at(offset_x, offset_y, 'right')
def m_click(self):
"""中键单击"""
self.page.scroll_to_see(self)
x, y = self._client_click_point
self._click(x, y, 'middle')
def _click(self, client_x, client_y, button='left'):
"""实施点击 \n
:param client_x: 视口中的x坐标
@ -689,7 +691,8 @@ class ChromiumElement(DrissionElement):
:param offset_y: 相对元素左上角坐标的y轴偏移量
:return: None
"""
x, y = _offset_scroll(self, offset_x, offset_y)
self.page.scroll_to_see(self)
x, y = offset_scroll(self, offset_x, offset_y)
self.page.driver.Input.dispatchMouseEvent(type='mouseMoved', x=x, y=y)
def drag(self, offset_x=0, offset_y=0, speed=40, shake=True):
@ -1389,27 +1392,6 @@ def _send_key(ele, modifier, key):
ele.page.driver.Input.dispatchKeyEvent(**data)
def _offset_scroll(ele, offset_x, offset_y):
"""接收元素及偏移坐标，滚动到偏移坐标，返回该点在视口中的坐标
:param ele: 元素对象
:param offset_x: 偏移量x
:param offset_y: 偏移量y
:return: 视口中的坐标
"""
loc_x, loc_y = ele.location
cp_x, cp_y = ele._click_point
lx = loc_x + offset_x if offset_x else cp_x
ly = loc_y + offset_y if offset_y else cp_y
if not location_in_viewport(ele.page, lx, ly):
ele.page.scroll.to_location(lx, ly)
cl_x, cl_y = ele.client_location
ccp_x, ccp_y = ele._client_click_point
cx = cl_x + offset_x if offset_x else ccp_x
cy = cl_y + offset_y if offset_y else ccp_y
return cx, cy
class ChromiumScroll(object):
"""用于滚动的对象"""

7
DrissionPage/chromium_element.pyi
View File

@ -216,10 +216,10 @@ class ChromiumElement(DrissionElement):
def r_click(self) -> None: ...
def m_click(self) -> None: ...
def r_click_at(self, offset_x: Union[int, str] = None, offset_y: Union[int, str] = None) -> None: ...
def m_click(self) -> None: ...
def _click(self, client_x: int, client_y: int, button: str = 'left') -> None: ...
def hover(self, offset_x: int = None, offset_y: int = None) -> None: ...
@ -379,9 +379,6 @@ def _send_enter(ele: ChromiumElement) -> None: ...
def _send_key(ele: ChromiumElement, modifier: int, key: str) -> None: ...
def _offset_scroll(ele: ChromiumElement, offset_x: int, offset_y: int) -> tuple: ...
class ChromiumScroll(object):
def __init__(self, page_or_ele: Union[ChromiumBase, ChromiumElement]):

34
DrissionPage/common.py
View File

@ -667,9 +667,35 @@ def location_in_viewport(page, loc_x, loc_y):
:return:
"""
js = f'''function(){{var x = {loc_x}; var y = {loc_y};
const vWidth = window.innerWidth || document.documentElement.clientWidth
const vHeight = window.innerHeight || document.documentElement.clientHeight
if (x< document.documentElement.scrollLeft || y < document.documentElement.scrollTop
|| x > vWidth || y > vHeight){{return false;}}
const scrollLeft = document.documentElement.scrollLeft;
const scrollTop = document.documentElement.scrollTop;
const vWidth = document.documentElement.clientWidth;
const vHeight = document.documentElement.clientHeight;
if (x< scrollLeft || y < scrollTop || x > vWidth + scrollLeft || y > vHeight + scrollTop){{return false;}}
return true;}}'''
return page.run_js(js)
# const vWidth = window.innerWidth || document.documentElement.clientWidth;
# const vHeight = window.innerHeight || document.documentElement.clientHeight;
def offset_scroll(ele, offset_x, offset_y):
"""接收元素及偏移坐标，把坐标滚动到页面中间，返回该点在视口中的坐标 \n
有偏移量时以元素左上角坐标为基准，没有时以_click_point为基准
:param ele: 元素对象
:param offset_x: 偏移量x
:param offset_y: 偏移量y
:return: 视口中的坐标
"""
loc_x, loc_y = ele.location
cp_x, cp_y = ele._click_point
lx = loc_x + offset_x if offset_x else cp_x
ly = loc_y + offset_y if offset_y else cp_y
if not location_in_viewport(ele.page, lx, ly):
clientWidth = ele.page.run_js('return document.body.clientWidth;')
clientHeight = ele.page.run_js('return document.body.clientHeight;')
ele.page.scroll.to_location(lx - clientWidth // 2, ly - clientHeight // 2)
cl_x, cl_y = ele.client_location
ccp_x, ccp_y = ele._client_click_point
cx = cl_x + offset_x if offset_x else ccp_x
cy = cl_y + offset_y if offset_y else ccp_y
return cx, cy

4
DrissionPage/common.pyi
View File

@ -8,6 +8,7 @@ from typing import Union
from requests import get as requests_get
from .base import BasePage, DrissionElement
from .chromium_element import ChromiumElement
from .config import DriverOptions
@ -57,3 +58,6 @@ def connect_browser(option: DriverOptions) -> tuple: ...
def location_in_viewport(page, loc_x: int, loc_y: int) -> bool: ...
def offset_scroll(ele: ChromiumElement, offset_x: int, offset_y: int) -> tuple: ...

2
docs/启动配置/使用配置文件.md
View File

@ -32,7 +32,7 @@ arguments = [
'--no-sandbox',
; 谷歌文档提到需要加上这个属性来规避bug
'--disable-gpu',
; 忽略警告
; 忽略链接不安全页面提示
'--ignore-certificate-errors',
; 不显示信息栏
'--disable-infobars',