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

4.0.0b19 下拉项可点击选择

Browse Source
This commit is contained in:
g1879 2023-12-10 10:53:50 +08:00
parent ae417542b7
commit 173a323a42
8 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DrissionPage/__init__.py
View File

@ -13,4 +13,4 @@ from ._configs.chromium_options import ChromiumOptions
from ._configs.session_options import SessionOptions
__all__ = ['ChromiumPage', 'ChromiumOptions', 'SessionOptions', 'SessionPage', 'WebPage', '__version__']
__version__ = '4.0.0b18'
__version__ = '4.0.0b19'

8
DrissionPage/_elements/chromium_element.py
View File

@ -688,14 +688,18 @@ class ChromiumElement(DrissionElement):
if obj_id:
return self.page.run_cdp('DOM.requestNode', objectId=obj_id)['nodeId']
else:
return self.page.run_cdp('DOM.describeNode', backendNodeId=backend_id)['node']['nodeId']
n = self.page.run_cdp('DOM.describeNode', backendNodeId=backend_id)['node']
self._tag = n['localName']
return n['nodeId']
def _get_backend_id(self, node_id):
"""根据传入node id获取backend id
:param node_id:
:return: backend id
"""
return self.page.run_cdp('DOM.describeNode', nodeId=node_id)['node']['backendNodeId']
n = self.page.run_cdp('DOM.describeNode', nodeId=node_id)['node']
self._tag = n['localName']
return n['backendNodeId']
def _get_ele_path(self, mode):
"""返获取绝对的css路径或xpath路径"""

7
DrissionPage/_units/clicker.py
View File

@ -34,6 +34,13 @@ class Clicker(object):
:param wait_stop: 是否等待元素运动结束再执行点击
:return: 是否点击成功
"""
if self._ele.tag == 'option':
if self._ele.states.is_selected:
self._ele.parent('t:select').select.cancel_by_option(self._ele)
else:
self._ele.parent('t:select').select.by_option(self._ele)
return
if not by_js: # 模拟点击
can_click = False
timeout = self._ele.page.timeout if timeout is None else timeout

1
DrissionPage/_units/listener.py
View File

@ -88,6 +88,7 @@ class Listener(object):
self._driver.run('Network.enable')
self._set_callback()
self.listening = True
def wait(self, count=1, timeout=None, fit_count=True, raise_err=None):
"""等待符合要求的数据包到达指定数量

49
DrissionPage/_units/selector.py
View File

@ -109,6 +109,13 @@ class SelectElement(object):
"""
return self._by_loc(loc, timeout)
def by_option(self, option):
"""选中单个或多个选项元素
:param option: 定位符
:return: None
"""
self._select_options(option, 'true')
def cancel_by_text(self, text, timeout=None):
"""此方法用于根据text值取消选择项。当元素是多选列表时，可以接收list或tuple
:param text: 文本，传入list或tuple可取消多项
@ -141,6 +148,13 @@ class SelectElement(object):
"""
return self._by_loc(loc, timeout, True)
def cancel_by_option(self, option):
"""选中单个或多个选项元素
:param option: 定位符
:return: None
"""
self._select_options(option, 'false')
def _by_loc(self, loc, timeout=None, cancel=False):
"""用定位符取消选择指定的项
:param loc: 定位符
@ -154,13 +168,9 @@ class SelectElement(object):
mode = 'false' if cancel else 'true'
if self.is_multi:
for ele in eles:
ele.run_js(f'this.selected={mode};')
self._dispatch_change()
return True
eles[0].run_js(f'this.selected={mode};')
self._dispatch_change()
self._select_options(eles, mode)
else:
self._select_options(eles[0], mode)
return True
def _select(self, condition, para_type='text', cancel=False, timeout=None):
@ -205,10 +215,7 @@ class SelectElement(object):
break
if ok:
for i in eles:
i.run_js(f'this.selected={mode};')
self._dispatch_change()
self._select_options(eles, mode)
return True
return False
@ -231,14 +238,26 @@ class SelectElement(object):
if ok:
eles = self.options
for i in condition:
eles[i - 1].run_js(f'this.selected={mode};')
self._dispatch_change()
eles = [eles[i - 1] for i in condition]
self._select_options(eles, mode)
return True
return False
def _select_options(self, option, mode):
"""选中或取消某个选项
:param option: options元素对象
:param mode: 选中还是取消
:return: None
"""
if isinstance(option, (list, tuple, set)):
for o in option:
o.run_js(f'this.selected={mode};')
self._dispatch_change()
else:
option.run_js(f'this.selected={mode};')
self._dispatch_change()
def _dispatch_change(self):
"""触发修改动作"""
self._ele.run_js('this.dispatchEvent(new Event("change", {bubbles: true}));')

10
DrissionPage/_units/selector.pyi
View File

@ -38,6 +38,8 @@ class SelectElement(object):
def by_loc(self, loc: Union[str, Tuple[str, str]], timeout: float = None) -> bool: ...
def by_option(self, option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]]) -> None: ...
def cancel_by_text(self, text: Union[str, list, tuple], timeout: float = None) -> bool: ...
def cancel_by_value(self, value: Union[str, list, tuple], timeout: float = None) -> bool: ...
@ -46,6 +48,9 @@ class SelectElement(object):
def cancel_by_loc(self, loc: Union[str, Tuple[str, str]], timeout: float = None) -> bool: ...
def cancel_by_option(self,
option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]]) -> None: ...
def invert(self) -> None: ...
def _by_loc(self, loc: Union[str, Tuple[str, str]], timeout: float = None, cancel: bool = False) -> bool: ...
@ -60,4 +65,7 @@ class SelectElement(object):
def _index(self, condition: set, mode: str, timeout: float) -> bool: ...
def _dispatch_change(self) -> None: ...
def _select_options(self, option: Union[ChromiumElement, List[ChromiumElement], Tuple[ChromiumElement]],
mode: str) -> None: ...
def _dispatch_change(self) -> None: ...

1
requirements.txt
View File

@ -2,7 +2,6 @@ requests
lxml
cssselect
DownloadKit>=2.0.0b0
FlowViewer>=0.3.0
websocket-client
click
tldextract

3
setup.py
View File

@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
setup(
name="DrissionPage",
version="4.0.0b18",
version="4.0.0b19",
author="g1879",
author_email="g1879@qq.com",
description="Python based web automation tool. It can control the browser and send and receive data packets.",
@ -23,7 +23,6 @@ setup(
'requests',
'cssselect',
'DownloadKit>=2.0.0b0',
'FlowViewer>=0.3.0',
'websocket-client',
'click',
'tldextract',