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函数

Browse Source
This commit is contained in:
g1879 2020-07-23 15:32:57 +08:00
parent 3c5acc9b3f
commit d8bc4ebe1f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DrissionPage/driver_page.py
View File

@ -101,12 +101,12 @@ class DriverPage(object):
timeout: float = None) -> bool: timeout: float = None) -> bool:
"""等待元素从dom删除、显示、隐藏 """等待元素从dom删除、显示、隐藏
:param loc_or_ele: 元素、获取元素的字符串或元素的loc :param loc_or_ele: 元素、获取元素的字符串或元素的loc
:param mode: 等待方式，可选：'del', 'visible', 'invisible' :param mode: 等待方式，可选：'del', 'display', 'hidden'
:param timeout: 超时时间 :param timeout: 超时时间
:return: 等待是否成功 :return: 等待是否成功
""" """
if mode.lower() not in ['del', 'visible', 'invisible']: if mode.lower() not in ['del', 'display', 'hidden']:
raise ValueError('mode can only be "del", "visible", "invisible"') raise ValueError('mode can only be "del", "display", "hidden"')
from selenium.webdriver.support.wait import WebDriverWait from selenium.webdriver.support.wait import WebDriverWait
from selenium.webdriver.support import expected_conditions as ec from selenium.webdriver.support import expected_conditions as ec
@ -133,18 +133,18 @@ class DriverPage(object):
loc_or_ele.is_enabled() loc_or_ele.is_enabled()
except: except:
return True return True
elif mode == 'visible' and loc_or_ele.is_displayed(): elif mode == 'display' and loc_or_ele.is_displayed():
return True return True
elif mode == 'invisible' and not loc_or_ele.is_displayed(): elif mode == 'hidden' and not loc_or_ele.is_displayed():
return True return True
return False return False
else: # 当传入参数是控制字符串或元组时 else: # 当传入参数是控制字符串或元组时
try: try:
if mode == 'del': if mode == 'del':
WebDriverWait(self.driver, timeout).until_not(ec.presence_of_element_located(loc_or_ele)) WebDriverWait(self.driver, timeout).until_not(ec.presence_of_element_located(loc_or_ele))
elif mode == 'visible': elif mode == 'display':
WebDriverWait(self.driver, timeout).until(ec.visibility_of_element_located(loc_or_ele)) WebDriverWait(self.driver, timeout).until(ec.visibility_of_element_located(loc_or_ele))
elif mode == 'invisible': elif mode == 'hidden':
WebDriverWait(self.driver, timeout).until_not(ec.visibility_of_element_located(loc_or_ele)) WebDriverWait(self.driver, timeout).until_not(ec.visibility_of_element_located(loc_or_ele))
return True return True
except: except: