mangoautomation 1.0.51__tar.gz → 1.0.53__tar.gz

{mangoautomation-1.0.51/mangoautomation.egg-info → mangoautomation-1.0.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.51
+Version: 1.0.53
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏

{mangoautomation-1.0.51 → mangoautomation-1.0.53}/mangoautomation/uidrive/_async_element.py

@@ -126,6 +126,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value()
+        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         if self.drive_type == DriveTypeEnum.WEB.value:
             await self.web_action_element(
                 self.element_model.name,
@@ -146,6 +147,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         await self.__ope_value(True)
+        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = await self.web_assertion_element(
@@ -197,7 +199,7 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
             value = self.element_data.get('value')
         self.base_data.test_data.set_cache(key, self.base_data.test_data.replace(value))
 
-    async def __ope_value(self, is_ass: bool = False):
+    async def __ope_value(self,is_ass: bool = False):
         try:
             ope_key = 'actual' if is_ass else 'locating'
             for i in self.element_model.ope_value:

{mangoautomation-1.0.51 → mangoautomation-1.0.53}/mangoautomation/uidrive/_sync_element.py

@@ -126,6 +126,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value()
+        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         if self.drive_type == DriveTypeEnum.WEB.value:
             self.web_action_element(
                 self.element_model.name,
@@ -146,6 +147,7 @@ class SyncElement(SyncWebDevice, AndroidDriver):
         if self.element_model.ope_value is None:
             raise MangoAutomationError(*ERROR_MSG_0054)
         self.__ope_value(True)
+        self.element_model.ope_value = self.base_data.test_data.replace(self.element_model.ope_value)
         try:
             if self.drive_type == DriveTypeEnum.WEB.value:
                 self.element_result_model.ass_msg = self.web_assertion_element(

{mangoautomation-1.0.51 → mangoautomation-1.0.53}/mangoautomation/uidrive/web/async_web/_element.py

@@ -6,10 +6,10 @@ import asyncio
 import os
 
 import time
-from mangotools.decorator import async_method_callback
-from mangotools.models import MethodModel
 from playwright.async_api import Locator, Error
 
+from mangotools.decorator import async_method_callback
+from mangotools.models import MethodModel
 from ..._base_data import BaseData
 from ....exceptions import MangoAutomationError
 from ....exceptions._error_msg import ERROR_MSG_0024, ERROR_MSG_0056
@@ -55,10 +55,26 @@ class AsyncWebElement(metaclass=Meta):
         MethodModel(f='set_cache_key', p='请输入获取元素文本后存储的key', d=True)])
     async def w_get_text(self, locating: Locator, set_cache_key=None):
         """获取元素文本"""
-        value = await locating.inner_text()
-        if set_cache_key:
-            self.base_data.test_data.set_cache(key=set_cache_key, value=value)
-        return value
+        methods = [
+            ("inner_text", locating.inner_text),
+            ("text_content", locating.text_content),
+            ("input_value", locating.input_value),
+            ("get_attribute", lambda: locating.get_attribute("value")),
+            ("evaluate", lambda: locating.evaluate("el => el.value")),
+        ]
+
+        for method_name, method in methods:
+            try:
+                value = await method()
+                if value is not None and str(value).strip() and set_cache_key:
+                    self.base_data.test_data.set_cache(key=set_cache_key, value=value)
+                    return value
+                elif value is not None and str(value).strip():
+                    return value
+            except Exception:
+                continue
+
+        return None
 
     @async_method_callback('web', '元素操作', 5, [
         MethodModel(f='locating'),

{mangoautomation-1.0.51 → mangoautomation-1.0.53}/mangoautomation/uidrive/web/sync_web/_element.py

@@ -54,10 +54,24 @@ class SyncWebElement(metaclass=Meta):
         MethodModel(f='set_cache_key', p='请输入获取元素文本后存储的key', d=True)])
     def w_get_text(self, locating: Locator, set_cache_key=None):
         """获取元素文本"""
-        value = locating.inner_text()
-        if set_cache_key:
-            self.base_data.test_data.set_cache(key=set_cache_key, value=value)
-        return value
+        methods = [
+            ("inner_text", lambda: locating.inner_text()),
+            ("text_content", lambda: locating.text_content()),
+            ("input_value", lambda: locating.input_value() if locating.is_visible() else None),
+            ("get_attribute", lambda: locating.get_attribute("value")),
+            ("evaluate", lambda: locating.evaluate("el => el.value")),
+        ]
+        for method_name, method in methods:
+            try:
+                value = method()
+                if value is not None and str(value).strip() and set_cache_key:
+                    self.base_data.test_data.set_cache(key=set_cache_key, value=value)
+                    return value
+                elif value is not None and str(value).strip():
+                    return value
+            except Exception:
+                continue
+        return None
 
     @sync_method_callback('web', '元素操作', 5, [
         MethodModel(f='locating'),

{mangoautomation-1.0.51 → mangoautomation-1.0.53/mangoautomation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mangoautomation
-Version: 1.0.51
+Version: 1.0.53
 Summary: 测试工具
 Home-page: https://gitee.com/mao-peng/testkit
 Author: 毛鹏

{mangoautomation-1.0.51 → mangoautomation-1.0.53}/setup.py

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