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.4.25

Browse Source
This commit is contained in:
g1879 2024-06-17 16:58:03 +08:00
parent 3669e935a2
commit cb205c0bf1
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DrissionPage/_elements/none_element.py
View File

@ -11,9 +11,9 @@ from ..errors import ElementNotFoundError
class NoneElement(object):
def __init__(self, page=None, method=None, args=None):
"""
:param page:
:param method:
:param args:
:param page: 元素所在页面
:param method: 查找元素的方法
:param args: 查找元素的参数
"""
if page:
self._none_ele_value = page._none_ele_value

42
DrissionPage/_functions/tools.py
View File

@ -236,6 +236,9 @@ def raise_error(result, ignore=None):
class ElementsList(list):
def __init__(self, page=None):
super().__init__()
self.page = page
def displayed(self, get_all=False):
"""返回显示的元素，默认返回第一个
@ -337,7 +340,7 @@ class ElementsList(list):
if i.raw_text:
return i
return NoneElement()
return NoneElement(self.page, method='have_text()', args={'get_all': get_all})
def style(self, name, value, get_all=False):
"""返回拥有某个style值的元素，默认返回第一个
@ -368,7 +371,7 @@ class ElementsList(list):
def filter(self, get_all=False, displayed=None, checked=None, selected=None, enabled=None, clickable=None,
have_rect=None, have_text=None):
"""与关系筛选元素
"""或关系筛选元素
:param get_all: 是否返回所有筛选到的元素
:param displayed: 是否显示，bool，None为忽略该项
:param checked: 是否被选中，bool，None为忽略该项
@ -377,24 +380,24 @@ class ElementsList(list):
:param clickable: 是否可点击，bool，None为忽略该项
:param have_rect: 是否拥有大小和位置，bool，None为忽略该项
:param have_text: 是否含有文本，bool，None为忽略该项
:return:
:return: 筛选结果
"""
if get_all:
r = ElementsList()
for i in self:
if ((displayed is not None and (displayed is True and i.states.is_displayed) or (
displayed is False and not i.states.is_displayed))
and (checked is not None and (checked is True and i.states.is_checked) or (
or (checked is not None and (checked is True and i.states.is_checked) or (
checked is False and not i.states.is_checked))
and (selected is not None and (selected is True and i.states.is_selected) or (
or (selected is not None and (selected is True and i.states.is_selected) or (
selected is False and not i.states.is_selected))
and (enabled is not None and (enabled is True and i.states.is_enabled) or (
or (enabled is not None and (enabled is True and i.states.is_enabled) or (
enabled is False and not i.states.is_enabled))
and (clickable is not None and (clickable is True and i.states.is_clickable) or (
or (clickable is not None and (clickable is True and i.states.is_clickable) or (
clickable is False and not i.states.is_clickable))
and (have_rect is not None and (have_rect is True and i.states.has_rect) or (
or (have_rect is not None and (have_rect is True and i.states.has_rect) or (
have_rect is False and not i.states.has_rect))
and (have_text is not None and (have_text is True and i.raw_text) or (
or (have_text is not None and (have_text is True and i.raw_text) or (
have_text is False and not i.raw_text))):
r.append(i)
return r
@ -402,21 +405,24 @@ class ElementsList(list):
for i in self:
if ((displayed is not None and (displayed is True and i.states.is_displayed) or (
displayed is False and not i.states.is_displayed))
and (checked is not None and (checked is True and i.states.is_checked) or (
or (checked is not None and (checked is True and i.states.is_checked) or (
checked is False and not i.states.is_checked))
and (selected is not None and (selected is True and i.states.is_selected) or (
or (selected is not None and (selected is True and i.states.is_selected) or (
selected is False and not i.states.is_selected))
and (enabled is not None and (enabled is True and i.states.is_enabled) or (
or (enabled is not None and (enabled is True and i.states.is_enabled) or (
enabled is False and not i.states.is_enabled))
and (clickable is not None and (clickable is True and i.states.is_clickable) or (
or (clickable is not None and (clickable is True and i.states.is_clickable) or (
clickable is False and not i.states.is_clickable))
and (have_rect is not None and (have_rect is True and i.states.has_rect) or (
or (have_rect is not None and (have_rect is True and i.states.has_rect) or (
have_rect is False and not i.states.has_rect))
and (have_text is not None and (have_text is True and i.raw_text) or (
or (have_text is not None and (have_text is True and i.raw_text) or (
have_text is False and not i.raw_text))):
return i
return NoneElement()
return NoneElement(self.page, method='filter()', args={'get_all': get_all, 'displayed': displayed,
'checked': checked, 'selected': selected,
'enabled': enabled, 'clickable': clickable,
'have_rect': have_rect, 'have_text': have_text})
def _get_attr(self, name, value, method, get_all=False):
"""返回通过某个方法可获得某个值的元素，默认返回第一个
@ -437,7 +443,7 @@ class ElementsList(list):
if getattr(i, method)(name) == value:
return i
return NoneElement()
return NoneElement(self.page, f'{method}()', args={'name': name, 'value': value, 'get_all': get_all})
def _any_state(self, name, is_not=False, get_all=False):
"""
@ -466,7 +472,7 @@ class ElementsList(list):
if getattr(i.states, name):
return i
return NoneElement()
return NoneElement(self.page, f'is_{name}()', args={'is_not': is_not, 'get_all': get_all})
def get_eles(locators, owner, any_one=False, first_ele=True, timeout=10):

2
DrissionPage/_functions/tools.pyi
View File

@ -58,6 +58,8 @@ def get_eles(locators: Union[List[str], tuple],
class ElementsList(list):
page = ...
def displayed(self, get_all: bool = False) -> Union[List[ChromiumElement], ChromiumElement]: ...
def hidden(self, get_all: bool = False) -> Union[List[ChromiumElement], ChromiumElement]: ...