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

3.0.7修复某些情况下跳转标签页问题

Browse Source
This commit is contained in:
g1879 2022-11-22 18:12:00 +08:00
parent 74caffc796
commit 1c212b21b4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DrissionPage/chromium_page.py
View File

@ -84,7 +84,7 @@ class ChromiumPage(ChromiumBase):
raise TypeError('只能接收Tab或DriverOptions类型参数。') raise TypeError('只能接收Tab或DriverOptions类型参数。')
self._first_run = False self._first_run = False
self.main_tab = self.tab_id self.main_tab: str = self.tab_id
def _init_page(self, tab_id: str = None) -> None: def _init_page(self, tab_id: str = None) -> None:
"""新建页面、页面刷新、切换标签页后要进行的cdp参数初始化 """新建页面、页面刷新、切换标签页后要进行的cdp参数初始化
@ -203,7 +203,7 @@ class ChromiumPage(ChromiumBase):
self._control_session.get(f'http://{self.address}/json/new{url}') self._control_session.get(f'http://{self.address}/json/new{url}')
while len(self.tabs) < begin_len: while len(self.tabs) < begin_len:
pass pass
self.to_tab() self.to_tab(self.tabs[0])
def to_main_tab(self) -> None: def to_main_tab(self) -> None:
"""跳转到主标签页""" """跳转到主标签页"""
@ -220,12 +220,13 @@ class ChromiumPage(ChromiumBase):
tab_id = self.main_tab tab_id = self.main_tab
if tab_id not in tabs: if tab_id not in tabs:
tab_id = tabs[0] tab_id = tabs[0]
if tab_id == self.tab_id:
return
if activate: if activate:
self._control_session.get(f'http://{self.address}/json/activate/{tab_id}') self._control_session.get(f'http://{self.address}/json/activate/{tab_id}')
if tab_id == self.tab_id:
return
self._driver.stop() self._driver.stop()
self._init_page(tab_id) self._init_page(tab_id)
if self.ready_state == 'complete': if self.ready_state == 'complete':

2
setup.py
View File

@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
setup( setup(
name="DrissionPage", name="DrissionPage",
version="3.0.6", version="3.0.7",
author="g1879", author="g1879",
author_email="g1879@qq.com", author_email="g1879@qq.com",
description="A module that integrates selenium and requests session, encapsulates common page operations.", description="A module that integrates selenium and requests session, encapsulates common page operations.",