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

wait.ele_loaded()改成wait.eles_loaded()

Browse Source
This commit is contained in:
g1879 2024-03-27 18:10:05 +08:00
parent 6664927cd3
commit 47a6e87715
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
DrissionPage/_units/waiter.py
View File

@ -80,16 +80,26 @@ class BaseWaiter(OriginWaiter):
return False return False
return ele.wait.hidden(timeout, raise_err=raise_err) return ele.wait.hidden(timeout, raise_err=raise_err)
def ele_loaded(self, locator, timeout=None, raise_err=None): def eles_loaded(self, locators, timeout=None, any_one=False, raise_err=None):
"""等待元素加载到DOM """等待元素加载到DOM
:param locator: 要等待的元素，输入定位符 :param locators: 要等待的元素，输入定位符，用list输入多个
:param timeout: 超时时间，默认读取页面超时时间 :param timeout: 超时时间，默认读取页面超时时间
:param any_one: 是否等待到一个就返回
:param raise_err: 等待失败时是否报错，为None时根据Settings设置 :param raise_err: 等待失败时是否报错，为None时根据Settings设置
:return: 成功返回元素对象，失败返回False :return: 成功返回True，失败返回False
""" """
ele = self._driver._ele(locator, raise_err=False, timeout=timeout) if isinstance(locators, (str, tuple)):
if ele: locators = (locators,)
return ele timeout = self._driver.timeout if timeout is None else timeout
end_time = perf_counter() + timeout
if any_one:
while perf_counter() < end_time:
if any([self._driver._ele(l, raise_err=False, timeout=0)for l in locators]):
return True
else:
while perf_counter() < end_time:
if all([self._driver._ele(l, raise_err=False, timeout=0) for l in locators]):
return True
if raise_err is True or Settings.raise_when_wait_failed is True: if raise_err is True or Settings.raise_when_wait_failed is True:
raise WaitTimeoutError(f'等待元素加载失败（等待{timeout}秒）。') raise WaitTimeoutError(f'等待元素加载失败（等待{timeout}秒）。')
else: else:
@ -232,6 +242,21 @@ class BaseWaiter(OriginWaiter):
""" """
return self._loading(timeout=timeout, start=False, raise_err=raise_err) return self._loading(timeout=timeout, start=False, raise_err=raise_err)
def ele_loaded(self, locator, timeout=None, raise_err=None):
"""等待元素加载到DOM
:param locator: 要等待的元素，输入定位符
:param timeout: 超时时间，默认读取页面超时时间
:param raise_err: 等待失败时是否报错，为None时根据Settings设置
:return: 成功返回元素对象，失败返回False
"""
ele = self._driver._ele(locator, raise_err=False, timeout=timeout)
if ele:
return ele
if raise_err is True or Settings.raise_when_wait_failed is True:
raise WaitTimeoutError(f'等待元素加载失败（等待{timeout}秒）。')
else:
return False
class TabWaiter(BaseWaiter): class TabWaiter(BaseWaiter):

9
DrissionPage/_units/waiter.pyi
View File

@ -37,10 +37,11 @@ class BaseWaiter(OriginWaiter):
def ele_hidden(self, loc_or_ele: Union[str, tuple, ChromiumElement], timeout: float = None, def ele_hidden(self, loc_or_ele: Union[str, tuple, ChromiumElement], timeout: float = None,
raise_err: bool = None) -> bool: ... raise_err: bool = None) -> bool: ...
def ele_loaded(self, def eles_loaded(self,
locator: Union[Tuple[str, str], str], locators: Union[Tuple[str, str], str],
timeout: float = None, timeout: float = None,
raise_err: bool = None) -> Union[bool, ChromiumElement]: ... any_one: bool = False,
raise_err: bool = None) -> bool: ...
def _loading(self, timeout: float = None, start: bool = True, gap: float = .01, raise_err: bool = None) -> bool: ... def _loading(self, timeout: float = None, start: bool = True, gap: float = .01, raise_err: bool = None) -> bool: ...