mangoautomation 1.0.60__tar.gz → 1.1.21__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.60
+Version: 1.1.21
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -18,14 +18,6 @@ Requires-Dist: uiautomator2>=3.2.5
 Requires-Dist: mangotools>=1.1.42
 Requires-Dist: adbutils~=2.8.9
 Requires-Dist: uiautodev>=0.9.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 # testkit
 

{mangoautomation-1.0.60 → mangoautomation-1.1.21}/mangoautomation/enums/_ui_enum.py

@@ -73,10 +73,12 @@ class ElementOperationEnum(BaseEnum):
     ASS = 1
     SQL = 2
     CUSTOM = 3
+    CONDITION = 4
+    PYTHON_CODE = 5
 
     @classmethod
     def obj(cls):
-        return {0: "操作", 1: "断言", 2: "SQL", 3: "参数"}
+        return {0: "元素操作", 1: "断言操作", 2: "SQL变量", 3: "自定义变量", 4: "条件判断", 5: "python代码"}
 
 
 class DeviceEnum(BaseEnum):

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

@@ -38,8 +38,8 @@ ERROR_MSG_0029 = (4029, '页面无元素【{}】，表达式：{}')
 ERROR_MSG_0030 = (4030, '断言时没有找到元素')
 ERROR_MSG_0031 = (4031, '元素未找到准备进行断言获取元素文本类容异常')
 ERROR_MSG_0032 = (4032, '元素【{}】的元素表达式定位有多个，或其他元素异常，请检查元素是否可用')
-ERROR_MSG_0036 = (4036, '公共参数sql在数据库中查询不到结果，sql：{}')
-ERROR_MSG_0038 = (4038, '公共参数的sql_key不是列表')
+ERROR_MSG_0036 = (4036, 'sql参数在数据库中查询不到结果，sql：{}')
+ERROR_MSG_0038 = (4038, 'sql参数的sql_key不是列表')
 ERROR_MSG_0040 = (
     340, '设备启动超时！请检查设备是否开启了：文件传输模式、开发者模式、usb调试，开启后请重新连接电脑，设备号：{}')
 ERROR_MSG_0041 = (4041, '查找页面元素【{}】时直接失败，报错信息：{}')

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

@@ -6,6 +6,7 @@
 
 from pydantic import BaseModel
 
+from mangoautomation.enums import ElementOperationEnum
 from mangotools.models import MysqlConingModel, MethodModel
 
 
@@ -18,24 +19,24 @@ class EnvironmentConfigModel(BaseModel):
 
 
 class ElementListModel(BaseModel):
-    exp: int | None
-    loc: str | None
+    exp: int
+    loc: str
+    sub: int | None = None
+    is_iframe: int | None
 
 
 class ElementModel(BaseModel):
     id: int
-    type: int
+    type: ElementOperationEnum
     name: str | None
     elements: list[ElementListModel] = []
     sleep: int | None
-    sub: int | None
-    is_iframe: int | None
     ope_key: str | None
-    ope_value: list[MethodModel] | None
-    key_list: list | None = None
-    sql: str | None = None
-    key: str | None = None
-    value: str | None = None
+    ope_value: list[MethodModel] | None = None
+    sql_execute: list[dict] | None = None
+    custom: list[dict] | None = None
+    condition_value: dict | None = None
+    func: str | None = None
 
 
 class ElementListResultModel(BaseModel):
@@ -43,25 +44,27 @@ class ElementListResultModel(BaseModel):
     exp: int | None = None
     ele_quantity: int = 0
     element_text: str | None = None
+    sub: int | None = None
+    is_iframe: int | None
 
 
 class ElementResultModel(BaseModel):
     id: int
     name: str | None = None
     sleep: int | None = None
-    sub: int | None = None
 
     type: int
     ope_key: str | None = None
-    ope_value: dict = {}
+    ope_value: list[MethodModel] | None = None
+    sql_execute: list[dict] | None = None
+    custom: list[dict] | None = None
+    condition_value: dict | None = None
     ass_msg: str | None = None
-    sql: str | None = None
-    key_list: str | None = None
-    key: str | None = None
-    value: str | None = None
 
     elements: list[ElementListResultModel] = []
     status: int = 0
     error_message: str | None = None
     picture_path: str | None = None
     picture_name: str | None = None
+
+    next_node_id: int | None = None

{mangoautomation-1.0.60 → mangoautomation-1.1.21}/mangoautomation/uidrive/_async_element.py

@@ -28,8 +28,9 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         super().__init__(base_data)
         self.drive_type = drive_type
         self.element_model: Optional[ElementModel | None] = None
-        self.element_data: dict | None = None
         self.element_result_model: Optional[ElementResultModel | None] = None
+        self.element_list_model: list[ElementModel] = []
+        self.test_data = self.base_data.test_data
 
     async def open_device(self, is_open: bool = False):
         if self.drive_type == DriveTypeEnum.WEB.value:
@@ -42,21 +43,20 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             self.base_data.log.debug(f'不存在这个类型，如果是非管理员看到这种提示，请联系管理员')
             raise Exception('不存在的设备类型')
 
-    async def element_main(self, element_model: ElementModel, element_data: dict | None = None) -> ElementResultModel:
+    async def element_main(self,
+                           element_model: ElementModel,
+                           element_list_model: list[ElementModel]) -> ElementResultModel:
         self.element_model = element_model
-        self.element_data = element_data
+        self.element_list_model = element_list_model
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
             name=self.element_model.name,
-            sub=self.element_model.sub,
             sleep=self.element_model.sleep,
 
-            type=self.element_model.type,
+            type=self.element_model.type.value,
             ope_key=self.element_model.ope_key,
-            sql=self.element_model.sql,
-            key_list=self.element_model.key_list,
-            key=self.element_model.key,
-            value=self.element_model.value,
+            sql_execute=self.element_model.sql_execute,
+            custom=self.element_model.custom,
 
             status=StatusEnum.FAIL.value,
         )
@@ -91,14 +91,18 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
     @async_retry()
     async def __main(self):
         self.base_data.verify_equipment(self.drive_type)
-        if self.element_model.type == ElementOperationEnum.OPE.value:
+        if self.element_model.type == ElementOperationEnum.OPE:
             await self.__ope()
-        elif self.element_model.type == ElementOperationEnum.ASS.value:
+        elif self.element_model.type == ElementOperationEnum.ASS:
             await self.__ass()
-        elif self.element_model.type == ElementOperationEnum.SQL.value:
+        elif self.element_model.type == ElementOperationEnum.SQL:
             await self.__sql()
-        elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
+        elif self.element_model.type == ElementOperationEnum.CUSTOM:
             await self.__custom()
+        elif self.element_model.type == ElementOperationEnum.CONDITION:
+            await self.__condition()
+        elif self.element_model.type == ElementOperationEnum.PYTHON_CODE:
+            await self.__python_code()
         else:
             raise MangoAutomationError(*ERROR_MSG_0015)
 
@@ -106,11 +110,9 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         try:
             for i in self.element_model.elements:
                 i.loc = self.base_data.test_data.replace(i.loc)
-                self.element_result_model.elements.append(ElementListResultModel(exp=i.exp, loc=i.loc))
+                i.sub = self.base_data.test_data.replace(i.sub)
             self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
             self.element_result_model.sleep = self.element_model.sleep
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-            self.element_result_model.sub = self.element_model.sub
 
         except MangoAutomationError as error:
             self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
@@ -144,62 +146,76 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             )
         else:
             pass
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
-    async def __ass(self):
+    async def __ass(self, _ope_value: dict | None = None):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value(True)
+        ope_value = {i.f: i.v for i in self.element_model.ope_value}
+        if _ope_value is not None:
+            ope_value.update(_ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = await self.web_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             elif self.drive_type == DriveTypeEnum.ANDROID.value:
                 self.element_result_model.ass_msg = self.a_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             else:
                 pass
         except MangoAutomationError as error:
             self.element_result_model.ass_msg = error.msg
             raise error
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
     async def __sql(self):
-        if not self.element_data:
-            sql = self.base_data.test_data.replace(self.element_model.sql)
-            key_list = self.element_model.key_list
-        else:
-            sql = self.base_data.test_data.replace(self.element_data.get('sql'))
-            key_list = self.element_data.get('key_list')
-        if self.base_data.mysql_connect:
+        async def run(sql, key_list):
             result_list: list[dict] = self.base_data.mysql_connect.condition_execute(sql)
-            if isinstance(result_list, list):
-                for result in result_list:
-                    try:
-                        for value, key in zip(result, key_list):
-                            self.base_data.test_data.set_cache(key, result.get(value))
-                    except SyntaxError as error:
-                        self.base_data.log.debug(
-                            f'SQL执行失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                        raise MangoAutomationError(*ERROR_MSG_0038)
+            self.base_data.log.debug(f'sql参数->key:{sql}，value:{result_list}')
+            if not isinstance(result_list, list) and not len(result_list) > 0:
+                raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql_execute,))
+            self.base_data.test_data.set_sql_cache(key_list, result_list[0])
 
-                if not result_list:
-                    raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql,))
+        if self.base_data.mysql_connect:
+            for i in self.element_model.sql_execute:
+                await run(i.get('sql'), i.get('key_list'))
 
     async def __custom(self):
-        if not self.element_data:
-            key = self.element_model.key
-            value = self.element_model.value
-        else:
-            key = self.element_data.get('key')
-            value = self.element_data.get('value')
-        self.base_data.test_data.set_cache(key, self.base_data.test_data.replace(value))
+        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')))
+
+    async def __condition(self):
+        error_list = []
+        for i in self.element_list_model:
+            try:
+                condition_value = self.base_data.test_data.replace(i.condition_value)
+                self.base_data.log.debug(f'执行条件判断数据：{self.element_model.id}，{condition_value}')
+                await self.__ass(condition_value)
+                self.element_result_model.next_node_id = i.id
+                return
+            except Exception as error:
+                self.base_data.log.debug(f'节点判断中-错误：{error}，明细：{traceback.print_exc()}')
+                error_list.append(error)
+        raise error_list[0]
+
+    async def __python_code(self):
+        self.base_data.log.debug(f'执行python函数：{self.element_model.func}')
+        global_namespace = {}
+        exec(self.element_model.func, global_namespace)
+        global_namespace['func'](self)
 
     async def __ope_value(self, is_ass: bool = False):
         try:
@@ -212,17 +228,34 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                         '_type': self.element_model.type,
                         'exp': self.element_model.elements[random_element].exp,
                         'loc': self.element_model.elements[random_element].loc,
-                        'sub': self.element_model.sub
+                        'sub': self.element_model.elements[random_element].sub
                     }
                     if self.drive_type == DriveTypeEnum.WEB.value:
                         loc, ele_quantity, element_text = await 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:
                         loc, ele_quantity, element_text = None, 0, None
-                    self.element_result_model.elements[random_element].ele_quantity = ele_quantity
-                    self.element_result_model.elements[random_element].element_text = element_text
+                    new_element = ElementListResultModel(
+                        exp=self.element_model.elements[random_element].exp,
+                        loc=self.element_model.elements[random_element].loc,
+                        sub=self.element_model.elements[random_element].sub,
+                        ele_quantity=ele_quantity,
+                        element_text=element_text,
+                        is_iframe=self.element_model.elements[random_element].is_iframe
+                    )
+
+                    element_exists = any(
+                        existing.exp == new_element.exp and
+                        existing.loc == new_element.loc and
+                        existing.sub == new_element.sub and
+                        existing.is_iframe == new_element.is_iframe
+                        for existing in self.element_result_model.elements
+                    )
+
+                    if not element_exists:
+                        self.element_result_model.elements.append(new_element)
                     if is_ass:
                         if callable(getattr(AsyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
@@ -230,10 +263,6 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
                             i.v = element_text
                     else:
                         i.v = loc
-                elif self.element_data:
-                    for f, v in self.element_data.items():
-                        if f == i.f:
-                            i.v = self.base_data.test_data.replace(v)
                 i.v = self.base_data.test_data.replace(i.v)
 
         except AttributeError as error:

{mangoautomation-1.0.60 → mangoautomation-1.1.21}/mangoautomation/uidrive/_sync_element.py

@@ -28,8 +28,9 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         super().__init__(base_data)
         self.drive_type = drive_type
         self.element_model: Optional[ElementModel | None] = None
-        self.element_data: dict | None = None
         self.element_result_model: Optional[ElementResultModel | None] = None
+        self.element_list_model: Optional[list[ElementModel] | None] = None
+        self.test_data = self.base_data.test_data
 
     def open_device(self, is_open: bool = False):
         if self.drive_type == DriveTypeEnum.WEB.value:
@@ -42,21 +43,20 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             self.base_data.log.error(f'不存在这个类型，如果是非管理员看到这种提示，请联系管理员')
             raise Exception('不存在的设备类型')
 
-    def element_main(self, element_model: ElementModel, element_data: dict | None = None) -> ElementResultModel:
+    def element_main(self,
+                     element_model: ElementModel,
+                     element_list_model: list[ElementModel] | None = None) -> ElementResultModel:
         self.element_model = element_model
-        self.element_data = element_data
+        self.element_list_model = element_list_model
         self.element_result_model = ElementResultModel(
             id=self.element_model.id,
             name=self.element_model.name,
-            sub=self.element_model.sub,
             sleep=self.element_model.sleep,
 
-            type=self.element_model.type,
+            type=self.element_model.type.value,
             ope_key=self.element_model.ope_key,
-            sql=self.element_model.sql,
-            key_list=self.element_model.key_list,
-            key=self.element_model.key,
-            value=self.element_model.value,
+            sql_execute=self.element_model.sql_execute,
+            custom=self.element_model.custom,
 
             status=StatusEnum.FAIL.value,
         )
@@ -91,14 +91,18 @@ class SyncElement(SyncWebDevice, AndroidDriver):
     @sync_retry()
     def __main(self):
         self.base_data.verify_equipment(self.drive_type)
-        if self.element_model.type == ElementOperationEnum.OPE.value:
+        if self.element_model.type == ElementOperationEnum.OPE:
             self.__ope()
-        elif self.element_model.type == ElementOperationEnum.ASS.value:
+        elif self.element_model.type == ElementOperationEnum.ASS:
             self.__ass()
-        elif self.element_model.type == ElementOperationEnum.SQL.value:
+        elif self.element_model.type == ElementOperationEnum.SQL:
             self.__sql()
-        elif self.element_model.type == ElementOperationEnum.CUSTOM.value:
+        elif self.element_model.type == ElementOperationEnum.CUSTOM:
             self.__custom()
+        elif self.element_model.type == ElementOperationEnum.CONDITION:
+            self.__condition()
+        elif self.element_model.type == ElementOperationEnum.PYTHON_CODE:
+            self.__python_code()
         else:
             raise MangoAutomationError(*ERROR_MSG_0015)
 
@@ -106,11 +110,9 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         try:
             for i in self.element_model.elements:
                 i.loc = self.base_data.test_data.replace(i.loc)
-                self.element_result_model.elements.append(ElementListResultModel(exp=i.exp, loc=i.loc))
+                i.sub = self.base_data.test_data.replace(i.sub)
             self.element_model.sleep = self.base_data.test_data.replace(self.element_model.sleep)
             self.element_result_model.sleep = self.element_model.sleep
-            self.element_model.sub = self.base_data.test_data.replace(self.element_model.sub)
-            self.element_result_model.sub = self.element_model.sub
 
         except MangoAutomationError as error:
             self.base_data.log.error(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
@@ -144,62 +146,76 @@ class SyncElement(SyncWebDevice, AndroidDriver):
             )
         else:
             pass
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
-    def __ass(self):
+    async def __ass(self, _ope_value: dict | None = None):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value(True)
+        ope_value = {i.f: i.v for i in self.element_model.ope_value}
+        if _ope_value is not None:
+            ope_value.update(_ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = self.web_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             elif self.drive_type == DriveTypeEnum.ANDROID.value:
                 self.element_result_model.ass_msg = self.a_assertion_element(
                     self.element_model.name,
                     self.element_model.ope_key,
-                    {i.f: i.v for i in self.element_model.ope_value}
+                    ope_value
                 )
             else:
                 pass
         except MangoAutomationError as error:
             self.element_result_model.ass_msg = error.msg
             raise error
-        self.element_result_model.ope_value = {i.f: i.v for i in self.element_model.ope_value if i.d}
+        self.element_result_model.ope_value = self.element_model.ope_value
+        for i in self.element_result_model.ope_value:
+            if not isinstance(i.v, str):
+                i.v = str(i.v)
 
     def __sql(self):
-        if not self.element_data:
-            sql = self.base_data.test_data.replace(self.element_model.sql)
-            key_list = self.element_model.key_list
-        else:
-            sql = self.base_data.test_data.replace(self.element_data.get('sql'))
-            key_list = self.element_data.get('key_list')
-        if self.base_data.mysql_connect:
+        def run(sql, key_list):
             result_list: list[dict] = self.base_data.mysql_connect.condition_execute(sql)
-            if isinstance(result_list, list):
-                for result in result_list:
-                    try:
-                        for value, key in zip(result, key_list):
-                            self.base_data.test_data.set_cache(key, result.get(value))
-                    except SyntaxError as error:
-                        self.base_data.log.debug(
-                            f'SQL执行失败-1，类型：{type(error)}，失败详情：{error}，失败明细：{traceback.format_exc()}')
-                        raise MangoAutomationError(*ERROR_MSG_0038)
+            self.base_data.log.debug(f'sql参数->key:{sql}，value:{result_list}')
+            if not isinstance(result_list, list) and not len(result_list) > 0:
+                raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql_execute,))
+            self.base_data.test_data.set_sql_cache(key_list, result_list[0])
 
-                if not result_list:
-                    raise MangoAutomationError(*ERROR_MSG_0036, value=(self.element_model.sql,))
+        if self.base_data.mysql_connect:
+            for i in self.element_model.sql_execute:
+                run(i.get('sql'), i.get('key_list'))
 
     def __custom(self):
-        if not self.element_data:
-            key = self.element_model.key
-            value = self.element_model.value
-        else:
-            key = self.element_data.get('key')
-            value = self.element_data.get('value')
-        self.base_data.test_data.set_cache(key, self.base_data.test_data.replace(value))
+        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')))
+
+    def __condition(self):
+        error_list = []
+        for i in self.element_list_model:
+            try:
+                condition_value = self.base_data.test_data.replace(i.condition_value)
+                self.base_data.log.debug(f'执行条件判断数据：{self.element_model.id}，{condition_value}')
+                self.__ass(condition_value)
+                self.element_result_model.next_node_id = i.id
+                return
+            except Exception as error:
+                self.base_data.log.debug(f'节点判断中-错误：{error}，明细：{traceback.print_exc()}')
+                error_list.append(error)
+        raise error_list[0]
+
+    def __python_code(self):
+        self.base_data.log.debug(f'执行python函数：{self.element_model.func}')
+        global_namespace = {}
+        exec(self.element_model.func, global_namespace)
+        global_namespace['func'](self)
 
     def __ope_value(self, is_ass: bool = False):
         try:
@@ -212,17 +228,34 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                         '_type': self.element_model.type,
                         'exp': self.element_model.elements[random_element].exp,
                         'loc': self.element_model.elements[random_element].loc,
-                        'sub': self.element_model.sub
+                        'sub': self.element_model.elements[random_element].sub
                     }
                     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)
+                        loc, ele_quantity, element_text = self.web_find_ele(
+                            **find_params,is_iframe=self.element_model.is_iframe)
                     elif self.drive_type == DriveTypeEnum.ANDROID.value:
                         loc, ele_quantity, element_text = self.a_find_ele(**find_params)
                     else:
                         loc, ele_quantity, element_text = None, 0, None
-                    self.element_result_model.elements[random_element].ele_quantity = ele_quantity
-                    self.element_result_model.elements[random_element].element_text = element_text
+                    new_element = ElementListResultModel(
+                        exp=self.element_model.elements[random_element].exp,
+                        loc=self.element_model.elements[random_element].loc,
+                        sub=self.element_model.elements[random_element].sub,
+                        ele_quantity=ele_quantity,
+                        element_text=element_text,
+                        is_iframe=self.element_model.elements[random_element].is_iframe
+                    )
+
+                    element_exists = any(
+                        existing.exp == new_element.exp and
+                        existing.loc == new_element.loc and
+                        existing.sub == new_element.sub and
+                        existing.is_iframe == new_element.is_iframe
+                        for existing in self.element_result_model.elements
+                    )
+
+                    if not element_exists:
+                        self.element_result_model.elements.append(new_element)
                     if is_ass:
                         if callable(getattr(SyncWebAssertion, self.element_model.ope_key, None)):
                             i.v = loc
@@ -230,11 +263,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
                             i.v = element_text
                     else:
                         i.v = loc
-                elif self.element_data:
-                    for f, v in self.element_data.items():
-                        if f == i.f:
-                            i.v = self.base_data.test_data.replace(v)
-                i.v = self.base_data.test_data.replace(i.v)
+                    i.v = self.base_data.test_data.replace(i.v)
 
         except AttributeError as error:
             self.base_data.log.debug(

{mangoautomation-1.0.60 → mangoautomation-1.1.21}/mangoautomation/uidrive/web/async_web/__init__.py

@@ -126,7 +126,7 @@ class AsyncWebDevice(AsyncWebBrowser,
                     raise MangoAutomationError(*ERROR_MSG_0023)
             if not ele_list:
                 raise MangoAutomationError(*ERROR_MSG_0023)
-            if not ele_list and _type == ElementOperationEnum.OPE.value:
+            if not ele_list and _type == ElementOperationEnum.OPE:
                 raise MangoAutomationError(*ERROR_MSG_0029, value=(name, loc))
             try:
                 count = len(ele_list)

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.60
+Version: 1.1.21
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏
@@ -18,14 +18,6 @@ Requires-Dist: uiautomator2>=3.2.5
 Requires-Dist: mangotools>=1.1.42
 Requires-Dist: adbutils~=2.8.9
 Requires-Dist: uiautodev>=0.9.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 # testkit
 

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

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = '1.0.60'
+__version__ = '1.1.21'
 
 with open("README.md", "r", encoding='utf-8') as fh:
     long_description = fh.read()

mangoautomation-1.1.21/tests/get_ope.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# @Project: 芒果测试平台
+# @Description: 
+# @Time   : 2025-08-31 17:41
+# @Author : 毛鹏
+loc = 'await page.cdeadapage.'
+cleaned_loc = loc.replace('page.', '').replace('await', '')
+print(cleaned_loc)

mangoautomation-1.0.60/tests/get_ope.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Project: 芒果测试平台
-# @Description: 
-# @Time   : 2025-08-31 17:41
-# @Author : 毛鹏
-import json
-from mangoautomation.uidrive import *
-from mangotools.decorator import func_info
-
-print(json.dumps(func_info, ensure_ascii=False, indent=4))
-with open('ope.json', 'w') as f:
-    f.write(json.dumps(func_info, ensure_ascii=False, indent=4))