mangoautomation 1.0.37__py3-none-any.whl → 1.0.39__py3-none-any.whl

mangoautomation/uidrive/_async_element.py

@@ -41,7 +41,6 @@ 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:
         self.element_model = element_model
         self.element_data = element_data
@@ -93,8 +92,11 @@ class AsyncElement(AsyncWebDevice, AndroidDriver):
     async def __main(self):
         try:
             self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
+            self.element_result_model.loc = self.element_model.loc
             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}')
             raise MangoAutomationError(error.code, error.msg)

mangoautomation/uidrive/_sync_element.py

@@ -92,8 +92,11 @@ class SyncElement(SyncWebDevice, AndroidDriver):
     def __main(self):
         try:
             self.element_model.loc = self.base_data.test_data.replace(self.element_model.loc)
+            self.element_result_model.loc = self.element_model.loc
             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.debug(f'操作元素解析数据失败，类型：{type(error)}, 详情：{error}')
             raise MangoAutomationError(error.code, error.msg)

mangoautomation/uidrive/web/async_web/_new_browser.py

@@ -101,16 +101,15 @@ class AsyncWebNewBrowser:
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     async def new_context(self) -> BrowserContext:
-        args_dict = {
-            'no_viewport': True,
-        }
-
-        if self.web_recording and self.videos_path:
-            args_dict['record_video_dir'] = self.videos_path
-
+        args_dict = {}
+        if self.web_is_default:
+            args_dict["viewport"] = {"width": 1600, "height": 1080}
         if self.web_h5:
-            del args_dict['no_viewport']
             args_dict.update(self.playwright.devices[self.web_h5])
+        if not (self.web_is_default or self.web_h5):
+            args_dict["no_viewport"] = True
+        if self.web_recording and self.videos_path:
+            args_dict["record_video_dir"] = self.videos_path
         return await self.browser.new_context(**args_dict)
 
     async def new_page(self, context: BrowserContext) -> Page:

mangoautomation/uidrive/web/sync_web/_new_browser.py

@@ -101,16 +101,15 @@ class SyncWebNewBrowser:
                 raise MangoAutomationError(*ERROR_MSG_0009, value=(self.web_path,))
 
     def new_context(self) -> BrowserContext:
-        args_dict = {
-            'no_viewport': True,
-        }
-
-        if self.web_recording and self.videos_path:
-            args_dict['record_video_dir'] = self.videos_path
-
+        args_dict = {}
+        if self.web_is_default:
+            args_dict["viewport"] = {"width": 1600, "height": 1080}
         if self.web_h5:
-            del args_dict['no_viewport']
             args_dict.update(self.playwright.devices[self.web_h5])
+        if not (self.web_is_default or self.web_h5):
+            args_dict["no_viewport"] = True
+        if self.web_recording and self.videos_path:
+            args_dict["record_video_dir"] = self.videos_path
         return self.browser.new_context(**args_dict)
 
     def new_page(self, context: BrowserContext) -> Page:

{mangoautomation-1.0.37.dist-info → mangoautomation-1.0.39.dist-info}/METADATA

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

{mangoautomation-1.0.37.dist-info → mangoautomation-1.0.39.dist-info}/RECORD

@@ -10,10 +10,10 @@ mangoautomation/models/_ui_model.py,sha256=IGophozQMO-NQjM_DPdlwud484yfWQw1CRwbD
 mangoautomation/tools/__init__.py,sha256=i0rZF_gS0h1Rd0bMhgDSJp4JbEb3rm33zg-MDEX7KdE,342
 mangoautomation/tools/_mate.py,sha256=9lk_EJnAX_OyXbe5WacyHkkcEr2ScBgasl6eUnlklWA,405
 mangoautomation/uidrive/__init__.py,sha256=Tk_gh4Qg2qnewEGxa-7Id4fkQLY3fvQE4X7JB0BEscY,577
-mangoautomation/uidrive/_async_element.py,sha256=KpJ5FhXHx9-kArtyOvKxTqiSgCtkeqAmHRU8jHecqoo,13218
+mangoautomation/uidrive/_async_element.py,sha256=gXHsUxZxmiYvUNq8RqPP3UGupOscTvz_mD7xI2qapRA,13424
 mangoautomation/uidrive/_base_data.py,sha256=ur2Ts40MAhOYXb0vGVXZdSwEVCI3Csri9I9f1pw1r4Y,3766
 mangoautomation/uidrive/_driver_object.py,sha256=Re8j6VLHKfwW2VFdi-1XFRuix8tRBLcHYRBLVF6CApE,1962
-mangoautomation/uidrive/_sync_element.py,sha256=juppgA4r2KTlWbawwiO2S3QfVFmaj00fTLSOH5gGO7s,13034
+mangoautomation/uidrive/_sync_element.py,sha256=s9wb_RUCDcyONhRghe5T0I7zpTfvzRK3DhlxmT_DyVk,13242
 mangoautomation/uidrive/android/__init__.py,sha256=FSIzfPane33QEj6bXslpd8bF1xGCDwMAHBOrpNzdyE4,5874
 mangoautomation/uidrive/android/_application.py,sha256=frvRyqUlx6__3j4xQdaJ4SOnEnipR3uPCOnWKDrkT7Y,2771
 mangoautomation/uidrive/android/_assertion.py,sha256=xkSBdjSfAbYtidHWWWY7Ko2OYaHi9OcZZOlnqIUT-FM,3611
@@ -35,7 +35,7 @@ mangoautomation/uidrive/web/async_web/_browser.py,sha256=39YroURzagpq0HoEn1RZnNf
 mangoautomation/uidrive/web/async_web/_customization.py,sha256=uw6p9uLHLXglgSkH4qjDl1v0iGlaNjvf8LljRH5cAHU,347
 mangoautomation/uidrive/web/async_web/_element.py,sha256=btIkX2nlic17sgSbXtNZ8h5wD-rPyIK6TH5fH4WaoPk,9506
 mangoautomation/uidrive/web/async_web/_input_device.py,sha256=sMAMHb_8QyPx3pKci0gRDQc2O7h1OYMGyA7fCWl81iM,3288
-mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=bru_zVQ5Z_FEvuX1h8yjwb2mfbip25hBOO_VAuTLqy4,5486
+mangoautomation/uidrive/web/async_web/_new_browser.py,sha256=ilUBdsJ0S7EAYBq0D6UbYEpMhmuVghnq133oTpvraC0,5597
 mangoautomation/uidrive/web/async_web/_page.py,sha256=TCYf79qQdVBBTTNq2COZFJVcLCgg5Ksu9lMgmQPVInU,2147
 mangoautomation/uidrive/web/sync_web/__init__.py,sha256=wCYW7V-32Zpw7C8m6zLoxb8niLNopVVBvA-zJBS7e9M,8387
 mangoautomation/uidrive/web/sync_web/_assertion.py,sha256=zZ4_4WiBQFSRwAh0P0JANa5z-ozbNTh3bnUqcZBti9s,11424
@@ -43,13 +43,13 @@ mangoautomation/uidrive/web/sync_web/_browser.py,sha256=c7xHkIIFPawlzcVkGjwqeKfW
 mangoautomation/uidrive/web/sync_web/_customization.py,sha256=E_pfI8gKd0O6r4huJIvA6hoW-X9fSDVL4zEUqhHgxwE,355
 mangoautomation/uidrive/web/sync_web/_element.py,sha256=P5kSFkKyRP8a7qpKJZf_Lhp6Ik1jgHfIVB8Tgpl7kNw,9078
 mangoautomation/uidrive/web/sync_web/_input_device.py,sha256=8t6tJgMb4zgb4Sv02XP3gUU0ZVbApCs3WaILv8Fe1iY,3169
-mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=RO1e4fQoeBol3w8NIx_oxIfRkGvx3ZbPSARTwMwetVQ,5378
+mangoautomation/uidrive/web/sync_web/_new_browser.py,sha256=SGt3P7hFrPWkBLVEgN8O1p2V39Zjack7u__hsW123SM,5489
 mangoautomation/uidrive/web/sync_web/_page.py,sha256=MNekcL7o5YXEloeuvi3YrpOZxGhEWfrq-5i4PbtTLFg,2027
 tests/__init__.py,sha256=UhCNFqiVjxdh4CXESNo4oE7qfjpYYVkeHbSE5-7LGDY,125
 tests/test_ui_and.py,sha256=4k0_3bx_k2KbZifeRWGK65sxtdiPUOjkNzZ5oxjrc18,672
 tests/test_ui_web.py,sha256=MFaUN8O5qKOMMgyk2eelhKZsYcSJm0Do6pCgsdBZEH4,2765
-mangoautomation-1.0.37.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
-mangoautomation-1.0.37.dist-info/METADATA,sha256=wfPtX4xdHRbypf_QMuXA-H32JzyJHxEVRgNuQaTGKsw,626
-mangoautomation-1.0.37.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-mangoautomation-1.0.37.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
-mangoautomation-1.0.37.dist-info/RECORD,,
+mangoautomation-1.0.39.dist-info/LICENSE,sha256=03WP-mgFmo8ofRYDe1HVDQUEUKQZ2q6P6Q-2A4c-46A,1085
+mangoautomation-1.0.39.dist-info/METADATA,sha256=6BsaDv5ErPZqn_7zNNoV2EDK59wjRBWt0cyZEkcK4Yc,626
+mangoautomation-1.0.39.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+mangoautomation-1.0.39.dist-info/top_level.txt,sha256=g-uCmjvEODG8WFbmwbGM0-G0zHntHv8ZsS0PQRaMGtE,22
+mangoautomation-1.0.39.dist-info/RECORD,,