tdrpa.tdworker 1.2.13.60__py312-none-win_amd64.whl → 1.2.13.62__py312-none-win_amd64.whl

tdrpa/tdworker/_other.pyi

@@ -223,11 +223,11 @@ class Image:
         :return:存在返回True，不存在返回False
         '''
     @staticmethod
-    def Find(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: int | float = 0.9, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, matchType: str = 'GrayMatch', backgroundPic: bool = False, iSerialNo: int = 0, returnPosition: str = 'center') -> dict | list | None:
+    def FindPic(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: int | float = 0.9, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, matchType: str = 'GrayMatch', backgroundPic: bool = False, iSerialNo: int = 0, returnPosition: str = 'center') -> dict | list | None:
         '''
         查找图像
 
-        Image.Find(\'d:\\test.jpg\', target, anchorsElement=None, rect=None, accuracy=0.9, searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, matchType=\'GrayMatch\', backgroundPic=False, iSerialNo=0, returnPosition="center")
+        Image.FindPic(\'d:\\test.jpg\', target, anchorsElement=None, rect=None, accuracy=0.9, searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, matchType=\'GrayMatch\', backgroundPic=False, iSerialNo=0, returnPosition="center")
 
         :param imagePath:[必选参数]要查找的图片路径
         :param target:[必选参数]tdRPA拾取器获取的目标元素特征字符串或uia目标元素对象
@@ -368,11 +368,11 @@ class Image:
         :return:返回颜色值（16进制的RGB字符），如"FF0000"
         '''
     @staticmethod
-    def FindColor(colors: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, backgroundPic: bool = False, returnNum: str = 'first', relativeType: str = 'screen'):
+    def FindColor(colors: str, target: str | uia.Control, anchorsElement: Optional[uia.Control] = None, rect: Optional[dict] = None, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, backgroundPic: bool = False, searchOrder: str = 'topLeft', relativeType: str = 'screen'):
         '''
         查找颜色
 
-        Image.FindColor(\'FF0000\', target, anchorsElement=None, rect=None, searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, backgroundPic=False, returnNum=\'first\', relativeType=\'screen\')
+        Image.FindColor(\'FF0000\', target, anchorsElement=None, rect=None, searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, backgroundPic=False, searchOrder=\'topLeft\', relativeType=\'screen\')
 
         :param colors: [必选参数]需要查找的颜色值字符串，十六进制颜色，支持偏色，支持同时多个颜色，例如 "FF0000" 或 "FF0000-101010" 或 "FF0000-101010|0000FF-101010"
         :param target:[必选参数]tdRPA拾取器获取的目标元素特征字符串或uia目标元素对象
@@ -383,10 +383,13 @@ class Image:
         :param delayAfter:[可选参数]执行后延时(毫秒)。默认0
         :param delayBefore:[可选参数]执行前延时(毫秒)。默认100
         :param setForeground:[可选参数]激活窗口。默认True
-        :param backgroundPic:[可选参数]是否后台识图片（颜色需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。
-        :param returnNum:[可选参数]坐标返回数量。first:返回找到的第一个颜色坐标, all:返回找到的所有颜色坐标。默认first，查找顺序是从上到下，从左到右。
+        :param backgroundPic:[可选参数]是否后台识图片（颜色需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。      
+        :param searchOrder:[可选参数]搜索顺序，除“all”以外，其余方式返回首个匹配的颜色坐标，可组合使用，返回多个匹配坐标。
+                            topLeft:从上到下由左至右,leftTop:从左到右由上至下,topRight:从上到下由右至左,rightTop:从右到左由上至下,
+                            bottomLeft:从下到上由左至右,leftBottom:从左到右由下至上,bottomRight:从下到上由右至左,rightBottom:从右到左由下至上,
+                            all:返回找到的所有颜色坐标。默认topLeft。
         :param relativeType:[可选参数]查找坐标相对类型。screen:返回相对屏幕的坐标，以屏幕左上角0,0为坐标原点。 image:返回相对查找范围的坐标，以查找范围的左上角0,0为坐标原点。默认screen
-        :return:返回颜色的坐标，当returnNum为first时，返回如[50 100], 当returnNum为all时，返回如[[50 100],[50,101],[51,100]...], 找不到时返回None
+        :return:返回按照搜索顺序匹配到的颜色坐标, 匹配不到时返回None
         '''
     @staticmethod
     def FindMultColor(colorDes: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: int | float = 1.0, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, backgroundPic: bool = False, relativeType: str = 'screen'):
@@ -518,3 +521,11 @@ class HTTP:
         :param delayTime:[可选参数]超时时间，单位毫秒，默认60000毫秒
         :return:是否下载成功
         '''
+        
+def retry(num: int = 2, delay: int | float = None, wait: int | float = None):
+    """
+    重试装饰器
+    :param num:[可选参数]重试次数，数字代表尝试次数，None:不限尝试次数。默认2次
+    :param delay:[可选参数]重试延时秒数（超过此秒数重试不了），默认None
+    :param wait:[可选参数]重试间隔秒数，默认None
+    """

{tdrpa_tdworker-1.2.13.60.dist-info → tdrpa_tdworker-1.2.13.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tdrpa.tdworker
-Version: 1.2.13.60
+Version: 1.2.13.62
 Summary: tdworker for tdrpa developers. supports python3.8+, windows x64
 Home-page: https://gitee.com/tdworker/command/wikis
 Author: vx:RPA_CREATOR

{tdrpa_tdworker-1.2.13.60.dist-info → tdrpa_tdworker-1.2.13.62.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tdrpa/tdworker.cp312-win_amd64.pyd,sha256=fhuYkARxxW051UztmuIe2IQass6R-kqINo18JNBOKVQ,4427776
+tdrpa/tdworker.cp312-win_amd64.pyd,sha256=rJ-yxlJs5pIEuXqql3cVoaON2I6IfqB66X7P4rdx0-s,4481536
 tdrpa/_tdxlwings/__init__.py,sha256=mxmqGWQ7xFb6e1GqkKEBfMQtZ8YyO4kAcPOvcJnD_2k,4424
 tdrpa/_tdxlwings/_win32patch.py,sha256=_IxTfvj663osTXh8b1S-A_N4PthS9gEWFLjpY4V0iUA,3443
 tdrpa/_tdxlwings/_xlmac.py,sha256=23OusKchbqglFi1s909tbB9fIwoFj6Yny4GiYrsnx5s,68521
@@ -84,10 +84,10 @@ tdrpa/_tdxlwings/rest/api.py,sha256=yfv1VkTpjQOzxLh4aMnZQsh8wTRHg34KkyipKDa_w4g,
 tdrpa/_tdxlwings/rest/serializers.py,sha256=ztMzL_EgbhAb3rSbfWFE2A9uyOykoZbkSoDHPeKXzGg,2885
 tdrpa/tdworker/__init__.pyi,sha256=SduurI_bQlVhaYqqASK1WjfgBdbupOrdMnK4eOTdxeo,336
 tdrpa/tdworker/_excel.pyi,sha256=ZTtS3A4bW-vlZEGRZm3FtvG9zRU-n_aWRj1W1xLoBbM,67332
-tdrpa/tdworker/_other.pyi,sha256=9sKCQoqHmNE1Fvi2dTFhWH7xEuzTJCcCs501BH8bCHc,39143
+tdrpa/tdworker/_other.pyi,sha256=qtZ3rl_faCaGuJ6sL2rDArDf-QyT3vGibXEGvWH5lsI,39875
 tdrpa/tdworker/_web.pyi,sha256=8NDI7COti61cdJSnUjJpogZazKw9dfuc3J923k4KX0k,69739
 tdrpa/tdworker/_win.pyi,sha256=bNF_mMn0Cc8tA1nMAX555EtL0f5HCy08AEHsRM1TAP8,36049
-tdrpa_tdworker-1.2.13.60.dist-info/METADATA,sha256=67U2NBpL23ZX9IBlf4wyHnN862OsBCMnwlHdE4D7ilU,1164
-tdrpa_tdworker-1.2.13.60.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-tdrpa_tdworker-1.2.13.60.dist-info/top_level.txt,sha256=S9UoqmC_cyGqKbGsBkLQPEeQLbDrWD0SRwbxPpQpyyU,6
-tdrpa_tdworker-1.2.13.60.dist-info/RECORD,,
+tdrpa_tdworker-1.2.13.62.dist-info/METADATA,sha256=c6Y6fdP5ZV6GDH9AYP7uBk_1pmPOO5SCYHD3HTu6B4Q,1164
+tdrpa_tdworker-1.2.13.62.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+tdrpa_tdworker-1.2.13.62.dist-info/top_level.txt,sha256=S9UoqmC_cyGqKbGsBkLQPEeQLbDrWD0SRwbxPpQpyyU,6
+tdrpa_tdworker-1.2.13.62.dist-info/RECORD,,