mangoautomation 1.0.58__py3-none-any.whl → 1.0.60__py3-none-any.whl

mangoautomation/uidrive/android/_new_android.py

@@ -11,7 +11,7 @@ from adbutils import AdbTimeout
 from uiautomator2 import ConnectError
 
 from ...exceptions import MangoAutomationError
-from ...exceptions._error_msg import ERROR_MSG_0042, ERROR_MSG_0045, ERROR_MSG_0040
+from ...exceptions.error_msg import ERROR_MSG_0042, ERROR_MSG_0045, ERROR_MSG_0040
 
 """
 python -m uiautomator2 init

mangoautomation/uidrive/android/_page.py

@@ -39,19 +39,19 @@ class AndroidPage(metaclass=Meta):
         self.base_data.android.swipe_ext(Direction.BACKWARD)
 
     @sync_method_callback('android', '页面操作', 5, [
-        MethodModel(f='sx', p='请输入sx坐标', d=True),
-        MethodModel(f='sy', p='请输入sy坐标', d=True),
-        MethodModel(f='ex', p='请输入ex坐标', d=True),
-        MethodModel(f='ey', p='请输入ey坐标', d=True)])
+        MethodModel(n='当前x', f='sx', p='请输入sx坐标', d=True),
+        MethodModel(n='当前y', f='sy', p='请输入sy坐标', d=True),
+        MethodModel(n='目标x', f='ex', p='请输入ex坐标', d=True),
+        MethodModel(n='目标y', f='ey', p='请输入ey坐标', d=True)])
     def a_swipe(self, sx, sy, ex, ey):
         """坐标滑动"""
         self.base_data.android.swipe(sx, sy, ex, ey, 0.5)
 
     @sync_method_callback('android', '页面操作', 6, [
-        MethodModel(f='sx', p='请输入sx坐标', d=True),
-        MethodModel(f='sy', p='请输入sy坐标', d=True),
-        MethodModel(f='ex', p='请输入ex坐标', d=True),
-        MethodModel(f='ey', p='请输入ey坐标', d=True)])
+        MethodModel(n='当前x', f='sx', p='请输入sx坐标', d=True),
+        MethodModel(n='当前y', f='sy', p='请输入sy坐标', d=True),
+        MethodModel(n='目标x', f='ex', p='请输入ex坐标', d=True),
+        MethodModel(n='目标y', f='ey', p='请输入ey坐标', d=True)])
     def a_drag(self, sx, sy, ex, ey):
         """坐标拖动"""
         self.base_data.android.drag(sx, sy, ex, ey, 0.5)
@@ -62,15 +62,15 @@ class AndroidPage(metaclass=Meta):
         self.base_data.android.open_quick_settings()
 
     @sync_method_callback('android', '页面操作', 8, [
-        MethodModel(f='file_name', p='请输入截图文件名称', d=True)])
+        MethodModel(n='文件名称', f='file_name', p='请输入截图文件名称', d=True)])
     def a_screenshot(self, file_name: str):
         """屏幕截图"""
         self.base_data.android.screenshot(filename=os.path.join(self.base_data.screenshot_path, file_name))
 
     @sync_method_callback('android', '页面操作', 9, [
-        MethodModel(f='x', p='请输入按下的x坐标', d=True),
-        MethodModel(f='y', p='请输入按下的x坐标', d=True),
-        MethodModel(f='time_', p='请输入长按时间', d=True)])
+        MethodModel(n='x坐标', f='x', p='请输入按下的x坐标', d=True),
+        MethodModel(n='y坐标', f='y', p='请输入按下的x坐标', d=True),
+        MethodModel(n='长按时间', f='time_', p='请输入长按时间', d=True)])
     def a_long_click(self, x, y, time_):
         """长按屏幕N秒"""
         self.base_data.android.long_click(x, y, time_)

mangoautomation/uidrive/web/async_web/__init__.py

@@ -6,15 +6,14 @@
 import re
 import traceback
 
-from playwright._impl._errors import TimeoutError, Error
-from playwright.async_api._generated import Locator
+from playwright.async_api import Locator, Error, TimeoutError
 
 from mangotools.assertion import MangoAssertion
 from mangotools.enums import StatusEnum
 from mangotools.mangos import Mango
 from ....enums import ElementExpEnum, ElementOperationEnum
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import *
+from ....exceptions.error_msg import *
 from ....uidrive._base_data import BaseData
 from ....uidrive.web.async_web._assertion import AsyncWebAssertion
 from ....uidrive.web.async_web._browser import AsyncWebBrowser
@@ -76,7 +75,7 @@ class AsyncWebDevice(AsyncWebBrowser,
                 return await Mango.a_e(AsyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                return MangoAssertion(self.base_data.mysql_connect) \
+                return MangoAssertion(self.base_data.mysql_connect, self.base_data.test_data) \
                     .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.debug(f'WEB自动化断言失败-1，类型：{type(error)}，失败详情：{error}')

mangoautomation/uidrive/web/async_web/_assertion.py

@@ -8,7 +8,7 @@ from playwright.async_api import Locator, expect as exp
 from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import ERROR_MSG_0021
+from ....exceptions.error_msg import ERROR_MSG_0021
 from ....tools import Meta
 from ....uidrive._base_data import BaseData
 
@@ -21,7 +21,7 @@ class AsyncWebAssertion(metaclass=Meta):
 
     @async_method_callback('ass_web', '元素断言', 0, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入元素个数', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入元素个数', d=True)])
     async def w_to_have_count(self, actual: Locator, expect: str):
         """元素是几个"""
         try:
@@ -40,7 +40,7 @@ class AsyncWebAssertion(metaclass=Meta):
 
     @async_method_callback('ass_web', '元素断言', 1, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入元素存输入1，不存输入0', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入元素存输入1，不存输入0', d=True)])
     async def w_to_element_count(self, actual: Locator, expect: int):
         """元素是否存在"""
         if int(expect) == 0:
@@ -59,7 +59,7 @@ class AsyncWebAssertion(metaclass=Meta):
 
     @async_method_callback('ass_web', '元素断言', 2, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入不包含的文本', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入不包含的文本', d=True)])
     async def w_not_to_contain_text(self, actual: Locator, expect: str):
         """元素不包含文本"""
         try:
@@ -124,7 +124,7 @@ class AsyncWebAssertion(metaclass=Meta):
 
     @async_method_callback('ass_web', '元素断言', 9, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入样式', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入样式', d=True)])
     async def w_not_to_have_class(self, actual: Locator, expect: str):
         """元素没有阶级"""
         try:

mangoautomation/uidrive/web/async_web/_browser.py

@@ -14,7 +14,7 @@ from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
 from ..._base_data import BaseData
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059, ERROR_MSG_0010
+from ....exceptions.error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059, ERROR_MSG_0010
 from ....tools import Meta
 
 
@@ -25,13 +25,13 @@ class AsyncWebBrowser(metaclass=Meta):
         self.base_data = base_data
 
     @async_method_callback('web', '浏览器操作', 0, [
-        MethodModel(f='_time', p='请输入等待时间', d=True)])
+        MethodModel(n='等待时间', f='_time', p='请输入等待时间', d=True)])
     async def w_wait_for_timeout(self, _time: int):
         """强制等待"""
         await asyncio.sleep(int(_time))
 
     @async_method_callback('web', '浏览器操作', 1, [
-        MethodModel(f='url', p='请输入URL', d=True)])
+        MethodModel(n='url地址', f='url', p='请输入URL', d=True)])
     async def w_goto(self, url: str):
         """打开URL"""
         try:
@@ -53,11 +53,11 @@ class AsyncWebBrowser(metaclass=Meta):
             raise MangoAutomationError(*ERROR_MSG_0058, value=(url,))
 
     @async_method_callback('web', '浏览器操作', 2, [
-        MethodModel(f='path', p='请输入截图保存路径', d=True)])
+        MethodModel(n='存储路径', f='path', p='请输入截图保存路径', d=True)])
     async def w_screenshot(self, path: str):
         """整个页面截图"""
         try:
-            await self.base_data.page.screenshot(path=path, full_page=True)
+            await self.base_data.page.screenshot(path=path, full_page=True, timeout=10000)
         except (TargetClosedError, TimeoutError) as error:
             self.base_data.log.debug(
                 f'截图出现异常失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
@@ -81,7 +81,7 @@ class AsyncWebBrowser(metaclass=Meta):
             file.write(json.dumps(await self.base_data.context.storage_state()))
 
     @async_method_callback('web', '浏览器操作', 5, [
-        MethodModel(f='storage_state', p='请输入获取cookie方法中获取的内容', d=True)])
+        MethodModel(n='获取cookie方法的值', f='storage_state', p='请输入获取cookie方法中获取的内容', d=True)])
     async def w_set_cookie(self, storage_state: str):
         """设置cookie"""
         if isinstance(storage_state, str):

mangoautomation/uidrive/web/async_web/_element.py

@@ -4,15 +4,15 @@
 # @Author : 毛鹏
 import asyncio
 import os
-
 import time
-from playwright.async_api import Locator, Error
+
+from playwright.async_api import Locator, Error, TimeoutError
 
 from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
 from ..._base_data import BaseData
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import ERROR_MSG_0024, ERROR_MSG_0056
+from ....exceptions.error_msg import ERROR_MSG_0024, ERROR_MSG_0056
 from ....tools import Meta
 
 
@@ -25,11 +25,15 @@ class AsyncWebElement(metaclass=Meta):
     @async_method_callback('web', '元素操作', 0, [MethodModel(f='locating')])
     async def w_click(self, locating: Locator):
         """元素单击"""
+        if await locating.count() < 1:
+            raise TimeoutError('元素个数小于1，直接操作超时！')
         await locating.click()
 
     @async_method_callback('web', '元素操作', 1, [MethodModel(f='locating')])
     async def w_dblclick(self, locating: Locator):
         """元素双击"""
+        if await locating.count() < 1:
+            raise TimeoutError('元素个数小于1，直接操作超时！')
         await locating.dblclick()
 
     @async_method_callback('web', '元素操作', 2, [MethodModel(f='locating')])
@@ -39,9 +43,11 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 3, [
         MethodModel(f='locating'),
-        MethodModel(f='input_value', p='请输入输入内容', d=True)])
+        MethodModel(n='输入内容', f='input_value', p='请输入输入内容', d=True)])
     async def w_input(self, locating: Locator, input_value: str):
         """元素输入"""
+        if await locating.count() < 1:
+            raise TimeoutError('元素个数小于1，直接操作超时！')
         await locating.fill(str(input_value))
 
     @async_method_callback('web', '元素操作', 4, [MethodModel(f='locating')])
@@ -52,9 +58,11 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 5, [
         MethodModel(f='locating'),
-        MethodModel(f='set_cache_key', p='请输入获取元素文本后存储的key', d=True)])
+        MethodModel(n='缓存的key', f='set_cache_key', p='请输入获取元素文本后存储的key', d=True)])
     async def w_get_text(self, locating: Locator, set_cache_key=None):
         """获取元素文本"""
+        if await locating.count() < 1:
+            raise TimeoutError('元素个数小于1，直接操作超时！')
         methods = [
             ("inner_text", locating.inner_text),
             ("text_content", locating.text_content),
@@ -62,7 +70,6 @@ class AsyncWebElement(metaclass=Meta):
             ("get_attribute", lambda: locating.get_attribute("value")),
             ("evaluate", lambda: locating.evaluate("el => el.value")),
         ]
-
         for method_name, method in methods:
             try:
                 value = await method()
@@ -73,14 +80,15 @@ class AsyncWebElement(metaclass=Meta):
                     return value
             except Exception:
                 continue
-
         return None
 
     @async_method_callback('web', '元素操作', 5, [
         MethodModel(f='locating'),
-        MethodModel(f='input_value', p='请输入输入内容', d=True)])
+        MethodModel(n='输入文本', f='input_value', p='请输入输入内容', d=True)])
     async def w_clear_input(self, locating: Locator, input_value: str):
         """元素清空再输入"""
+        if await locating.count() < 1:
+            raise TimeoutError('元素个数小于1，直接操作超时！')
         await locating.clear()
         await locating.fill(str(input_value))
 
@@ -95,34 +103,34 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 6, [
         MethodModel(f='locating'),
-        MethodModel(f='file_path', p='请输入文件路径，参照帮助文档', d=True)])
+        MethodModel(n='文件名称', f='file_path', p='请输入文件路径，参照帮助文档', d=True)])
     async def w_upload_files(self, locating: Locator, file_path: str | list):
         """拖拽文件上传"""
         try:
             if isinstance(file_path, str):
-                await locating.set_input_files(file_path)
+                await locating.set_input_files(file_path, timeout=30000)
             else:
                 for file in file_path:
-                    await locating.set_input_files(file)
+                    await locating.set_input_files(file, timeout=30000)
         except Error:
             raise MangoAutomationError(*ERROR_MSG_0024)
 
     @async_method_callback('web', '元素操作', 7, [
         MethodModel(f='locating'),
-        MethodModel(f='file_path', p='请输入文件路径，参照帮助文档', d=True)])
+        MethodModel(n='文件名称', f='file_path', p='请输入文件路径，参照帮助文档', d=True)])
     async def w_click_upload_files(self, locating: Locator, file_path: str | list):
         """点击并选择文件上传"""
-        async with self.base_data.page.expect_file_chooser() as fc_info:
+        async with self.base_data.page.expect_file_chooser(timeout=30000) as fc_info:
             await locating.click()
         file_chooser = await fc_info.value
         await file_chooser.set_files(file_path)
 
     @async_method_callback('web', '元素操作', 8, [
         MethodModel(f='locating'),
-        MethodModel(f='file_key', p='请输入文件存储路径的key，后续通过key获取文件保存的绝对路径', d=True)])
+        MethodModel(n='存储key值', f='file_key', p='请输入文件存储路径的key，后续通过key获取文件保存的绝对路径', d=True)])
     async def w_download(self, locating: Locator, file_key: str):
         """下载文件"""
-        async with self.base_data.page.expect_download() as download_info:
+        async with self.base_data.page.expect_download(timeout=30000) as download_info:
             await locating.click()
         download = await download_info.value
         file_name = download.suggested_filename
@@ -143,7 +151,7 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 10, [
         MethodModel(f='locating'),
-        MethodModel(f='n', p='请输入循环点击的时间', d=True)])
+        MethodModel(n='点击时间', f='n', p='请输入循环点击的时间', d=True)])
     async def w_time_click(self, locating: Locator, n: int):
         """循环点击N秒"""
         try:
@@ -158,7 +166,7 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 11, [
         MethodModel(f='locating'),
-        MethodModel(f='n', p='请输入向上像素', d=True)])
+        MethodModel(n='像素大小', f='n', p='请输入向上像素', d=True)])
     async def w_drag_up_pixel(self, locating: Locator, n: int):
         """往上拖动N个像素"""
         try:
@@ -176,7 +184,7 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 12, [
         MethodModel(f='locating'),
-        MethodModel(f='n', p='请输入向下像素', d=True)])
+        MethodModel(n='像素大小', f='n', p='请输入向下像素', d=True)])
     async def w_drag_down_pixel(self, locating: Locator, n: int):
         """往下拖动N个像素"""
         try:
@@ -194,7 +202,7 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 13, [
         MethodModel(f='locating'),
-        MethodModel(f='n', p='请输入向左像素', d=True)])
+        MethodModel(n='像素大小', f='n', p='请输入向左像素', d=True)])
     async def w_drag_left_pixel(self, locating: Locator, n: int):
         """往左拖动N个像素"""
         try:
@@ -212,7 +220,7 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 14, [
         MethodModel(f='locating'),
-        MethodModel(f='n', p='请输入向右像素', d=True)])
+        MethodModel(n='像素大小', f='n', p='请输入向右像素', d=True)])
     async def w_drag_right_pixel(self, locating: Locator, n: int):
         """往右拖动N个像素"""
         try:
@@ -229,7 +237,7 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 15, [
         MethodModel(f='locating'),
-        MethodModel(f='path', p='请输入截图保存路径', d=True)])
+        MethodModel(n='保存路径', f='path', p='请输入截图保存路径', d=True)])
     async def w_ele_screenshot(self, locating: Locator, path: str):
         """元素截图"""
         await locating.screenshot(path=path)

mangoautomation/uidrive/web/async_web/_input_device.py

@@ -16,19 +16,20 @@ class AsyncWebDeviceInput(metaclass=Meta):
         self.base_data = base_data
 
     @async_method_callback('web', '输入设备', 0, [
-        MethodModel(f='keyboard', p='请输入键盘名称，首字母大写', d=True)])
+        MethodModel(n='按键值', f='keyboard', p='请输入键盘名称，首字母大写', d=True)])
     async def w_keys(self, keyboard: str):
         """模拟按下指定的键"""
         await self.base_data.page.keyboard.press(str(keyboard))
 
     @async_method_callback('web', '输入设备', 1, [
-        MethodModel(f='y', p='请输入向上滚动像素', d=True)])
+        MethodModel(n='滚动像素', f='y', p='请输入向上滚动像素', d=True)])
     async def w_wheel(self, y):
         """鼠标上下滚动像素，负数代表向上"""
         await self.base_data.page.mouse.wheel(0, int(y))
 
     @async_method_callback('web', '输入设备', 2, [
-        MethodModel(f='x', p='请输入点击的x轴', d=True), MethodModel(f='y', p='请输入点击的y轴', d=True)])
+        MethodModel(n='x坐标', f='x', p='请输入点击的x轴', d=True),
+        MethodModel(n='y坐标', f='y', p='请输入点击的y轴', d=True)])
     async def w_mouse_click(self, x: float, y: float):
         """鼠标点击坐标"""
         await self.base_data.page.mouse.click(float(x), float(y))
@@ -61,17 +62,20 @@ class AsyncWebDeviceInput(metaclass=Meta):
         center_y = viewport_size['height'] / 2
         await self.base_data.page.mouse.click(center_x, center_y)
 
-    @async_method_callback('web', '输入设备', 5, [MethodModel(f='text', p='请输入键盘输入的内容', d=True)])
+    @async_method_callback('web', '输入设备', 5, [
+        MethodModel(n='输入文本', f='text', p='请输入键盘输入的内容', d=True)])
     async def w_keyboard_type_text(self, text: str):
         """模拟人工输入文字"""
         await self.base_data.page.keyboard.type(str(text))
 
-    @async_method_callback('web', '输入设备', 6, [MethodModel(f='text', p='请输入键盘输入的内容', d=True)])
+    @async_method_callback('web', '输入设备', 6, [
+        MethodModel(n='输入文本', f='text', p='请输入键盘输入的内容', d=True)])
     async def w_keyboard_insert_text(self, text: str):
         """直接输入文字"""
         await self.base_data.page.keyboard.insert_text(str(text))
 
-    @async_method_callback('web', '输入设备', 7, [MethodModel(f='count', p='请输入要删除字符串的个数', d=True)])
+    @async_method_callback('web', '输入设备', 7, [
+        MethodModel(n='删除个数', f='count', p='请输入要删除字符串的个数', d=True)])
     async def w_keyboard_delete_text(self, count: int):
         """删除光标左侧的字符"""
         for _ in range(0, int(count) + 1):

mangoautomation/uidrive/web/async_web/_new_browser.py

@@ -15,7 +15,7 @@ from playwright.async_api import async_playwright, Page, BrowserContext, Browser
 
 from ....enums import BrowserTypeEnum
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import ERROR_MSG_0057, ERROR_MSG_0008, ERROR_MSG_0062, ERROR_MSG_0009, ERROR_MSG_0055
+from ....exceptions.error_msg import ERROR_MSG_0057, ERROR_MSG_0008, ERROR_MSG_0062, ERROR_MSG_0009, ERROR_MSG_0055
 
 """
 python -m uiautomator2 init
@@ -114,7 +114,9 @@ class AsyncWebNewBrowser:
             args_dict["no_viewport"] = True
         if self.web_recording and self.videos_path:
             args_dict["record_video_dir"] = self.videos_path
-        return await self.browser.new_context(**args_dict)
+        context = await self.browser.new_context(**args_dict)
+        context.set_default_timeout(3000)
+        return context
 
     async def new_page(self, context: BrowserContext) -> Page:
         try:

mangoautomation/uidrive/web/async_web/_page.py

@@ -18,7 +18,8 @@ class AsyncWebPage(metaclass=Meta):
     def __init__(self, base_data: BaseData):
         self.base_data = base_data
 
-    @async_method_callback('web', '页面操作', 0, [MethodModel(f='individual', p='请输入页签下标，从1开始数', d=True)])
+    @async_method_callback('web', '页面操作', 0, [
+        MethodModel(n='页签下标', f='individual', p='请输入页签下标，从1开始数', d=True)])
     async def w_switch_tabs(self, individual: int):
         """切换页签"""
         pages = self.base_data.context.pages

mangoautomation/uidrive/web/sync_web/__init__.py

@@ -6,15 +6,14 @@
 import re
 import traceback
 
-from playwright._impl._errors import TimeoutError, Error
-from playwright.sync_api._generated import Locator
+from playwright.sync_api import Locator, TimeoutError, Error
 
 from mangotools.assertion import MangoAssertion
 from mangotools.enums import StatusEnum
 from mangotools.mangos import Mango
 from ....enums import ElementExpEnum
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import *
+from ....exceptions.error_msg import *
 from ....uidrive._base_data import BaseData
 from ....uidrive.web.sync_web._assertion import SyncWebAssertion
 from ....uidrive.web.sync_web._browser import SyncWebBrowser
@@ -75,7 +74,7 @@ class SyncWebDevice(SyncWebBrowser,
                 return Mango.s_e(SyncWebAssertion(self.base_data), ope_key, ope_value)
             else:
                 self.base_data.log.debug(f'开始断言-2，方法：{ope_key}，断言值：{ope_value}')
-                return MangoAssertion(self.base_data.mysql_connect) \
+                return MangoAssertion(self.base_data.mysql_connect, self.base_data.test_data) \
                     .ass(ope_key, ope_value.get('actual'), ope_value.get('expect'))
         except AssertionError as error:
             self.base_data.log.debug(f'WEB自动化断言失败-1，类型：{type(error)}，失败详情：{error}')

mangoautomation/uidrive/web/sync_web/_assertion.py

@@ -21,7 +21,7 @@ class SyncWebAssertion(metaclass=Meta):
 
     @sync_method_callback('ass_web', '元素断言', 0, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入元素个数', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入元素个数', d=True)])
     def w_to_have_count(self, actual: Locator, expect: str):
         """元素是几个"""
         try:
@@ -40,7 +40,7 @@ class SyncWebAssertion(metaclass=Meta):
 
     @sync_method_callback('ass_web', '元素断言', 1, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入元素存输入1，不存输入0', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入元素存输入1，不存输入0', d=True)])
     def w_to_element_count(self, actual: Locator, expect: int):
         """元素存在个数"""
         if int(expect) == 0:
@@ -58,7 +58,7 @@ class SyncWebAssertion(metaclass=Meta):
 
     @sync_method_callback('ass_web', '元素断言', 2, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入不包含的文本', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入不包含的文本', d=True)])
     def w_not_to_contain_text(self, actual: Locator, expect: str):
         """元素不包含文本"""
         try:
@@ -123,7 +123,7 @@ class SyncWebAssertion(metaclass=Meta):
 
     @sync_method_callback('ass_web', '元素断言', 9, [
         MethodModel(f='actual'),
-        MethodModel(f='expect', p='请输入样式', d=True)])
+        MethodModel(n='预期值', f='expect', p='请输入样式', d=True)])
     def w_not_to_have_class(self, actual: Locator, expect: str):
         """元素没有阶级"""
         try:

mangoautomation/uidrive/web/sync_web/_browser.py

@@ -13,7 +13,7 @@ from playwright._impl._errors import TimeoutError, Error, TargetClosedError
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
-from ....exceptions._error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059, ERROR_MSG_0010
+from ....exceptions.error_msg import ERROR_MSG_0049, ERROR_MSG_0013, ERROR_MSG_0058, ERROR_MSG_0059, ERROR_MSG_0010
 from ....tools import Meta
 from ....uidrive._base_data import BaseData
 
@@ -25,13 +25,13 @@ class SyncWebBrowser(metaclass=Meta):
         self.base_data = base_data
 
     @sync_method_callback('web', '浏览器操作', 1, [
-        MethodModel(f='_time', p='请输入等待时间', d=True)])
+        MethodModel(n='等待时间', f='_time', p='请输入等待时间', d=True)])
     def w_wait_for_timeout(self, _time: int):
         """强制等待"""
         time.sleep(int(_time))
 
     @sync_method_callback('web', '浏览器操作', 1, [
-        MethodModel(f='url', p='请输入URL', d=True)])
+        MethodModel(n='url地址', f='url', p='请输入URL', d=True)])
     def w_goto(self, url: str):
         """打开URL"""
         try:
@@ -52,11 +52,12 @@ class SyncWebBrowser(metaclass=Meta):
                 f'打开URL失败-3，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
             raise MangoAutomationError(*ERROR_MSG_0058, value=(url,))
 
-    @sync_method_callback('web', '浏览器操作', 2, [MethodModel(f='path', p='请输入截图保存路径', d=True)])
+    @sync_method_callback('web', '浏览器操作', 2, [
+        MethodModel(n='保存路径', f='path', p='请输入截图保存路径', d=True)])
     def w_screenshot(self, path: str):
         """整个页面截图"""
         try:
-            self.base_data.page.screenshot(path=path, full_page=True)
+            self.base_data.page.screenshot(path=path, full_page=True, timeout=10000)
         except (TargetClosedError, TimeoutError) as error:
             self.base_data.log.debug(
                 f'截图出现异常失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
@@ -80,7 +81,7 @@ class SyncWebBrowser(metaclass=Meta):
             file.write(json.dumps(self.base_data.context.storage_state()))
 
     @sync_method_callback('web', '浏览器操作', 5, [
-        MethodModel(f='storage_state', p='请输入获取cookie方法中获取的内容', d=True)])
+        MethodModel(n='获取cookie的值', f='storage_state', p='请输入获取cookie方法中获取的内容', d=True)])
     def w_set_cookie(self, storage_state: str):
         """设置cookie"""
         if isinstance(storage_state, str):