mangoautomation 1.1.21__tar.gz → 1.1.22__tar.gz

{mangoautomation-1.1.21/mangoautomation.egg-info → mangoautomation-1.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.1.21
+Version: 1.1.22
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
-Requires-Dist: setuptools>=68.2.0
+Requires-Dist: setuptools==78.1.1
 Requires-Dist: pydantic>=2.9.2
 Requires-Dist: playwright==1.43.0
 Requires-Dist: uiautomation>=2.0.20

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # @Project: 芒果测试平台
 # @Description: 
-# @Time   : 2024-09-07 22:15
+# @Time   : 2025-10-22 09:50
 # @Author : 毛鹏

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/enums/__init__.py

@@ -3,7 +3,6 @@
 # @Description: 
 # @Time   : 2023-04-29 11:23
 # @Author : 毛鹏
-import sys
 
 from ..enums._ui_enum import ElementExpEnum, ElementOperationEnum, DeviceEnum, BrowserTypeEnum, DriveTypeEnum
 

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/exceptions/__init__.py

@@ -3,7 +3,6 @@
 # @Description:
 # @Time   : 2023-07-07 10:14
 # @Author : 毛鹏
-import sys
 
 from ._exceptions import MangoAutomationError
 

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/exceptions/error_msg.py

@@ -14,7 +14,7 @@ ERROR_MSG_0007 = (4007, '安卓设备被关闭，请检查设备')
 ERROR_MSG_0008 = (4008, '浏览器类型不正确，请联系管理员检查')
 ERROR_MSG_0009 = (4009, '浏览器路径不正确，请手动设置一个正确的浏览器路径，现在的路径：{}')
 ERROR_MSG_0010 = (4010, '浏览器被关闭，请不要手动关闭浏览器')
-ERROR_MSG_0011 = (4011, '操作元素【{}】超时，请检查元素可见但是是否可操作或调整定位方式')
+ERROR_MSG_0011 = (4011, '操作元素【{}】超时，请检查元素是否可见，或可以进行对应的操作')
 ERROR_MSG_0012 = (4012, '操作失败，请检查输入的值是否有空字符串，null或不满足传参的值')
 ERROR_MSG_0013 = (
     313, '打开url时超时，分为2个问题：1.启用的浏览器过多，应当减少浏览器并发个数；2.自行查看为啥60秒还未打开：{}')

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/models/__init__.py

@@ -2,7 +2,6 @@
 # @Project: 芒果测试平台
 # @Description:# @Time   : 2023-09-09 23:17
 # @Author : 毛鹏
-import sys
 
 from ..models._ui_model import ElementModel, ElementResultModel, ElementListResultModel
 

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/models/_ui_model.py

@@ -22,7 +22,7 @@ class ElementListModel(BaseModel):
     exp: int
     loc: str
     sub: int | None = None
-    is_iframe: int | None
+    is_iframe: int | None = None
 
 
 class ElementModel(BaseModel):

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/tools/__init__.py

@@ -3,7 +3,6 @@
 # @Description: 
 # @Time   : 2025-04-15 11:54
 # @Author : 毛鹏
-import sys
 
 from ..tools._mate import Meta
 from ..tools._uiautodev import start_uiautodev, stop_uiautodev

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation/tools/_uiautodev.py

@@ -6,8 +6,6 @@
 
 import subprocess
 
-import time
-
 uiautodev_process = None
 
 

mangoautomation-1.1.22/mangoautomation/uidrive/__init__.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: # @Time   : 2023-07-15 11:57
+# @Author : 毛鹏
+from ..uidrives import *
+
+__all__ = [
+    'AsyncElement',
+    'BaseData',
+    'DriverObject',
+    'SyncElement',
+    'AsyncWebDevice',
+    'SyncWebDevice',
+    'AsyncWebCustomization',
+    'SyncWebCustomization',
+]

mangoautomation-1.1.22/mangoautomation/uidrives/__init__.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: # @Time   : 2023-07-15 11:57
+# @Author : 毛鹏
+
+from .web.async_web import AsyncWebDevice, AsyncWebCustomization
+from .web.sync_web import SyncWebDevice, SyncWebCustomization
+from ..uidrives._async_element import AsyncElement
+from ..uidrives._base_data import BaseData
+from ..uidrives._driver_object import DriverObject
+from ..uidrives._sync_element import SyncElement
+
+__all__ = [
+    'AsyncElement',
+    'BaseData',
+    'DriverObject',
+    'SyncElement',
+    'AsyncWebDevice',
+    'SyncWebDevice',
+    'AsyncWebCustomization',
+    'SyncWebCustomization',
+]

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/_async_element.py

@@ -18,8 +18,8 @@ from ..enums import ElementOperationEnum, DriveTypeEnum
 from ..exceptions import MangoAutomationError
 from ..exceptions.error_msg import *
 from ..models import ElementResultModel, ElementModel, ElementListResultModel
-from ..uidrive.android import AndroidDriver
-from ..uidrive.web.async_web import AsyncWebDevice, AsyncWebAssertion
+from ..uidrives.android import AndroidDriver
+from ..uidrives.web.async_web import AsyncWebDevice, AsyncWebAssertion
 
 
 class AsyncElement(AsyncWebDevice, AndroidDriver):
@@ -45,7 +45,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
 
     async def element_main(self,
                            element_model: ElementModel,
-                           element_list_model: list[ElementModel]) -> ElementResultModel:
+                           element_list_model: list[ElementModel] | None = None) -> ElementResultModel:
         self.element_model = element_model
         self.element_list_model = element_list_model
         self.element_result_model = ElementResultModel(
@@ -196,6 +196,10 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
     async def __custom(self):
         for i in self.element_model.custom:
             self.base_data.test_data.set_cache(i.get('key'), self.base_data.test_data.replace(i.get('value')))
+        for i in self.element_model.custom:
+            value = self.base_data.test_data.replace(i.get('value'))
+            self.base_data.log.debug(f'开始执行自定义-1：key: {i.get("key")}, value: {value}')
+            self.base_data.test_data.set_cache(i.get('key'), value)
 
     async def __condition(self):
         error_list = []
@@ -264,7 +268,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                     else:
                         i.v = loc
                 i.v = self.base_data.test_data.replace(i.v)
-
         except AttributeError as error:
             self.base_data.log.debug(
                 f'获取操作值失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
@@ -284,9 +287,8 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             )
             if is_screenshot:
                 file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
-                file_path = os.path.join(self.base_data.screenshot_path, file_name)
-                await self.__error_screenshot(file_path)
-                self.element_result_model.picture_path = file_path
+                await self.__error_screenshot(file_name)
+                self.element_result_model.picture_path = os.path.join(self.base_data.screenshot_path, file_name)
                 self.element_result_model.picture_name = file_name
         except MangoAutomationError as error:
             self.element_result_model.error_message += f'执行过程中发生失败，准备截图时截图失败，失败原因：{error.msg}'

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/_driver_object.py

@@ -6,10 +6,10 @@
 
 from typing import Optional
 
-from ..uidrive.android._new_android import NewAndroid
-from ..uidrive.pc.new_windows import NewWindows
-from ..uidrive.web.async_web._new_browser import AsyncWebNewBrowser
-from ..uidrive.web.sync_web._new_browser import SyncWebNewBrowser
+from ..uidrives.android._new_android import NewAndroid
+from ..uidrives.pc.new_windows import NewWindows
+from ..uidrives.web.async_web._new_browser import AsyncWebNewBrowser
+from ..uidrives.web.sync_web._new_browser import SyncWebNewBrowser
 
 
 class DriverObject:

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/_sync_element.py

@@ -18,8 +18,8 @@ from ..enums import ElementOperationEnum, DriveTypeEnum
 from ..exceptions import MangoAutomationError
 from ..exceptions.error_msg import *
 from ..models import ElementResultModel, ElementModel, ElementListResultModel
-from ..uidrive.android import AndroidDriver
-from ..uidrive.web.sync_web import SyncWebDevice, SyncWebAssertion
+from ..uidrives.android import AndroidDriver
+from ..uidrives.web.sync_web import SyncWebDevice, SyncWebAssertion
 
 
 class SyncElement(SyncWebDevice, AndroidDriver):
@@ -232,7 +232,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
                         loc, ele_quantity, element_text = self.web_find_ele(
-                            **find_params,is_iframe=self.element_model.is_iframe)
+                            **find_params, is_iframe=self.element_model.elements[random_element].is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
                         loc, ele_quantity, element_text = self.a_find_ele(**find_params)
                     else:
@@ -284,9 +284,8 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             )
             if is_screenshot:
                 file_name = f'失败截图-{self.element_model.name}{self.base_data.test_data.get_time_for_min()}.jpg'
-                file_path = os.path.join(self.base_data.screenshot_path, file_name)
-                self.__error_screenshot(file_path)
-                self.element_result_model.picture_path = file_path
+                self.__error_screenshot(file_name)
+                self.element_result_model.picture_path = os.path.join(self.base_data.screenshot_path, file_name)
                 self.element_result_model.picture_name = file_name
         except MangoAutomationError as error:
             self.element_result_model.error_message += f'执行过程中发生失败，准备截图时截图失败，失败原因：{error.msg}'

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/pc/__init__.py

@@ -24,9 +24,9 @@ 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._base_data import BaseData
+from mangoautomation.uidrives.pc.element import WinElement
+from mangoautomation.uidrives.pc.input_device import WinDeviceInput
 
 
 class WinDriver(WinElement, WinDeviceInput):

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/pc/element.py

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

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/pc/input_device.py

@@ -4,7 +4,7 @@
 # @Time   : 2024-11-30 23:44
 # @Author : 毛鹏
 from ...tools import Meta
-from ...uidrive._base_data import BaseData
+from ...uidrives._base_data import BaseData
 
 
 class WinDeviceInput(metaclass=Meta):

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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
@@ -237,10 +237,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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/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):

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/web/sync_web/__init__.py

@@ -14,13 +14,13 @@ from mangotools.mangos import Mango
 from ....enums import ElementExpEnum
 from ....exceptions import MangoAutomationError
 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
-from ....uidrive.web.sync_web._customization import SyncWebCustomization
-from ....uidrive.web.sync_web._element import SyncWebElement
-from ....uidrive.web.sync_web._input_device import SyncWebDeviceInput
-from ....uidrive.web.sync_web._page import SyncWebPage
+from ....uidrives._base_data import BaseData
+from ....uidrives.web.sync_web._assertion import SyncWebAssertion
+from ....uidrives.web.sync_web._browser import SyncWebBrowser
+from ....uidrives.web.sync_web._customization import SyncWebCustomization
+from ....uidrives.web.sync_web._element import SyncWebElement
+from ....uidrives.web.sync_web._input_device import SyncWebDeviceInput
+from ....uidrives.web.sync_web._page import SyncWebPage
 
 re = re
 __all__ = [
@@ -54,7 +54,7 @@ class SyncWebDevice(SyncWebBrowser,
         try:
             Mango.s_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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/web/sync_web/_assertion.py

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

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/web/sync_web/_browser.py

@@ -15,7 +15,7 @@ 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 ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebBrowser(metaclass=Meta):
@@ -53,11 +53,11 @@ class SyncWebBrowser(metaclass=Meta):
             raise MangoAutomationError(*ERROR_MSG_0058, value=(url,))
 
     @sync_method_callback('web', '浏览器操作', 2, [
-        MethodModel(n='保存路径', f='path', p='请输入截图保存路径', d=True)])
+        MethodModel(n='保存路径', f='path', p='请输入截图名称', d=True)])
     def w_screenshot(self, path: str):
         """整个页面截图"""
         try:
-            self.base_data.page.screenshot(path=path, full_page=True, timeout=10000)
+            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-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/web/sync_web/_customization.py

@@ -4,7 +4,7 @@
 # @Author : 毛鹏
 
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebCustomization(metaclass=Meta):

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/web/sync_web/_element.py

@@ -12,7 +12,7 @@ from mangotools.models import MethodModel
 from ....exceptions import MangoAutomationError
 from ....exceptions.error_msg import ERROR_MSG_0024, ERROR_MSG_0056
 from ....tools import Meta
-from ....uidrive._base_data import BaseData
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebElement(metaclass=Meta):
@@ -237,10 +237,10 @@ class SyncWebElement(metaclass=Meta):
 
     @sync_method_callback('web', '元素操作', 15, [
         MethodModel(f='locating'),
-        MethodModel(n='截图路径', f='path', p='请输入截图保存路径', d=True)])
+        MethodModel(n='截图路径', f='path', p='请输入截图名称', d=True)])
     def w_ele_screenshot(self, locating: Locator, path: str):
         """元素截图"""
-        locating.screenshot(path=path)
+        locating.screenshot(path=os.path.join(self.base_data.download_path, path))
 
     @sync_method_callback('web', '元素操作', 20, [
         MethodModel(f='locating1'),

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/web/sync_web/_input_device.py

@@ -5,7 +5,7 @@
 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 SyncWebDeviceInput(metaclass=Meta):

{mangoautomation-1.1.21/mangoautomation/uidrive → mangoautomation-1.1.22/mangoautomation/uidrives}/web/sync_web/_page.py

@@ -5,10 +5,10 @@
 import time
 from playwright.sync_api import Locator
 
-from ....tools import Meta
-from ....uidrive._base_data import BaseData
 from mangotools.decorator import sync_method_callback
 from mangotools.models import MethodModel
+from ....tools import Meta
+from ....uidrives._base_data import BaseData
 
 
 class SyncWebPage(metaclass=Meta):

{mangoautomation-1.1.21 → mangoautomation-1.1.22/mangoautomation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.1.21
+Version: 1.1.22
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE
-Requires-Dist: setuptools>=68.2.0
+Requires-Dist: setuptools==78.1.1
 Requires-Dist: pydantic>=2.9.2
 Requires-Dist: playwright==1.43.0
 Requires-Dist: uiautomation>=2.0.20

mangoautomation-1.1.22/mangoautomation.egg-info/SOURCES.txt

@@ -0,0 +1,63 @@
+LICENSE
+MANIFEST.in
+README.md
+setup.py
+mangoautomation/__init__.py
+mangoautomation.egg-info/PKG-INFO
+mangoautomation.egg-info/SOURCES.txt
+mangoautomation.egg-info/dependency_links.txt
+mangoautomation.egg-info/requires.txt
+mangoautomation.egg-info/top_level.txt
+mangoautomation/enums/__init__.py
+mangoautomation/enums/_base_enum.py
+mangoautomation/enums/_ui_enum.py
+mangoautomation/exceptions/__init__.py
+mangoautomation/exceptions/_exceptions.py
+mangoautomation/exceptions/error_msg.py
+mangoautomation/models/__init__.py
+mangoautomation/models/_ui_model.py
+mangoautomation/tools/__init__.py
+mangoautomation/tools/_mate.py
+mangoautomation/tools/_uiautodev.py
+mangoautomation/uidrive/__init__.py
+mangoautomation/uidrives/__init__.py
+mangoautomation/uidrives/_async_element.py
+mangoautomation/uidrives/_base_data.py
+mangoautomation/uidrives/_driver_object.py
+mangoautomation/uidrives/_sync_element.py
+mangoautomation/uidrives/android/__init__.py
+mangoautomation/uidrives/android/_application.py
+mangoautomation/uidrives/android/_assertion.py
+mangoautomation/uidrives/android/_customization.py
+mangoautomation/uidrives/android/_element.py
+mangoautomation/uidrives/android/_equipment.py
+mangoautomation/uidrives/android/_new_android.py
+mangoautomation/uidrives/android/_page.py
+mangoautomation/uidrives/ios/__init__.py
+mangoautomation/uidrives/pc/__init__.py
+mangoautomation/uidrives/pc/assertion.py
+mangoautomation/uidrives/pc/customization.py
+mangoautomation/uidrives/pc/element.py
+mangoautomation/uidrives/pc/input_device.py
+mangoautomation/uidrives/pc/new_windows.py
+mangoautomation/uidrives/web/__init__.py
+mangoautomation/uidrives/web/async_web/__init__.py
+mangoautomation/uidrives/web/async_web/_assertion.py
+mangoautomation/uidrives/web/async_web/_browser.py
+mangoautomation/uidrives/web/async_web/_customization.py
+mangoautomation/uidrives/web/async_web/_element.py
+mangoautomation/uidrives/web/async_web/_input_device.py
+mangoautomation/uidrives/web/async_web/_new_browser.py
+mangoautomation/uidrives/web/async_web/_page.py
+mangoautomation/uidrives/web/sync_web/__init__.py
+mangoautomation/uidrives/web/sync_web/_assertion.py
+mangoautomation/uidrives/web/sync_web/_browser.py
+mangoautomation/uidrives/web/sync_web/_customization.py
+mangoautomation/uidrives/web/sync_web/_element.py
+mangoautomation/uidrives/web/sync_web/_input_device.py
+mangoautomation/uidrives/web/sync_web/_new_browser.py
+mangoautomation/uidrives/web/sync_web/_page.py
+tests/__init__.py
+tests/get_ope.py
+tests/test_ui_and.py
+tests/test_ui_web.py

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/mangoautomation.egg-info/requires.txt

@@ -1,4 +1,4 @@
-setuptools>=68.2.0
+setuptools==78.1.1
 pydantic>=2.9.2
 playwright==1.43.0
 uiautomation>=2.0.20

{mangoautomation-1.1.21 → mangoautomation-1.1.22}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.1.21'
+__version__ = '1.1.22'
 
 with open("README.md", "r", encoding='utf-8') as fh:
     long_description = fh.read()
@@ -16,7 +16,7 @@ setup(
     url='https://gitee.com/mao-peng/testkit',
     packages=find_packages(),
     install_requires=[
-        'setuptools>=68.2.0',
+        "setuptools==78.1.1",
         'pydantic>=2.9.2',
         'playwright==1.43.0',
         'uiautomation>=2.0.20',

mangoautomation-1.1.22/tests/test_ui_web.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: 
+# @Time   : 2025-04-12 17:31
+# @Author : 毛鹏
+import asyncio
+import unittest
+
+from mangoautomation.models import ElementModel
+from mangoautomation.uidrive import AsyncElement, BaseData, DriverObject, SyncElement
+from mangotools.data_processor import DataProcessor
+from mangotools.log_collector import set_log
+
+log = set_log('D:\code\mango_automation\logs')
+test_data = DataProcessor()
+element_model = ElementModel(**{
+    "id": 3,
+    "type": 0,
+    "name": "设置",
+    "elements": [
+        {
+            "exp": 0,
+            "loc": "//span[@name=\"tj_settingicon\"]",
+            "sub": None,
+            "is_iframe": 0
+        }
+    ],
+    "sleep": None,
+    "ope_key": "w_hover",
+    "ope_value": [
+        {
+            "f": "locating",
+            "n": None,
+            "p": None,
+            "d": False,
+            "v": ""
+        }
+    ],
+    "sql_execute": None,
+    "custom": None,
+    "condition_value": None,
+    "func": None
+})
+
+
+class TestUi(unittest.IsolatedAsyncioTestCase):
+    async def test_a(self):
+        driver_object = DriverObject(log, True)
+        driver_object.set_web(0, r"C:\Program Files\Google\Chrome\Application\chrome.exe")
+        base_data = BaseData(test_data, log)
+        base_data.log = log
+        base_data.url = 'https://www.baidu.com/'
+
+        base_data.context, base_data.page = await driver_object.web.new_web_page()
+        element = AsyncElement(base_data, 0)
+        await element.open_url()
+        await asyncio.sleep(5)
+        await element.element_main(element_model, )
+        assert element.element_result_model.elements[0].element_text == '设置'
+
+
+class TestUi2(unittest.TestCase):
+
+    def test_s(self):
+        driver_object = DriverObject(log)
+        driver_object.set_web(0, r"C:\Program Files\Google\Chrome\Application\chrome.exe")
+        base_data = BaseData(test_data, log)
+        base_data.url = 'https://www.baidu.com/'
+        base_data.context, base_data.page = driver_object.web.new_web_page()
+        element = SyncElement(base_data, 0)
+        element.open_url()
+        element.element_main(element_model, )
+        assert element.element_result_model.elements[0].element_text == '设置'

mangoautomation-1.1.21/mangoautomation/uidrive/__init__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Project: 芒果测试平台
-# @Description: # @Time   : 2023-07-15 11:57
-# @Author : 毛鹏
-import sys
-
-from ..uidrive._async_element import AsyncElement
-from ..uidrive._base_data import BaseData
-from ..uidrive._driver_object import DriverObject
-from ..uidrive._sync_element import SyncElement
-
-
-__all__ = [
-    'AsyncElement',
-    'BaseData',
-    'DriverObject',
-    'SyncElement',
-]

mangoautomation-1.1.21/mangoautomation.egg-info/SOURCES.txt

@@ -1,62 +0,0 @@
-LICENSE
-MANIFEST.in
-README.md
-setup.py
-mangoautomation/__init__.py
-mangoautomation.egg-info/PKG-INFO
-mangoautomation.egg-info/SOURCES.txt
-mangoautomation.egg-info/dependency_links.txt
-mangoautomation.egg-info/requires.txt
-mangoautomation.egg-info/top_level.txt
-mangoautomation/enums/__init__.py
-mangoautomation/enums/_base_enum.py
-mangoautomation/enums/_ui_enum.py
-mangoautomation/exceptions/__init__.py
-mangoautomation/exceptions/_exceptions.py
-mangoautomation/exceptions/error_msg.py
-mangoautomation/models/__init__.py
-mangoautomation/models/_ui_model.py
-mangoautomation/tools/__init__.py
-mangoautomation/tools/_mate.py
-mangoautomation/tools/_uiautodev.py
-mangoautomation/uidrive/__init__.py
-mangoautomation/uidrive/_async_element.py
-mangoautomation/uidrive/_base_data.py
-mangoautomation/uidrive/_driver_object.py
-mangoautomation/uidrive/_sync_element.py
-mangoautomation/uidrive/android/__init__.py
-mangoautomation/uidrive/android/_application.py
-mangoautomation/uidrive/android/_assertion.py
-mangoautomation/uidrive/android/_customization.py
-mangoautomation/uidrive/android/_element.py
-mangoautomation/uidrive/android/_equipment.py
-mangoautomation/uidrive/android/_new_android.py
-mangoautomation/uidrive/android/_page.py
-mangoautomation/uidrive/ios/__init__.py
-mangoautomation/uidrive/pc/__init__.py
-mangoautomation/uidrive/pc/assertion.py
-mangoautomation/uidrive/pc/customization.py
-mangoautomation/uidrive/pc/element.py
-mangoautomation/uidrive/pc/input_device.py
-mangoautomation/uidrive/pc/new_windows.py
-mangoautomation/uidrive/web/__init__.py
-mangoautomation/uidrive/web/async_web/__init__.py
-mangoautomation/uidrive/web/async_web/_assertion.py
-mangoautomation/uidrive/web/async_web/_browser.py
-mangoautomation/uidrive/web/async_web/_customization.py
-mangoautomation/uidrive/web/async_web/_element.py
-mangoautomation/uidrive/web/async_web/_input_device.py
-mangoautomation/uidrive/web/async_web/_new_browser.py
-mangoautomation/uidrive/web/async_web/_page.py
-mangoautomation/uidrive/web/sync_web/__init__.py
-mangoautomation/uidrive/web/sync_web/_assertion.py
-mangoautomation/uidrive/web/sync_web/_browser.py
-mangoautomation/uidrive/web/sync_web/_customization.py
-mangoautomation/uidrive/web/sync_web/_element.py
-mangoautomation/uidrive/web/sync_web/_input_device.py
-mangoautomation/uidrive/web/sync_web/_new_browser.py
-mangoautomation/uidrive/web/sync_web/_page.py
-tests/__init__.py
-tests/get_ope.py
-tests/test_ui_and.py
-tests/test_ui_web.py

mangoautomation-1.1.21/tests/test_ui_web.py

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Project: 芒果测试平台
-# @Description: 
-# @Time   : 2025-04-12 17:31
-# @Author : 毛鹏
-import asyncio
-import unittest
-
-from mangoautomation.models import ElementModel
-from mangoautomation.uidrive import AsyncElement, BaseData, DriverObject, SyncElement
-from mangotools.data_processor import DataProcessor
-from mangotools.log_collector import set_log
-
-log = set_log('D:\GitCode\mango_automation\logs')
-test_data = DataProcessor()
-element_model_1 = ElementModel(**{
-    "id": 9,
-    "type": 0,
-    "name": "搜索结果",
-    "loc": "get_by_role(\"link\", name=\"芒果自动化测试平台: 芒果测试平台是UI和API的自动化测试\")",
-    "exp": 2,
-    "sleep": None,
-    "sub": None,
-    "is_iframe": 0,
-    "ope_key": "w_open_new_tab_and_switch",
-    "ope_value": [
-        {
-            "f": "locating",
-            "p": None,
-            "d": False,
-            "v": ""
-        }
-    ],
-    "key_list": None,
-    "sql": None,
-    "key": None,
-    "value": None
-})
-element_model_2 = ElementModel(**{
-    "id": 10, "type": 2, "name": "结果内容", "loc": "get_by_role(\"heading\", name=\"芒果测试平台是集UI，API\")",
-    "exp": 0,
-    "sleep": None, "sub": None, "is_iframe": 0, "ope_key": "w_get_text",
-    "ope_value": [{"f": "locating", "p": None, "d": False, "v": ""},
-                  {"f": "set_cache_key", "p": None, "d": True, "v": "结果内容"}]
-})
-
-
-class TestUi(unittest.IsolatedAsyncioTestCase):
-    async def test_a(self):
-        driver_object = DriverObject(True)
-        driver_object.set_web(0, r"C:\Program Files\Google\Chrome\Application\chrome.exe")
-        base_data = BaseData(test_data, log)
-        base_data.log = log
-        base_data.url = 'https://www.baidu.com/'
-
-        base_data.context, base_data.page = await driver_object.web.new_web_page()
-        element = AsyncElement(base_data, element_model_1, 0)
-        await element.open_url()
-        await asyncio.sleep(5)
-        await element.element_main()
-        print(element.element_result_model.model_dump())
-        element = AsyncElement(base_data, element_model_2, 0)
-        await element.element_main()
-        print(element.element_result_model.model_dump())
-
-
-class TestUi2(unittest.TestCase):
-
-    def test_s(self):
-        driver_object = DriverObject()
-        driver_object.set_web(0, r"C:\Program Files\Google\Chrome\Application\chrome.exe")
-        base_data = BaseData(test_data, log)
-        base_data.url = 'https://www.baidu.com/'
-        base_data.context, base_data.page = driver_object.web.new_web_page()
-        element = SyncElement(base_data, element_model_1, 0)
-        element.open_url()
-        element.element_main()