mangoautomation 1.1.21__py3-none-any.whl → 1.1.23__py3-none-any.whl

mangoautomation/{uidrive → uidrives}/android/__init__.py

@@ -8,26 +8,13 @@ from uiautomator2 import UiObject, UiObjectNotFoundError
 from uiautomator2.exceptions import XPathElementNotFoundError
 from uiautomator2.xpath import XPathSelector
 
+from mangoautomation.mangos import AndroidApplication, AndroidAssertion, AndroidElement, AndroidCustomization, \
+    AndroidEquipment, AndroidPage
 from mangotools.assertion import MangoAssertion
-from ..android._application import AndroidApplication
-from ..android._assertion import AndroidAssertion
-from ..android._customization import AndroidCustomization
-from ..android._element import AndroidElement
-from ..android._equipment import AndroidEquipment
-from ..android._page import AndroidPage
 from ...enums import ElementExpEnum
 from ...exceptions import MangoAutomationError
 from ...exceptions.error_msg import *
 
-__all__ = [
-    'AndroidApplication',
-    'AndroidAssertion',
-    'AndroidElement',
-    'AndroidCustomization',
-    'AndroidEquipment',
-    'AndroidPage',
-    'AndroidDriver',
-]
 
 from mangotools.mangos import Mango
 
@@ -68,7 +55,6 @@ class AndroidDriver(AndroidPage,
         is_method = callable(getattr(AndroidAssertion(self.base_data), ope_key, None))
         if is_method and ope_value.get('actual') is None:
             raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
-
         try:
             if is_method:
                 self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')

mangoautomation/{uidrive → uidrives}/android/_application.py

@@ -10,7 +10,7 @@ from mangotools.models import MethodModel
 from ...exceptions import MangoAutomationError
 from ...exceptions.error_msg import ERROR_MSG_0046
 from ...tools import Meta
-from ...uidrive._base_data import BaseData
+from ...uidrives._base_data import BaseData
 
 
 class AndroidApplication(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/android/_assertion.py

@@ -6,7 +6,7 @@
 from uiautomator2 import UiObject
 
 from mangoautomation.tools import Meta
-from mangoautomation.uidrive._base_data import BaseData
+from mangoautomation.uidrives._base_data import BaseData
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
 

mangoautomation/{uidrive → uidrives}/android/_customization.py

@@ -5,7 +5,7 @@
 
 
 from mangoautomation.tools import Meta
-from mangoautomation.uidrive._base_data import BaseData
+from mangoautomation.uidrives._base_data import BaseData
 
 
 class AndroidCustomization(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/android/_element.py

@@ -9,12 +9,12 @@ import time
 from uiautomator2 import UiObject
 from uiautomator2.xpath import XPathSelector
 
+from mangotools.decorator import sync_method_callback
+from mangotools.models import MethodModel
 from ...exceptions import MangoAutomationError
 from ...exceptions.error_msg import ERROR_MSG_0043, ERROR_MSG_0044
 from ...tools import Meta
-from ...uidrive._base_data import BaseData
-from mangotools.decorator import sync_method_callback
-from mangotools.models import MethodModel
+from ...uidrives._base_data import BaseData
 
 
 class AndroidElement(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/android/_equipment.py

@@ -8,7 +8,7 @@ from time import sleep
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
 from ...tools import Meta
-from ...uidrive._base_data import BaseData
+from ...uidrives._base_data import BaseData
 
 
 class AndroidEquipment(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/android/_page.py

@@ -9,7 +9,7 @@ from uiautomator2 import Direction
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
 from ...tools import Meta
-from ...uidrive._base_data import BaseData
+from ...uidrives._base_data import BaseData
 
 
 class AndroidPage(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/pc/__init__.py

@@ -24,13 +24,12 @@ else:
     from uiautomation import Control
     import uiautomation
 
-from mangoautomation.uidrive._base_data import BaseData
-from mangoautomation.uidrive.pc.element import WinElement
-from mangoautomation.uidrive.pc.input_device import WinDeviceInput
+from mangoautomation.uidrives.pc.element import WinElement
+from mangoautomation.uidrives.pc.input_device import WinDeviceInput
 
 
 class WinDriver(WinElement, WinDeviceInput):
-    def __init__(self, base_data: BaseData):
+    def __init__(self, base_data):
         super().__init__(base_data)
 
     def find_element(

mangoautomation/{uidrive → uidrives}/pc/customization.py

@@ -3,7 +3,7 @@
 # @Description: 
 # @Time   : 2024-08-13 14:07
 # @Author : 毛鹏
-from ...uidrive._base_data import BaseData
+from ...uidrives._base_data import BaseData
 
 
 class PlaywrightCustomization(BaseData):

mangoautomation/{uidrive → uidrives}/pc/element.py

@@ -1,11 +1,10 @@
 from ...tools import Meta
-from ...uidrive._base_data import BaseData
 
 
 class WinElement(metaclass=Meta):
     """元素操作"""
 
-    def __init__(self, base_data: BaseData):
+    def __init__(self, base_data):
         self.base_data = base_data
 
     def click(self, control):

mangoautomation/{uidrive → uidrives}/pc/input_device.py

@@ -4,11 +4,10 @@
 # @Time   : 2024-11-30 23:44
 # @Author : 毛鹏
 from ...tools import Meta
-from ...uidrive._base_data import BaseData
 
 
 class WinDeviceInput(metaclass=Meta):
     """输入设备操作"""
 
-    def __init__(self, base_data: BaseData):
+    def __init__(self, base_data):
         self.base_data = base_data

mangoautomation/uidrives/web/__init__.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description:
+# @Time   : 2023/5/16 14:50
+# @Author : 毛鹏
+from ._async_web import AsyncWebDevice, AsyncWebCustomization, AsyncWebAssertion
+from ._sync_web import SyncWebDevice, SyncWebCustomization, SyncWebAssertion
+
+__all__ = ['AsyncWebDevice', 'AsyncWebCustomization', 'AsyncWebAssertion', 'SyncWebDevice', 'SyncWebCustomization',
+           'SyncWebAssertion']

mangoautomation/uidrives/web/_async_web.py

@@ -0,0 +1,166 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: 
+# @Time   : 2025-04-04 21:42
+# @Author : 毛鹏
+import re
+import traceback
+
+from playwright.async_api import Locator, Error, TimeoutError
+
+from mangoautomation.mangos import AsyncWebAssertion, AsyncWebBrowser, AsyncWebCustomization, AsyncWebElement, \
+    AsyncWebDeviceInput, AsyncWebPage, ElementMain
+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 *
+
+re = re
+
+
+class AsyncWebDevice(AsyncWebBrowser,
+                     AsyncWebPage,
+                     AsyncWebElement,
+                     AsyncWebDeviceInput,
+                     AsyncWebCustomization):
+
+    def __init__(self, base_data):
+        super().__init__(base_data)
+
+    async def open_url(self, is_open: bool = False):
+        if not self.base_data.is_open_url or is_open:
+            self.base_data.log.debug(f'打开url，is_open_url：{self.base_data.is_open_url},url:{self.base_data.url}')
+            await self.w_goto(self.base_data.url)
+            self.base_data.is_open_url = True
+
+    async def web_action_element(self, name, ope_key, ope_value, ):
+        self.base_data.log.debug(f'操作元素{name}：,key:{ope_key},value:{ope_value}')
+        try:
+            await ElementMain.a_element(self, ope_key, ope_value)
+        except TimeoutError as error:
+            self.base_data.log.debug(f'WEB自动化操作失败-1，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0011, value=(name,))
+        except Error as error:
+            self.base_data.log.error(f'WEB自动化操作失败-2，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0032, value=(name,))
+        except ValueError as error:
+            self.base_data.log.error(f'WEB自动化操作失败-3，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0012)
+
+    async def web_assertion_element(self, name, ope_key, ope_value) -> str:
+        self.base_data.log.debug(f'断言元素，名称：{name},key:{ope_key},value:{ope_value}')
+        is_method = callable(getattr(AsyncWebAssertion, ope_key, None))
+        try:
+            if is_method:
+                if ope_value.get('actual', None) is None:
+                    raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
+                self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
+                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, 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}')
+            raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)
+        except AttributeError as error:
+            self.base_data.log.error(f'WEB自动化断言失败-2，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0048)
+        except ValueError as error:
+            self.base_data.log.error(f'WEB自动化断言失败-3，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0005)
+        except Error as error:
+            self.base_data.log.error(f'WEB自动化断言失败-4，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0052, value=(name,), )
+
+    async def web_find_element(self, name, _type, exp, loc, sub, is_iframe) \
+            -> tuple[Locator, int, str] | tuple[list[Locator], int, str]:
+        self.base_data.log.debug(
+            f'查找元素-1，名称：{name},_type:{_type},exp:{exp},loc:{loc},sub:{sub},is_iframe:{is_iframe}')
+        if is_iframe != StatusEnum.SUCCESS.value:
+            locator: Locator = await self.__find_ele(self.base_data.page, exp, loc)
+            try:
+                return await self.__element_info(locator, sub)
+            except Error as error:
+                self.base_data.log.debug(
+                    f'WEB自动化查找元素失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+                raise MangoAutomationError(*ERROR_MSG_0041, value=(name, loc))
+        else:
+            return await self.__is_iframe(_type, exp, loc, sub)
+
+    async def __element_info(self, locator: Locator, sub) -> tuple[Locator, int, str]:
+        count = await locator.count()
+        if count < 1:
+            raise MangoAutomationError(*ERROR_MSG_0053)
+        if sub is not None:
+            loc_result = locator.nth(sub - 1) if sub else locator
+        else:
+            loc_result = locator.nth(0)
+
+        try:
+            text = await self.w_get_text(loc_result)
+        except Exception:
+            text = None
+        return loc_result, count, text
+
+    async def ai_element_info(self, locator: Locator) -> tuple[Locator, int, str]:
+        count = await locator.count()
+        if count < 1:
+            raise MangoAutomationError(*ERROR_MSG_0053)
+        try:
+            text = await self.w_get_text(locator.nth(0))
+        except Exception:
+            text = None
+        return locator.nth(0), count, text
+
+    async def __is_iframe(self, _type, exp, loc, sub):
+        ele_list: list[Locator] = []
+        for i in self.base_data.page.frames:
+            locator: Locator = await self.__find_ele(i, exp, loc)
+            try:
+                count = await locator.count()
+            except Error as error:
+                self.base_data.log.debug(
+                    f'WEB自动化查找元素失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+                raise MangoAutomationError(*ERROR_MSG_0041, )
+            if count > 0:
+                for nth in range(0, count):
+                    ele_list.append(locator.nth(nth))
+            else:
+                raise MangoAutomationError(*ERROR_MSG_0023)
+        try:
+            count = len(ele_list)
+            loc = ele_list[sub - 1] if sub else ele_list[0]
+            try:
+                text = await self.w_get_text(loc)
+            except Exception:
+                text = None
+            return loc, count, text
+        except IndexError:
+            raise MangoAutomationError(*ERROR_MSG_0025, value=(len(ele_list),))
+
+    async def __find_ele(self, page, exp, loc) -> Locator:
+        if exp == ElementExpEnum.LOCATOR.value:
+            try:
+                return eval(f"await page.{loc}")
+            except SyntaxError:
+                try:
+                    return eval(f"page.{loc}")
+                except SyntaxError as error:
+                    self.base_data.log.error(f'WEB自动化查找元素失败-3，类型：{type(error)}，失败详情：{error}')
+                    raise MangoAutomationError(*ERROR_MSG_0022)
+                except NameError as error:
+                    self.base_data.log.error(f'WEB自动化查找元素失败-4，类型：{type(error)}，失败详情：{error}')
+                    raise MangoAutomationError(*ERROR_MSG_0060)
+        elif exp == ElementExpEnum.XPATH.value:
+            return page.locator(f'xpath={loc}')
+        elif exp == ElementExpEnum.CSS.value:
+            return page.locator(loc)
+        elif exp == ElementExpEnum.TEXT.value:
+            return page.get_by_text(loc, exact=True)
+        elif exp == ElementExpEnum.PLACEHOLDER.value:
+            return page.get_by_placeholder(loc)
+        else:
+            raise MangoAutomationError(*ERROR_MSG_0020)

mangoautomation/uidrives/web/_sync_web.py

@@ -0,0 +1,166 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: 
+# @Time   : 2025-04-04 21:42
+# @Author : 毛鹏
+import re
+import traceback
+
+from playwright.sync_api import Locator, TimeoutError, Error
+
+from mangoautomation.mangos import SyncWebAssertion, SyncWebBrowser, SyncWebCustomization, SyncWebElement, \
+    SyncWebDeviceInput, SyncWebPage, ElementMain
+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 *
+
+re = re
+
+
+class SyncWebDevice(SyncWebBrowser,
+                    SyncWebPage,
+                    SyncWebElement,
+                    SyncWebDeviceInput,
+                    SyncWebCustomization):
+
+    def __init__(self, base_data):
+        super().__init__(base_data)
+
+    def open_url(self, is_open: bool = False):
+        if not self.base_data.is_open_url or is_open:
+            self.base_data.log.debug(f'打开url，is_open_url：{self.base_data.is_open_url},url:{self.base_data.url}')
+            self.w_goto(self.base_data.url)
+            self.base_data.is_open_url = True
+
+    def web_action_element(self, name, ope_key, ope_value, ):
+        self.base_data.log.debug(f'操作元素，名称：{name},key:{ope_key},value:{ope_value}')
+        try:
+            ElementMain.s_element(self, ope_key, ope_value)
+        except TimeoutError as error:
+            self.base_data.log.debug(f'WEB自动化操作失败-1，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0011, value=(name,))
+        except Error as error:
+            self.base_data.log.error(f'WEB自动化操作失败-2，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0032, value=(name,))
+        except ValueError as error:
+            self.base_data.log.error(f'WEB自动化操作失败-3，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0012)
+
+    def web_assertion_element(self, name, ope_key, ope_value) -> str:
+        self.base_data.log.debug(f'断言元素，名称：{name},key:{ope_key},value:{ope_value}')
+        is_method = callable(getattr(SyncWebAssertion, ope_key, None))
+        try:
+            if is_method:
+                if ope_value.get('actual', None) is None:
+                    raise MangoAutomationError(*ERROR_MSG_0031, value=(name,))
+                self.base_data.log.debug(f'开始断言-1，方法：{ope_key}，断言值：{ope_value}')
+                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, 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}')
+            raise MangoAutomationError(*ERROR_MSG_0017, value=error.args)
+        except AttributeError as error:
+            self.base_data.log.error(f'WEB自动化断言失败-2，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0048)
+        except ValueError as error:
+            self.base_data.log.error(f'WEB自动化断言失败-3，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0005)
+        except Error as error:
+            self.base_data.log.error(f'WEB自动化断言失败-4，类型：{type(error)}，失败详情：{error}')
+            raise MangoAutomationError(*ERROR_MSG_0052, value=(name,), )
+
+    def web_find_element(self, name, _type, exp, loc, sub, is_iframe) \
+            -> tuple[Locator, int, str] | tuple[list[Locator], int, str]:
+        self.base_data.log.debug(
+            f'查找元素，名称：{name},_type:{_type},exp:{exp},loc:{loc},sub:{sub},is_iframe:{is_iframe}')
+        if is_iframe != StatusEnum.SUCCESS.value:
+            locator: Locator = self.__find_ele(self.base_data.page, exp, loc)
+            try:
+                return self.__element_info(locator, sub)
+            except Error as error:
+                self.base_data.log.debug(
+                    f'WEB自动化查找元素失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+                raise MangoAutomationError(*ERROR_MSG_0041, )
+        else:
+            return self.__is_iframe(_type, exp, loc, sub)
+
+    def __element_info(self, locator: Locator, sub) -> tuple[Locator, int, str]:
+        count = locator.count()
+        if count < 1:
+            raise MangoAutomationError(*ERROR_MSG_0053)
+        if sub is not None:
+            loc_result = locator.nth(sub - 1) if sub else locator
+        else:
+            loc_result = locator.nth(0)
+
+        try:
+            text = self.w_get_text(loc_result)
+        except Exception:
+            text = None
+        return loc_result, count, text
+
+    def ai_element_info(self, locator: Locator) -> tuple[Locator, int, str]:
+        count = locator.count()
+        if count < 1:
+            raise MangoAutomationError(*ERROR_MSG_0053)
+        try:
+            text = self.w_get_text(locator.nth(0))
+        except Exception:
+            text = None
+        return locator.nth(0), count, text
+
+    def __is_iframe(self, _type, exp, loc, sub):
+        ele_list: list[Locator] = []
+        for i in self.base_data.page.frames:
+            locator: Locator = self.__find_ele(i, exp, loc)
+            try:
+                count = locator.count()
+            except Error as error:
+                self.base_data.log.debug(
+                    f'WEB自动化查找元素失败-2，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
+                raise MangoAutomationError(*ERROR_MSG_0041, )
+            if count > 0:
+                for nth in range(0, count):
+                    ele_list.append(locator.nth(nth))
+            else:
+                raise MangoAutomationError(*ERROR_MSG_0023)
+        try:
+            count = len(ele_list)
+            loc = ele_list[sub - 1] if sub else ele_list[0]
+            try:
+                text = self.w_get_text(loc)
+            except Exception:
+                text = None
+            return loc, count, text
+        except IndexError:
+            raise MangoAutomationError(*ERROR_MSG_0025, value=(len(ele_list),))
+
+    def __find_ele(self, page, exp, loc) -> Locator:
+        if exp == ElementExpEnum.LOCATOR.value:
+            try:
+                return eval(f"page.{loc}")
+            except SyntaxError:
+                try:
+                    return eval(f"await page.{loc}")
+                except SyntaxError as error:
+                    self.base_data.log.error(f'WEB自动化查找元素失败-3，类型：{type(error)}，失败详情：{error}')
+                    raise MangoAutomationError(*ERROR_MSG_0022)
+                except NameError as error:
+                    self.base_data.log.error(f'WEB自动化查找元素失败-4，类型：{type(error)}，失败详情：{error}')
+                    raise MangoAutomationError(*ERROR_MSG_0060)
+        elif exp == ElementExpEnum.XPATH.value:
+            return page.locator(f'xpath={loc}')
+        elif exp == ElementExpEnum.CSS.value:
+            return page.locator(loc)
+        elif exp == ElementExpEnum.TEXT.value:
+            return page.get_by_text(loc, exact=True)
+        elif exp == ElementExpEnum.PLACEHOLDER.value:
+            return page.get_by_placeholder(loc)
+        else:
+            raise MangoAutomationError(*ERROR_MSG_0020)

mangoautomation/{uidrive → uidrives}/web/async_web/__init__.py

@@ -14,13 +14,13 @@ from mangotools.mangos import Mango
 from ....enums import ElementExpEnum, ElementOperationEnum
 from ....exceptions import MangoAutomationError
 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
-from ....uidrive.web.async_web._customization import AsyncWebCustomization
-from ....uidrive.web.async_web._element import AsyncWebElement
-from ....uidrive.web.async_web._input_device import AsyncWebDeviceInput
-from ....uidrive.web.async_web._page import AsyncWebPage
+from ....uidrives._base_data import BaseData
+from ....uidrives.web.async_web._assertion import AsyncWebAssertion
+from ....uidrives.web.async_web._browser import AsyncWebBrowser
+from ....uidrives.web.async_web._customization import AsyncWebCustomization
+from ....uidrives.web.async_web._element import AsyncWebElement
+from ....uidrives.web.async_web._input_device import AsyncWebDeviceInput
+from ....uidrives.web.async_web._page import AsyncWebPage
 
 re = re
 __all__ = [
@@ -54,7 +54,7 @@ class AsyncWebDevice(AsyncWebBrowser,
         try:
             await Mango.a_e(self, ope_key, ope_value)
         except TimeoutError as error:
-            self.base_data.log.error(f'WEB自动化操作失败-1，类型：{type(error)}，失败详情：{error}')
+            self.base_data.log.debug(f'WEB自动化操作失败-1，类型：{type(error)}，失败详情：{error}')
             raise MangoAutomationError(*ERROR_MSG_0011, value=(name,))
         except Error as error:
             self.base_data.log.error(f'WEB自动化操作失败-2，类型：{type(error)}，失败详情：{error}')

mangoautomation/{uidrive → uidrives}/web/async_web/_assertion.py

@@ -10,7 +10,7 @@ from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
 from ....exceptions.error_msg import ERROR_MSG_0021
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class AsyncWebAssertion(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/web/async_web/_browser.py

@@ -53,11 +53,11 @@ class AsyncWebBrowser(metaclass=Meta):
             raise MangoAutomationError(*ERROR_MSG_0058, value=(url,))
 
     @async_method_callback('web', '浏览器操作', 2, [
-        MethodModel(n='存储路径', 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, timeout=10000)
+            await self.base_data.page.screenshot(path=os.path.join(self.base_data.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()}')

mangoautomation/{uidrive → uidrives}/web/async_web/_customization.py

@@ -3,8 +3,8 @@
 # @Description: # @Time   : 2023-04-26 22:22
 # @Author : 毛鹏
 
-from ....tools import Meta
 from ..._base_data import BaseData
+from ....tools import Meta
 
 
 class AsyncWebCustomization(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/web/async_web/_element.py

@@ -4,8 +4,8 @@
 # @Author : 毛鹏
 import asyncio
 import os
-import time
 
+import time
 from playwright.async_api import Locator, Error, TimeoutError
 
 from mangotools.decorator import async_method_callback
@@ -25,15 +25,11 @@ 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')])
@@ -46,8 +42,6 @@ class AsyncWebElement(metaclass=Meta):
         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')])
@@ -61,8 +55,6 @@ class AsyncWebElement(metaclass=Meta):
         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),
@@ -87,8 +79,6 @@ class AsyncWebElement(metaclass=Meta):
         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))
 
@@ -237,10 +227,10 @@ class AsyncWebElement(metaclass=Meta):
 
     @async_method_callback('web', '元素操作', 15, [
         MethodModel(f='locating'),
-        MethodModel(n='保存路径', 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)
+        await locating.screenshot(path=os.path.join(self.base_data.download_path, path))
 
     @async_method_callback('web', '元素操作', 20, [
         MethodModel(f='locating1'),

mangoautomation/{uidrive → uidrives}/web/async_web/_input_device.py

@@ -6,7 +6,7 @@
 from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class AsyncWebDeviceInput(metaclass=Meta):

mangoautomation/{uidrive → uidrives}/web/async_web/_page.py

@@ -9,7 +9,7 @@ from playwright.async_api import Locator
 from mangotools.decorator import async_method_callback
 from mangotools.models import MethodModel
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class AsyncWebPage(metaclass=Meta):