diff --git a/DrissionPage/driver_element.py b/DrissionPage/driver_element.py index 8d5d43a..e94cc50 100644 --- a/DrissionPage/driver_element.py +++ b/DrissionPage/driver_element.py @@ -1174,37 +1174,27 @@ class Scroll(object): :param pixel: 滚动的像素 :return: None """ - if pixel < 0: - self.down(-pixel) - else: - self.driver.run_script(f'{self.t1}.scrollBy(0,-{pixel});') + pixel = -pixel + self.driver.run_script(f'{self.t1}.scrollBy(0,{pixel});') def down(self, pixel: int = 300) -> None: """向下滚动若干像素,水平位置不变 \n :param pixel: 滚动的像素 :return: None """ - if pixel < 0: - self.up(-pixel) - else: - self.driver.run_script(f'{self.t1}.scrollBy(0,{pixel});') + self.driver.run_script(f'{self.t1}.scrollBy(0,{pixel});') def left(self, pixel: int = 300) -> None: """向左滚动若干像素,水平位置不变 \n :param pixel: 滚动的像素 :return: None """ - if pixel < 0: - self.right(-pixel) - else: - self.driver.run_script(f'{self.t1}.scrollBy(-{pixel},0);') + pixel = -pixel + self.driver.run_script(f'{self.t1}.scrollBy({pixel},0);') def right(self, pixel: int = 300) -> None: """向右滚动若干像素,水平位置不变 \n :param pixel: 滚动的像素 :return: None """ - if pixel < 0: - self.left(-pixel) - else: - self.driver.run_script(f'{self.t1}.scrollBy({pixel},0);') + self.driver.run_script(f'{self.t1}.scrollBy({pixel},0);') diff --git a/DrissionPage/mix_page.py b/DrissionPage/mix_page.py index c87a916..f3be871 100644 --- a/DrissionPage/mix_page.py +++ b/DrissionPage/mix_page.py @@ -380,7 +380,7 @@ class MixPage(SessionPage, DriverPage, BasePage): rename: str = None, file_exists: str = 'rename', post_data: Union[str, dict] = None, - show_msg: bool = False, + show_msg: bool = True, show_errmsg: bool = False, retry: int = None, interval: float = None, diff --git a/DrissionPage/session_page.py b/DrissionPage/session_page.py index 15e9fb7..b97acd8 100644 --- a/DrissionPage/session_page.py +++ b/DrissionPage/session_page.py @@ -261,7 +261,7 @@ class SessionPage(BasePage): file_exists: str = 'rename', post_data: Union[str, dict] = None, show_msg: bool = False, - show_errmsg: bool = False, + show_errmsg: bool = True, retry: int = None, interval: float = None, **kwargs) -> tuple: