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

drag()和drag_to()方法sleep参数改为duration

Browse Source
This commit is contained in:
g1879 2023-03-17 10:45:59 +08:00
parent f18cce750e
commit 29b6e78311
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
DrissionPage/chromium_element.py
View File

@ -548,22 +548,22 @@ class ChromiumElement(DrissionElement):
x, y = offset_scroll(self, offset_x, offset_y)
self.page.run_cdp('Input.dispatchMouseEvent', type='mouseMoved', x=x, y=y)
def drag(self, offset_x=0, offset_y=0, speed=40):
def drag(self, offset_x=0, offset_y=0, duration=.5):
"""拖拽当前元素到相对位置
:param offset_x: x变化值
:param offset_y: y变化值
:param speed: 拖动的速度，传入0即瞬间到达
:param duration: 拖动用时，传入0即瞬间到j达
:return: None
"""
curr_x, curr_y = self.locations.midpoint
offset_x += curr_x
offset_y += curr_y
self.drag_to((offset_x, offset_y), speed)
self.drag_to((offset_x, offset_y), duration)
def drag_to(self, ele_or_loc, speed=40):
def drag_to(self, ele_or_loc, duration=.5):
"""拖拽当前元素，目标为另一个元素或坐标元组(x, y)
:param ele_or_loc: 另一个元素或坐标元组，坐标为元素中点的坐标
:param speed: 拖动的速度，传入0即瞬间到达
:param duration: 拖动用时，传入0即瞬间到j达
:return: None
"""
# x, y：目标点坐标
@ -577,7 +577,9 @@ class ChromiumElement(DrissionElement):
current_x, current_y = self.locations.midpoint
width = target_x - current_x
height = target_y - current_y
num = 0 if not speed else int(((abs(width) ** 2 + abs(height) ** 2) ** .5) // speed)
duration = .02 if duration < .02 else duration
num = int(duration * 50)
# 将要经过的点存入列表
points = [(int(current_x + i * (width / num)), int(current_y + i * (height / num))) for i in range(1, num)]
@ -589,9 +591,12 @@ class ChromiumElement(DrissionElement):
# 逐个访问要经过的点
for x, y in points:
t = perf_counter()
actions.move(x - current_x, y - current_y)
current_x, current_y = x, y
actions.wait(.05)
ss = .02 - perf_counter() + t
if ss > 0:
sleep(ss)
actions.release()
def _get_obj_id(self, node_id=None, backend_id=None):

6
DrissionPage/chromium_element.pyi
View File

@ -184,11 +184,9 @@ class ChromiumElement(DrissionElement):
def hover(self, offset_x: int = None, offset_y: int = None) -> None: ...
def drag(self, offset_x: int = 0, offset_y: int = 0, speed: int = 40) -> None: ...
def drag(self, offset_x: int = 0, offset_y: int = 0, duration: float = 0.5) -> None: ...
def drag_to(self,
ele_or_loc: Union[tuple, ChromiumElement],
speed: int = 40) -> None: ...
def drag_to(self, ele_or_loc: Union[tuple, ChromiumElement], duration: float = 0.5) -> None: ...
def _get_obj_id(self, node_id: str = None, backend_id: str = None) -> str: ...