tdrpa.tdworker 1.2.13.61__py312-none-win_amd64.whl → 1.2.13.63__py312-none-win_amd64.whl

tdrpa/tdworker/__init__.pyi

@@ -1,4 +1,4 @@
 from ._excel import Excel as Excel
-from ._other import App as App, Clipboard as Clipboard, HTTP as HTTP, INI as INI, Image as Image, Mail as Mail, PrintToScreen as PrintToScreen
+from ._other import App as App, Clipboard as Clipboard, Dialog as Dialog, HTTP as HTTP, INI as INI, Image as Image, Mail as Mail, PrintToScreen as PrintToScreen, retry as retry
 from ._web import Web as Web, WebPW as WebPW
 from ._win import WinElement as WinElement, WinKeyboard as WinKeyboard, WinMouse as WinMouse, Window as Window

tdrpa/tdworker/_other.pyi

@@ -1,5 +1,4 @@
 import uiautomation as uia
-from _typeshed import Incomplete
 
 class Clipboard:
     @staticmethod
@@ -13,49 +12,49 @@ class Clipboard:
         """
     @staticmethod
     def SaveImage(savePath: str):
-        '''
+        """
         保存剪贴板图像
 
         Clipboard.SaveImage(savePath)
 
         :param savePath:[必选参数]要将剪贴板的图像保存到的文件路径，如"D:\\1.png"
         :return:图像保存成功返回True，保存失败返回False
-        '''
+        """
     @staticmethod
     def SetFile(paths: str | list):
-        '''
+        """
         文件设置到剪贴板
 
         Clipboard.SetFile(paths)
 
         :param paths:[必选参数]文件的路径，单个文件用字符串类型，如"D:\x01.txt"，多个文件用 list 类型，其中每个元素用字符串，如["D:\x01.txt", "D:\x01.png"]
         :return:成功返回True，失败返回False
-        '''
+        """
     @staticmethod
     def SetImage(picPath):
-        '''
+        """
         图片设置到剪贴板
 
         Clipboard.SetImage(picPath)
 
         :param picPath:[必选参数]要放入剪贴板的图片路径，如"D:\\1.png"
         :return:成功返回True，失败返回False
-        '''
+        """
     @staticmethod
     def SetText(content: str = ''):
-        '''
+        """
         设置剪贴板文本
 
         Clipboard.SetText(\'\')
 
         :param content:[必选参数]新的剪贴板文本内容，默认""
         :return:成功返回True，失败返回False
-        '''
+        """
 
 class PrintToScreen:
     @staticmethod
     def DrawText(msg: str = '', showSec: int = 0) -> None:
-        '''
+        """
         绘制屏幕中央正上方显示的红字
 
         PrintToScreen.DrawText(\'开始工作\', showSec=0)
@@ -63,7 +62,7 @@ class PrintToScreen:
         :param msg:[可选参数]文字内容，默认为""
         :param showSec:[可选参数]显示秒数。0:一直显示到程序结束，大于0:显示的时间，单位是秒
         :return:无
-        '''
+        """
     @staticmethod
     def CleanText() -> None:
         """
@@ -74,10 +73,95 @@ class PrintToScreen:
         :return:无
         """
 
+class Dialog:
+    @staticmethod
+    def Notify(title: str, message: str) -> None:
+        """
+        显示通知弹框
+
+        Dialog.Notify('提示', '这是一个消息框')
+
+        :param title:[必选参数]弹框标题
+        :param message:[必选参数]弹框内容
+        :return: 无
+        """
+    @staticmethod
+    def InputBox(title: str, prompt: str, default: str = '') -> str | None:
+        """
+        弹出输入对话框，返回用户在对话框中输入的内容
+
+        Dialog.InputBox('输入', '请输入内容：', '你好')
+
+        :param title:[必选参数]弹框标题
+        :param prompt:[必选参数]弹框内容
+        :param default:[可选参数]输入框默认文本
+        :return: 点确定按钮，返回用户输入的内容，点取消或关闭返回None
+        """
+    @staticmethod
+    def PasswordBox(title: str, prompt: str) -> str | None:
+        """
+        弹出密码输入对话框，返回用户在对话框中输入的内容
+
+        Dialog.PasswordBox('密码输入', '请输入密码：')
+
+        :param title:[必选参数]弹框标题
+        :param prompt:[必选参数]弹框内容
+        :return: 点确定按钮，返回用户输入的密码，点取消或关闭返回None
+        """
+    @staticmethod
+    def IntBox(title: str, prompt: str, default: str = '', minvalue: int = None, maxvalue: int = None, error_message: str = '请输入一个有效的整数！') -> int | None:
+        """
+        弹出整数输入对话框，返回用户在对话框中输入的整数
+
+        Dialog.IntBox('输入', '请输入整数：', '100')
+
+        :param title:[必选参数]弹框标题
+        :param prompt:[必选参数]弹框内容
+        :param default:[可选参数]输入框默认文本
+        :param minvalue:[可选参数]最小值，默认None
+        :param maxvalue:[可选参数]最大值，默认None
+        :param error_message:[可选参数]输入非整数时提示的消息
+        :return: 点确定按钮，返回用户输入的整数，点取消或关闭返回None
+        """
+    @staticmethod
+    def YnBox(title: str, message: str) -> bool:
+        """
+        弹出确认对话框，返回用户的确认结果
+
+        Dialog.YnBox('确认', '是否确认？')
+
+        :param title:[必选参数]弹框标题
+        :param message:[必选参数]弹框内容
+        :return: 点是返回True，点否或关闭返回False
+        """
+    @staticmethod
+    def MultenterBox(title: str, prompts: list) -> dict:
+        """
+        弹出多行输入对话框，返回用户在对话框中输入的内容
+
+        Dialog.MultenterBox('输入', ['请输入姓名：', '请输入年龄：'])
+
+        :param title:[必选参数]弹框标题
+        :param prompts:[必选参数]弹框内容，例如['请输入姓名：', '请输入年龄：']
+        :return: 点确定按钮，返回用户输入的内容，格式为字典，键为字段内容，值为用户输入的内容，关闭返回{}
+        """
+    @staticmethod
+    def MultchoiceBox(title: str, prompt: str, choices: list) -> list:
+        """
+        弹出多选框，返回用户选择的内容
+
+        Dialog.MultchoiceBox('选择', '请选择：', ['选项1', '选项2'])
+
+        :param title:[必选参数]弹框标题
+        :param prompt:[必选参数]弹框内容
+        :param choices:[必选参数]选项内容，例如['选项1', '选项2']
+        :return: 点确定按钮，返回用户选择的内容，格式为列表，关闭返回[]
+        """
+
 class INI:
     @staticmethod
     def Read(iniPath: str, sectionName: str, keyName: str, defaultValue: str = '', encoding: str = 'GBK') -> str:
-        '''
+        """
         读键值
 
         value = INI.Read(\'D:\\conf.ini\',\'section1\', \'key1\', defaultValue=\'\', encoding=\'GBK\')
@@ -88,10 +172,10 @@ class INI:
         :param defaultValue:[可选参数]当 INI 配置文件键名不存在时，返回的默认内容。默认是空字符串
         :param encoding:[可选参数]文件编码，常用"GBK"， "UTF8"等。默认 GBK
         :return: 返回读取的值，字符串类型
-        '''
+        """
     @staticmethod
     def Write(iniPath: str, sectionName: str, keyName: str, value, encoding: str = 'GBK') -> None:
-        '''
+        """
         写键值
 
         INI.Write(\'D:\\conf.ini\',\'section1\', \'key1\', \'value1\', encoding=\'GBK\')
@@ -102,10 +186,10 @@ class INI:
         :param value:[必选参数]INI 文件中被写入的键值对中的键值
         :param encoding:[可选参数]文件编码，常用"GBK"， "UTF8"等。默认 GBK
         :return: None
-        '''
+        """
     @staticmethod
     def EnumSection(iniPath: str, encoding: str = 'GBK') -> list:
-        '''
+        """
         枚举小节
 
         sections = INI.EnumSection(\'D:\\conf.ini\', encoding=\'GBK\')
@@ -113,10 +197,10 @@ class INI:
         :param iniPath:[必选参数]INI 配置文件所在路径
         :param encoding:[可选参数]文件编码，常用"GBK"， "UTF8"等。默认 GBK
         :return: 返回一个列表，列表中每个元素为一个section的名字
-        '''
+        """
     @staticmethod
     def EnumKey(iniPath: str, sectionName: str, encoding: str = 'GBK') -> list:
-        '''
+        """
         枚举键
 
         keys = INI.EnumKey(\'D:\\conf.ini\', \'section1\', encoding=\'GBK\')
@@ -125,10 +209,10 @@ class INI:
         :param sectionName:[必选参数]要访问 INI 配置文件的小节名字
         :param encoding:[可选参数]文件编码，常用"GBK"， "UTF8"等。默认 GBK
         :return: 返回一个列表，列表中每个元素为一个key的名字
-        '''
+        """
     @staticmethod
     def DeleteSection(iniPath: str, sectionName: str, encoding: str = 'GBK') -> None:
-        '''
+        """
         删除小节
 
         INI.DeleteSection(\'D:\\conf.ini\',\'section1\', encoding=\'GBK\')
@@ -137,10 +221,10 @@ class INI:
         :param sectionName:[必选参数]要访问 INI 配置文件的小节名字
         :param encoding:[可选参数]文件编码，常用"GBK"， "UTF8"等。默认 GBK
         :return: None
-        '''
+        """
     @staticmethod
-    def DeleteKey(iniPath: str, sectionName: str, keyName: str, encoding: str = 'GBK'):
-        '''
+    def DeleteKey(iniPath: str, sectionName: str, keyName: str, encoding: str = 'GBK') -> None:
+        """
         删除键
 
         INI.DeleteKey(\'D:\\conf.ini\',\'section1\', \'key1\', encoding=\'GBK\')
@@ -150,7 +234,7 @@ class INI:
         :param keyName:[必选参数]要访问 INI 配置文件的键名
         :param encoding:[可选参数]文件编码，常用"GBK"， "UTF8"等。默认 GBK
         :return: None
-        '''
+        """
 
 class App:
     @staticmethod
@@ -179,7 +263,7 @@ class App:
         """
         启动应用程序
 
-        App.Run('''C:\\Windows\\system32\\mspaint.exe''')
+        App.Run("C:\\Windows\\system32\\mspaint.exe")
 
         :param exePath:[必选参数]应用程序文件路径
         :param waitType:[可选参数]0:不等待 1：等待应用程序准备好 2：等待应用程序执行到退出。默认0
@@ -189,7 +273,7 @@ class App:
         """
     @staticmethod
     def WaitProcess(processName, waitType: str = 'open', delayTime: int = 30000) -> bool:
-        '''
+        """
         等待应用启动或关闭
 
         App.WaitProcess(\'chrome.exe\', waitType=\'open\', delayTime=30000)
@@ -198,12 +282,12 @@ class App:
         :param waitType:[可选参数]期望应用状态。open:等待应用打开 close:等待应用关闭
         :param delayTime:[可选参数]最大等待时间，默认30000毫秒(即30秒)
         :return:等待时间内达到期望应用状态（开启/关闭）返回True，否则返回False
-        '''
+        """
 
 class Image:
     @staticmethod
     def Exists(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: float = 0.9, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, matchType: str = 'GrayMatch', backgroundPic: bool = False) -> bool:
-        '''
+        """
         判断图像是否存在
 
         Image.Exists(\'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)
@@ -221,13 +305,13 @@ class Image:
         :param matchType:[可选参数]指定查找图像的匹配方式，\'GrayMatch\':“灰度匹配”速度快，但在极端情况下可能会匹配失败，\'ColorMatch\':“彩色匹配”相对“灰度匹配”更精准但匹配速度稍慢。默认\'GrayMatch\'
         :param backgroundPic:[可选参数]是否后台识图片（图片需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。
         :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目标元素对象
@@ -244,10 +328,10 @@ class Image:
         :param iSerialNo:[可选参数]指定图像匹配到多个目标时的序号，序号为从1开始的正整数，在屏幕上从左到右从上到下依次递增，匹配到最靠近屏幕左上角的目标序号为1,如果是0，返回所有匹配图像的坐标。默认为0
         :param returnPosition:[可选参数]\'center\':返回图片中心坐标，\'topLeft\':返回图片左上角坐标,\'topRight\':返回图片右上角坐标,\'bottomLeft\':返回图片左下角坐标,\'bottomRight\':返回图片右下角坐标。默认\'center\'
         :return:返回图像的坐标，iSerialNo为0时，返回list，如[{\'x\':100, \'y\':100}, {\'x\':300,\'y\':300}]，iSerialNo大于0时，返回dict，如{\'x\':100, \'y\':100},匹配不到时返回None
-        '''
+        """
     @staticmethod
-    def Click(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: float = 0.9, button: str = 'left', clickType: str = 'click', searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 100, delayBefore: int = 100, setForeground: bool = True, cursorPosition: str = 'center', cursorOffsetX: int = 0, cursorOffsetY: int = 0, keyModifiers: list = None, simulateType: str = 'simulate', moveSmoothly: bool = False, matchType: str = 'GrayMatch', backgroundPic: bool = False, iSerialNo: int = 1):
-        '''
+    def Click(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: float = 0.9, button: str = 'left', clickType: str = 'click', searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 100, delayBefore: int = 100, setForeground: bool = True, cursorPosition: str = 'center', cursorOffsetX: int = 0, cursorOffsetY: int = 0, keyModifiers: list = None, simulateType: str = 'simulate', moveSmoothly: bool = False, matchType: str = 'GrayMatch', backgroundPic: bool = False, iSerialNo: int = 1) -> None:
+        """
         点击图像
 
         Image.Click(\'d:\\test.jpg\', target, anchorsElement=None, rect=None, accuracy=0.9, button=\'left\', clickType=\'click\', searchDelay=10000, continueOnError=False, delayAfter=100, delayBefore=100,
@@ -275,10 +359,10 @@ class Image:
         :param backgroundPic:[可选参数]是否后台识图片（图片需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。注意：当simulateType为message时，该字段设置为True才会生效
         :param iSerialNo:[可选参数]指定图像匹配到多个目标时的序号，序号为从1开始的正整数，在屏幕上从左到右从上到下依次递增，匹配到最靠近屏幕左上角的目标序号为1,如果是0，匹配所有图片（即点击所有匹配到的图片）。默认为1
         :return:None
-        '''
+        """
     @staticmethod
-    def Hover(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: float = 0.9, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 100, delayBefore: int = 100, setForeground: bool = True, cursorPosition: str = 'center', cursorOffsetX: int = 0, cursorOffsetY: int = 0, keyModifiers: list = None, moveSmoothly: bool = False, matchType: str = 'GrayMatch', backgroundPic: bool = False, iSerialNo: int = 1):
-        '''
+    def Hover(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: float = 0.9, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 100, delayBefore: int = 100, setForeground: bool = True, cursorPosition: str = 'center', cursorOffsetX: int = 0, cursorOffsetY: int = 0, keyModifiers: list = None, moveSmoothly: bool = False, matchType: str = 'GrayMatch', backgroundPic: bool = False, iSerialNo: int = 1) -> None:
+        """
         鼠标移动到图像上
 
         Image.Hover(\'d:\\test.jpg\', target, anchorsElement=None, rect=None, accuracy=0.9, searchDelay=10000, continueOnError=False, delayAfter=100, delayBefore=100,
@@ -303,10 +387,10 @@ class Image:
         :param backgroundPic:[可选参数]是否后台识图片（图片需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。
         :param iSerialNo:[可选参数]指定图像匹配到多个目标时的序号，序号为从1开始的正整数，在屏幕上从左到右从上到下依次递增，匹配到最靠近屏幕左上角的目标序号为1,如果是0，匹配所有图片（即鼠标将移动经过所有匹配到的图片）。默认为1
         :return:None
-        '''
+        """
     @staticmethod
-    def Wait(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: float = 0.9, waitType: str = 'show', searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, matchType: str = 'GrayMatch', backgroundPic: bool = False):
-        '''
+    def Wait(imagePath: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, rect: dict | None = None, accuracy: float = 0.9, waitType: str = 'show', searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, matchType: str = 'GrayMatch', backgroundPic: bool = False) -> None:
+        """
         等待图像显示或消失
 
         Image.Wait(\'d:\\test.jpg\', target, anchorsElement=None, rect=None, accuracy=0.9, waitType="show", searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, matchType=\'GrayMatch\', backgroundPic=False)
@@ -325,10 +409,10 @@ class Image:
         :param matchType:[可选参数]指定查找图像的匹配方式，\'GrayMatch\':“灰度匹配”速度快，但在极端情况下可能会匹配失败，\'ColorMatch\':“彩色匹配”相对“灰度匹配”更精准但匹配速度稍慢。默认\'GrayMatch\'
         :param backgroundPic:[可选参数]是否后台识图片（图片需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。
         :return:None
-        '''
+        """
     @staticmethod
-    def ComColor(color: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, beginPosition: str = 'center', positionOffsetX: int = 0, positionOffsetY: int = 0, backgroundPic: bool = False):
-        '''
+    def ComColor(color: str, target: str | uia.Control, anchorsElement: uia.Control | None = None, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, beginPosition: str = 'center', positionOffsetX: int = 0, positionOffsetY: int = 0, backgroundPic: bool = False) -> bool:
+        """
         目标内指定位置比色
 
         Image.ComColor(\'FF0000\', target, anchorsElement=None, searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, beginPosition=\'center\', positionOffsetX=0, positionOffsetY=0, backgroundPic=False)
@@ -346,10 +430,10 @@ class Image:
         :param positionOffsetY:[可选参数]纵坐标偏移。默认0
         :param backgroundPic:[可选参数]是否后台识图片（指定位置的颜色与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。
         :return:匹配返回True，不匹配返回False
-        '''
+        """
     @staticmethod
-    def GetColor(target, anchorsElement: Incomplete | None = None, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, beginPosition: str = 'center', positionOffsetX: int = 0, positionOffsetY: int = 0, backgroundPic: bool = False):
-        '''
+    def GetColor(target, anchorsElement: uia.Control | None = None, searchDelay: int = 10000, continueOnError: bool = False, delayAfter: int = 0, delayBefore: int = 100, setForeground: bool = True, beginPosition: str = 'center', positionOffsetX: int = 0, positionOffsetY: int = 0, backgroundPic: bool = False) -> str:
+        """
         获取目标指定位置的颜色值（16进制RGB字符）
 
         Image.GetColor(target, anchorsElement=None, searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, beginPosition=\'center\', positionOffsetX=0, positionOffsetY=0, backgroundPic=False)
@@ -366,13 +450,13 @@ class Image:
         :param positionOffsetY:[可选参数]纵坐标偏移。默认0
         :param backgroundPic:[可选参数]是否后台识图片（图片需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。
         :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: 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, searchOrder: str = 'topLeft', relativeType: str = 'screen') -> list | None:
+        """
         查找颜色
 
-        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,14 +467,17 @@ 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'):
-        '''
+    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') -> dict | None:
+        """
         多点找色
 
         Image.FindMultColor(colorDes, target, anchorsElement=None, rect=None, accuracy=1.0, searchDelay=10000, continueOnError=False, delayAfter=0, delayBefore=100, setForeground=True, backgroundPic=False, relativeType=\'screen\')
@@ -408,10 +495,10 @@ class Image:
         :param backgroundPic:[可选参数]是否后台识图片（颜色描述需与查找范围在同一窗口）。True为后台识别图片，False为前台识别图片。默认False。
         :param relativeType:[可选参数]查找坐标相对类型。screen:返回相对屏幕的坐标，以屏幕左上角0,0为坐标原点。 image:返回相对查找范围的坐标，以查找范围的左上角0,0为坐标原点。默认screen
         :return:返回找到的坐标，如{"x":int, "y":int}。找不到返回None
-        '''
+        """
     @staticmethod
-    def CaptureScreen(filePath: str, rect: dict | None = None, continueOnError: bool = False, delayAfter: int = 300, delayBefore: int = 100):
-        '''
+    def CaptureScreen(filePath: str, rect: dict | None = None, continueOnError: bool = False, delayAfter: int = 300, delayBefore: int = 100) -> None:
+        """
         屏幕截图
 
         Image.CaptureScreen("E:/1.png", rect=None, continueOnError=False, delayAfter=300, delayBefore=100)
@@ -422,12 +509,12 @@ class Image:
         :param delayAfter:[可选参数]执行后延时(毫秒)。默认300
         :param delayBefore:[可选参数]执行前延时(毫秒)。默认100
         :return:None
-        '''
+        """
 
 class Mail:
     @staticmethod
-    def SendMail(user: str = '', pwd: str = '', sender: str = '', title: str = '', content: str = '', to: str | list = '', cc: str | list = None, attr: str | list = None, server: str = 'smtp.qq.com', port: int = 465, ssl: bool = True, timeout: int = 10, continueOnError: bool = False):
-        '''
+    def SendMail(user: str = '', pwd: str = '', sender: str = '', title: str = '', content: str = '', to: str | list = '', cc: str | list = None, attr: str | list = None, server: str = 'smtp.qq.com', port: int = 465, ssl: bool = True, timeout: int = 10, continueOnError: bool = False) -> None:
+        """
         发送邮件
 
         Mail.SendMail(user=\'\', pwd=\'\', sender=\'\', title=\'\', content=\'\', to=\'\', cc=None, attr=None, server="smtp.qq.com", port=465, ssl=True, timeout=10, continueOnError=False)
@@ -446,32 +533,32 @@ class Mail:
         :param timeout: [可选参数]超时时间(秒)，默认10
         :param continueOnError: [可选参数]发生错误是否继续，True为继续，False为不继续。默认False
         :return:None
-        '''
+        """
 
 class HTTP:
     @staticmethod
     def SetCookies(cookies: dict = None) -> None:
-        '''
+        """
         设置cookies
 
         HTTP.SetCookies(None)
 
         :param cookies:[可选参数]字典类型的cookies，例如：{"name":"value","name2":"value2"}，默认None
         :return:None
-        '''
+        """
     @staticmethod
     def SetHeaders(headers: dict = None) -> None:
-        '''
+        """
         设置Headers
 
         HTTP.SetHeaders(None)
 
         :param headers:[可选参数]字典类型的请求头，例如：{"User-Agent": "Mozilla/5.0", "Accept-Language": "en-US"}，默认None
         :return:None
-        '''
+        """
     @staticmethod
     def Get(url: str, form: str | dict = None, delayTime: int = 60000) -> str:
-        '''
+        """
         Get获取数据
 
         text = HTTP.Get("", None, 60000)
@@ -480,10 +567,10 @@ class HTTP:
         :param form:[可选参数]Get时传递的表单数据，可以是字符串或字典，默认None
         :param delayTime:[可选参数]超时时间，单位毫秒，默认60000毫秒
         :return:获取的网络数据的结果
-        '''
+        """
     @staticmethod
     def Post(url: str, form: str | dict = None, delayTime: int = 60000) -> str:
-        '''
+        """
         Post提交表单
 
         text = HTTP.Post("", None, 60000)
@@ -492,10 +579,10 @@ class HTTP:
         :param form:[可选参数]Post时传递的表单数据，可以是字符串或字典，默认None
         :param delayTime:[可选参数]超时时间，单位毫秒，默认60000毫秒
         :return:向网页提交表单的结果
-        '''
+        """
     @staticmethod
     def PostJson(url: str, form: str | dict = None, delayTime: int = 60000) -> str:
-        '''
+        """
         Post提交JSON表单
 
         text = HTTP.PostJson("", None, 60000)
@@ -504,10 +591,10 @@ class HTTP:
         :param form:[可选参数]Post时传递的表单数据，可以是字符串或字典，默认None
         :param delayTime:[可选参数]超时时间，单位毫秒，默认60000毫秒
         :return:向网页提交JSON表单的结果
-        '''
+        """
     @staticmethod
     def GetFile(url: str, file: str, form: str | dict = None, delayTime: int = 60000) -> bool:
-        '''
+        """
         Get下载文件
 
         result = HTTP.GetFile("","",None,60000)
@@ -517,12 +604,13 @@ class HTTP:
         :param form:[可选参数]Get时传递的表单数据，可以是字符串或字典，默认None
         :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.61.dist-info → tdrpa_tdworker-1.2.13.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tdrpa.tdworker
-Version: 1.2.13.61
+Version: 1.2.13.63
 Summary: tdworker for tdrpa developers. supports python3.8+, windows x64
 Home-page: https://gitee.com/tdworker/command/wikis
 Author: vx:RPA_CREATOR
@@ -10,7 +10,7 @@ Keywords: rpa,RPA,tdRPA,tdworker,rpaworker,worker,uiautomation,uia,creator,windo
 Platform: Windows Only
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: Microsoft :: Windows
-Requires-Dist: tdrpa.tdcore>=1.2.21
+Requires-Dist: tdrpa.tdcore>=1.2.22
 Requires-Dist: pywin32
 Requires-Dist: pyperclip
 Requires-Dist: WMI

{tdrpa_tdworker-1.2.13.61.dist-info → tdrpa_tdworker-1.2.13.63.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tdrpa/tdworker.cp312-win_amd64.pyd,sha256=wxpMcg75A47xb9V72cSX4pg1IMCiFcNkqH5f9BTJH1s,4448256
+tdrpa/tdworker.cp312-win_amd64.pyd,sha256=oAddKX-hcGul39-N-mPGi7BvwbZw563RMfRS4KJZxJc,4643840
 tdrpa/_tdxlwings/__init__.py,sha256=mxmqGWQ7xFb6e1GqkKEBfMQtZ8YyO4kAcPOvcJnD_2k,4424
 tdrpa/_tdxlwings/_win32patch.py,sha256=_IxTfvj663osTXh8b1S-A_N4PthS9gEWFLjpY4V0iUA,3443
 tdrpa/_tdxlwings/_xlmac.py,sha256=23OusKchbqglFi1s909tbB9fIwoFj6Yny4GiYrsnx5s,68521
@@ -82,12 +82,12 @@ tdrpa/_tdxlwings/quickstart_fastapi/requirements.txt,sha256=y3pL1maFFVyROPGnd2YD
 tdrpa/_tdxlwings/rest/__init__.py,sha256=Dk7m0qKA9yIswBm_66Vw1MHmiiYRmqZ3egAUIMjUjts,41
 tdrpa/_tdxlwings/rest/api.py,sha256=yfv1VkTpjQOzxLh4aMnZQsh8wTRHg34KkyipKDa_w4g,12885
 tdrpa/_tdxlwings/rest/serializers.py,sha256=ztMzL_EgbhAb3rSbfWFE2A9uyOykoZbkSoDHPeKXzGg,2885
-tdrpa/tdworker/__init__.pyi,sha256=SduurI_bQlVhaYqqASK1WjfgBdbupOrdMnK4eOTdxeo,336
+tdrpa/tdworker/__init__.pyi,sha256=WN0PZBusMdAWbN8tAW5tQrxR-DgOL1US1no2Yjx4D-U,370
 tdrpa/tdworker/_excel.pyi,sha256=ZTtS3A4bW-vlZEGRZm3FtvG9zRU-n_aWRj1W1xLoBbM,67332
-tdrpa/tdworker/_other.pyi,sha256=8hG3J3YNjHNfWWR-pD6vSNJ9uPw32lgSzZpkkQTwUk8,39538
+tdrpa/tdworker/_other.pyi,sha256=IzmaAOBJavdLrzNmxwSfeKxJvUTYrhxLczN32wKLoSk,43535
 tdrpa/tdworker/_web.pyi,sha256=8NDI7COti61cdJSnUjJpogZazKw9dfuc3J923k4KX0k,69739
 tdrpa/tdworker/_win.pyi,sha256=bNF_mMn0Cc8tA1nMAX555EtL0f5HCy08AEHsRM1TAP8,36049
-tdrpa_tdworker-1.2.13.61.dist-info/METADATA,sha256=pfvMgvJc7NlLIhZrLPE4B8XQLGqiU4qDYLQ-10ggWwY,1164
-tdrpa_tdworker-1.2.13.61.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-tdrpa_tdworker-1.2.13.61.dist-info/top_level.txt,sha256=S9UoqmC_cyGqKbGsBkLQPEeQLbDrWD0SRwbxPpQpyyU,6
-tdrpa_tdworker-1.2.13.61.dist-info/RECORD,,
+tdrpa_tdworker-1.2.13.63.dist-info/METADATA,sha256=gylL0-GOI_zI3g0t7N9kmpFsfB7YmRmobX9TFU404fQ,1164
+tdrpa_tdworker-1.2.13.63.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+tdrpa_tdworker-1.2.13.63.dist-info/top_level.txt,sha256=S9UoqmC_cyGqKbGsBkLQPEeQLbDrWD0SRwbxPpQpyyU,6
+tdrpa_tdworker-1.2.13.63.dist-info/RECORD,,