mirror of
https://gitee.com/g1879/DrissionPage.git
synced 2024-12-10 04:00:23 +08:00
移动add_init_script到TabSetter中
This commit is contained in:
parent
3005468ce0
commit
290baa680a
@ -492,19 +492,6 @@ class ChromiumBase(BasePage):
|
|||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
run_js(self, script, as_expr, 0, args)
|
run_js(self, script, as_expr, 0, args)
|
||||||
|
|
||||||
def add_init_script(self, script: str, raise_error=True):
|
|
||||||
'''添加初始化脚本,在页面加载任何脚本前执行
|
|
||||||
:param script: js文本
|
|
||||||
:return: identifier 添加的脚本的标识符,用于删除,失败时返回False,或raise Error
|
|
||||||
'''
|
|
||||||
result = self.driver.run('Page.addScriptToEvaluateOnNewDocument', source=script)
|
|
||||||
if not result or __ERROR__ not in result:
|
|
||||||
return result['identifier']
|
|
||||||
else:
|
|
||||||
if raise_error:
|
|
||||||
raise_error(str(result))
|
|
||||||
return False
|
|
||||||
|
|
||||||
def get(self, url, show_errmsg=False, retry=None, interval=None, timeout=None):
|
def get(self, url, show_errmsg=False, retry=None, interval=None, timeout=None):
|
||||||
"""访问url
|
"""访问url
|
||||||
|
@ -10,6 +10,7 @@ from requests.structures import CaseInsensitiveDict
|
|||||||
from .cookies_setter import SessionCookiesSetter, CookiesSetter
|
from .cookies_setter import SessionCookiesSetter, CookiesSetter
|
||||||
from .._functions.tools import show_or_hide_browser
|
from .._functions.tools import show_or_hide_browser
|
||||||
|
|
||||||
|
__ERROR__ = 'error'
|
||||||
|
|
||||||
class BasePageSetter(object):
|
class BasePageSetter(object):
|
||||||
def __init__(self, page):
|
def __init__(self, page):
|
||||||
@ -198,6 +199,19 @@ class TabSetter(ChromiumBaseSetter):
|
|||||||
"""使标签页处于最前面"""
|
"""使标签页处于最前面"""
|
||||||
self._page.browser.activate_tab(self._page.tab_id)
|
self._page.browser.activate_tab(self._page.tab_id)
|
||||||
|
|
||||||
|
def add_init_script(self, script: str, raise_error=True):
|
||||||
|
'''添加初始化脚本,在页面加载任何脚本前执行
|
||||||
|
:param script: js文本
|
||||||
|
:return: identifier 添加的脚本的标识符,失败时返回False,或raise Error
|
||||||
|
'''
|
||||||
|
result = self.driver.run('Page.addScriptToEvaluateOnNewDocument', source=script)
|
||||||
|
if not result or __ERROR__ not in result:
|
||||||
|
return result['identifier']
|
||||||
|
else:
|
||||||
|
if raise_error:
|
||||||
|
raise_error(str(result))
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class ChromiumPageSetter(TabSetter):
|
class ChromiumPageSetter(TabSetter):
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user