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

优化处理alert逻辑

Browse Source
This commit is contained in:
g1879 2023-12-20 14:35:14 +08:00
parent b1f4c0767d
commit e9f6322e5e
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DrissionPage/_base/driver.py
View File

@ -83,10 +83,8 @@ class Driver(object):
return result
except Empty:
# if self.alert_flag:
# self.alert_flag = False
# self.method_results.pop(ws_id, None)
# return {'result': {'message': 'alert exists.'}}
if self.alert_flag and message['method'].startswith('Input.'):
return {'result': {'message': 'alert exists.'}}
if timeout is not None and perf_counter() > end_time:
self.method_results.pop(ws_id, None)

3
DrissionPage/_elements/chromium_element.py
View File

@ -641,8 +641,7 @@ class ChromiumElement(DrissionElement):
"""
self.page.scroll.to_see(self)
x, y = offset_scroll(self, offset_x, offset_y)
self.page.run_cdp('Input.dispatchMouseEvent', type='mouseMoved', x=x, y=y,
_ignore=AlertExistsError, _timeout=1)
self.page.run_cdp('Input.dispatchMouseEvent', type='mouseMoved', x=x, y=y, _ignore=AlertExistsError)
def drag(self, offset_x=0, offset_y=0, duration=.5):
"""拖拽当前元素到相对位置

6
DrissionPage/_functions/keys.py
View File

@ -404,7 +404,7 @@ def keyDescriptionForString(_modifiers, keyString): # noqa: C901
def send_key(page, modifier, key):
"""发送一个字，在键盘中的字符触发按键，其它直接发送文本"""
if key not in keyDefinitions:
page.run_cdp('Input.insertText', text=key, _ignore=AlertExistsError, _timeout=1)
page.run_cdp('Input.insertText', text=key, _ignore=AlertExistsError)
else:
description = keyDescriptionForString(modifier, key)
@ -442,7 +442,7 @@ def input_text_or_keys(page, text_or_keys):
return
if text_or_keys.endswith(('\n', '\ue007')):
page.run_cdp('Input.insertText', text=text_or_keys[:-1], _ignore=AlertExistsError, _timeout=1)
page.run_cdp('Input.insertText', text=text_or_keys[:-1], _ignore=AlertExistsError)
send_key(page, modifier, '\n')
else:
page.run_cdp('Input.insertText', text=text_or_keys, _ignore=AlertExistsError, _timeout=1)
page.run_cdp('Input.insertText', text=text_or_keys, _ignore=AlertExistsError)

10
DrissionPage/_units/actions.py
View File

@ -84,8 +84,8 @@ class Actions:
t = perf_counter()
self.curr_x = x
self.curr_y = y
self._dr.run('Input.dispatchMouseEvent', type='mouseMoved', x=self.curr_x, y=self.curr_y,
modifiers=self.modifier, _timeout=1)
self._dr.run('Input.dispatchMouseEvent', type='mouseMoved',
x=self.curr_x, y=self.curr_y, modifiers=self.modifier)
ss = .02 - perf_counter() + t
if ss > 0:
sleep(ss)
@ -188,7 +188,7 @@ class Actions:
if on_ele:
self.move_to(on_ele, duration=0)
self._dr.run('Input.dispatchMouseEvent', type='mousePressed', button=button, clickCount=count,
x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _timeout=1)
x=self.curr_x, y=self.curr_y, modifiers=self.modifier)
return self
def _release(self, button):
@ -197,7 +197,7 @@ class Actions:
:return: self
"""
self._dr.run('Input.dispatchMouseEvent', type='mouseReleased', button=button, clickCount=1,
x=self.curr_x, y=self.curr_y, modifiers=self.modifier, _timeout=1)
x=self.curr_x, y=self.curr_y, modifiers=self.modifier)
return self
def scroll(self, delta_x=0, delta_y=0, on_ele=None):
@ -210,7 +210,7 @@ class Actions:
if on_ele:
self.move_to(on_ele, duration=0)
self._dr.run('Input.dispatchMouseEvent', type='mouseWheel', x=self.curr_x, y=self.curr_y,
deltaX=delta_x, deltaY=delta_y, modifiers=self.modifier, _timeout=1)
deltaX=delta_x, deltaY=delta_y, modifiers=self.modifier)
return self
def up(self, pixel):

4
DrissionPage/_units/clicker.py
View File

@ -147,10 +147,10 @@ class Clicker(object):
:return: None
"""
self._ele.page.run_cdp('Input.dispatchMouseEvent', type='mousePressed', x=client_x,
y=client_y, button=button, clickCount=count, _ignore=AlertExistsError, _timeout=.5)
y=client_y, button=button, clickCount=count, _ignore=AlertExistsError)
# sleep(.05)
self._ele.page.run_cdp('Input.dispatchMouseEvent', type='mouseReleased', x=client_x,
y=client_y, button=button, _ignore=AlertExistsError, _timeout=.5)
y=client_y, button=button, _ignore=AlertExistsError)
# -------------即将废弃--------------