From 21c857515a0918175ff7eda11b07d60d0cfee10b Mon Sep 17 00:00:00 2001 From: ff <16729017+shelllet@users.noreply.github.com> Date: Sat, 31 May 2025 17:56:42 +0800 Subject: [PATCH 1/3] update for next version --- docx/CHANGELOG.md | 15 ++++++++++++++- docx/_sidebar.md | 16 ++++++++-------- .../{async => asynchronous}/WhenEvent.md | 0 .../{async => asynchronous}/WorkBegin.md | 0 .../actions/{async => asynchronous}/WorkExit.md | 0 .../{async => asynchronous}/WorkReset.md | 0 .../actions/{async => asynchronous}/WorkTask.md | 0 .../{async => asynchronous}/WorkThread.md | 0 .../{async => asynchronous}/WorkTimer.md | 0 .../actions/{async => asynchronous}/WorkWait.md | 0 .../{async => asynchronous}/images/01.png | Bin .../{async => asynchronous}/images/02.png | Bin .../{async => asynchronous}/images/03.png | Bin .../{async => asynchronous}/images/04.png | Bin .../{async => asynchronous}/images/05.png | Bin .../{async => asynchronous}/images/06.png | Bin .../{async => asynchronous}/images/07.png | Bin .../{async => asynchronous}/images/08.png | Bin docx/actions/media/CaptureActiveWindow.md | 10 ++++++++-- docx/actions/media/CaptureFullScreen.md | 10 ++++++++-- docx/actions/media/CaptureWindow.md | 9 +++++++-- docx/introduction/workflow/property.md | 9 +++++---- 22 files changed, 50 insertions(+), 19 deletions(-) rename docx/actions/{async => asynchronous}/WhenEvent.md (100%) rename docx/actions/{async => asynchronous}/WorkBegin.md (100%) rename docx/actions/{async => asynchronous}/WorkExit.md (100%) rename docx/actions/{async => asynchronous}/WorkReset.md (100%) rename docx/actions/{async => asynchronous}/WorkTask.md (100%) rename docx/actions/{async => asynchronous}/WorkThread.md (100%) rename docx/actions/{async => asynchronous}/WorkTimer.md (100%) rename docx/actions/{async => asynchronous}/WorkWait.md (100%) rename docx/actions/{async => asynchronous}/images/01.png (100%) rename docx/actions/{async => asynchronous}/images/02.png (100%) rename docx/actions/{async => asynchronous}/images/03.png (100%) rename docx/actions/{async => asynchronous}/images/04.png (100%) rename docx/actions/{async => asynchronous}/images/05.png (100%) rename docx/actions/{async => asynchronous}/images/06.png (100%) rename docx/actions/{async => asynchronous}/images/07.png (100%) rename docx/actions/{async => asynchronous}/images/08.png (100%) diff --git a/docx/CHANGELOG.md b/docx/CHANGELOG.md index ac21ce1..86bb952 100644 --- a/docx/CHANGELOG.md +++ b/docx/CHANGELOG.md @@ -1,4 +1,17 @@ -# [0.44.0](https://github.com/shelllet/winui/compare/main...dev) (2025-05-03) +# [0.45.0](https://github.com/shelllet/winui/compare/main...dev) (2025-xx-xx) + +### Changed： +1. 修复图像名称包含中文时崩溃问题。 +2. 添加最近打开窗口，方便打开流程。 +3. 更新动作预览功能（现在会从流程入口开始执行到该动作执行完结束）。 +4. 保存图像动作，支持把图像保存为*PDF*文件（文件名称以 `.pdf` 结尾）。 + +### Note + +1. 使用管理员权限运行 *小友+*, 无法显示 *动作* 的拖动效果（已知问题）。 +2. 64位下载(x64)：https://winui.net/_media/simple/小友+0.45.0-setup.x64.exe + +## [0.44.0](https://github.com/shelllet/winui/compare/main...dev) (2025-05-03) ### Changed： 1. [相机类型](./actions/type/TypeCamera.md) 动作支持工业 USB3/GIGE 接口相机，比如海康相机。 diff --git a/docx/_sidebar.md b/docx/_sidebar.md index cc50b6c..d774ba4 100644 --- a/docx/_sidebar.md +++ b/docx/_sidebar.md @@ -48,14 +48,14 @@ - [写内存](./actions/system/WriteMemory.md) - [附加进程](./actions/system/AttachProcess.md) - 异步操作 - - [定时器](./actions/async/WorkTimer.md) - - [定时任务](./actions/async/WorkTask.md) - - [工作线程](./actions/async/WorkThread.md) - - [异步结束](./actions/async/WorkExit.md) - - [异步启动](./actions/async/WorkBegin.md) - - [状态切换](./actions/async/WorkReset.md) - - [等待事件](./actions/async/WhenEvent.md) - - [异步等待](./actions/async/WorkWait.md) + - [定时器](./actions/asynchronous/WorkTimer.md) + - [定时任务](./actions/asynchronous/WorkTask.md) + - [工作线程](./actions/asynchronous/WorkThread.md) + - [异步结束](./actions/asynchronous/WorkExit.md) + - [异步启动](./actions/asynchronous/WorkBegin.md) + - [状态切换](./actions/asynchronous/WorkReset.md) + - [等待事件](./actions/asynchronous/WhenEvent.md) + - [异步等待](./actions/asynchronous/WorkWait.md) - 文件系统 - [读取文件](./actions/filesystem/FileRead.md) - [文件写入](./actions/filesystem/FileWrite.md) diff --git a/docx/actions/async/WhenEvent.md b/docx/actions/asynchronous/WhenEvent.md similarity index 100% rename from docx/actions/async/WhenEvent.md rename to docx/actions/asynchronous/WhenEvent.md diff --git a/docx/actions/async/WorkBegin.md b/docx/actions/asynchronous/WorkBegin.md similarity index 100% rename from docx/actions/async/WorkBegin.md rename to docx/actions/asynchronous/WorkBegin.md diff --git a/docx/actions/async/WorkExit.md b/docx/actions/asynchronous/WorkExit.md similarity index 100% rename from docx/actions/async/WorkExit.md rename to docx/actions/asynchronous/WorkExit.md diff --git a/docx/actions/async/WorkReset.md b/docx/actions/asynchronous/WorkReset.md similarity index 100% rename from docx/actions/async/WorkReset.md rename to docx/actions/asynchronous/WorkReset.md diff --git a/docx/actions/async/WorkTask.md b/docx/actions/asynchronous/WorkTask.md similarity index 100% rename from docx/actions/async/WorkTask.md rename to docx/actions/asynchronous/WorkTask.md diff --git a/docx/actions/async/WorkThread.md b/docx/actions/asynchronous/WorkThread.md similarity index 100% rename from docx/actions/async/WorkThread.md rename to docx/actions/asynchronous/WorkThread.md diff --git a/docx/actions/async/WorkTimer.md b/docx/actions/asynchronous/WorkTimer.md similarity index 100% rename from docx/actions/async/WorkTimer.md rename to docx/actions/asynchronous/WorkTimer.md diff --git a/docx/actions/async/WorkWait.md b/docx/actions/asynchronous/WorkWait.md similarity index 100% rename from docx/actions/async/WorkWait.md rename to docx/actions/asynchronous/WorkWait.md diff --git a/docx/actions/async/images/01.png b/docx/actions/asynchronous/images/01.png similarity index 100% rename from docx/actions/async/images/01.png rename to docx/actions/asynchronous/images/01.png diff --git a/docx/actions/async/images/02.png b/docx/actions/asynchronous/images/02.png similarity index 100% rename from docx/actions/async/images/02.png rename to docx/actions/asynchronous/images/02.png diff --git a/docx/actions/async/images/03.png b/docx/actions/asynchronous/images/03.png similarity index 100% rename from docx/actions/async/images/03.png rename to docx/actions/asynchronous/images/03.png diff --git a/docx/actions/async/images/04.png b/docx/actions/asynchronous/images/04.png similarity index 100% rename from docx/actions/async/images/04.png rename to docx/actions/asynchronous/images/04.png diff --git a/docx/actions/async/images/05.png b/docx/actions/asynchronous/images/05.png similarity index 100% rename from docx/actions/async/images/05.png rename to docx/actions/asynchronous/images/05.png diff --git a/docx/actions/async/images/06.png b/docx/actions/asynchronous/images/06.png similarity index 100% rename from docx/actions/async/images/06.png rename to docx/actions/asynchronous/images/06.png diff --git a/docx/actions/async/images/07.png b/docx/actions/asynchronous/images/07.png similarity index 100% rename from docx/actions/async/images/07.png rename to docx/actions/asynchronous/images/07.png diff --git a/docx/actions/async/images/08.png b/docx/actions/asynchronous/images/08.png similarity index 100% rename from docx/actions/async/images/08.png rename to docx/actions/asynchronous/images/08.png diff --git a/docx/actions/media/CaptureActiveWindow.md b/docx/actions/media/CaptureActiveWindow.md index cce9913..4637bbb 100644 --- a/docx/actions/media/CaptureActiveWindow.md +++ b/docx/actions/media/CaptureActiveWindow.md @@ -9,8 +9,8 @@ ## 运行参数 -* 中心 -> 要选择的 *ROI* 区域中心位置，*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 +* 坐标 +> 要选择的 *ROI* 区域左上角位置，默认值 `（0， 0）`。*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 * 尺寸 > 要选择的 *ROI* 区域的长宽。*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 ## 输出 @@ -25,3 +25,9 @@ + + +## Changed + +* 0.45 +> 运行参数*中心坐标* 改为 *左上角坐标*。 \ No newline at end of file diff --git a/docx/actions/media/CaptureFullScreen.md b/docx/actions/media/CaptureFullScreen.md index bf5d238..51d0839 100644 --- a/docx/actions/media/CaptureFullScreen.md +++ b/docx/actions/media/CaptureFullScreen.md @@ -9,8 +9,8 @@ ## 运行参数 -* 中心 -> 要选择的 *ROI* 区域中心位置，*ROI* 区域之外，图像将置为黑色。该参数不影响输出图像尺寸。 +* 坐标 +> 要选择的 *ROI* 区域左上角位置，默认值 `（0， 0）`。*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 * 尺寸 > 要选择的 *ROI* 区域的长宽。*ROI* 区域之外，图像将置为黑色。该参数不影响输出图像尺寸。 @@ -35,3 +35,9 @@ import simple; + + +## Changed + +* 0.45 +> 运行参数*中心坐标* 改为 *左上角坐标*。 \ No newline at end of file diff --git a/docx/actions/media/CaptureWindow.md b/docx/actions/media/CaptureWindow.md index 9a37725..4648fee 100644 --- a/docx/actions/media/CaptureWindow.md +++ b/docx/actions/media/CaptureWindow.md @@ -11,8 +11,8 @@ * 窗口 > 需要截图的窗口。如果为 *空* ，选择当前激活的前置窗口。 -* 中心 -> 要选择的 *ROI* 区域中心位置，*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 +* 坐标 +> 要选择的 *ROI* 区域左上角位置，默认值 `（0， 0）`。*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 * 尺寸 > 要选择的 *ROI* 区域的长宽。*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 ## 输出 @@ -27,3 +27,8 @@ + +## Changed + +* 0.45 +> 运行参数*中心坐标* 改为 *左上角坐标*。 diff --git a/docx/introduction/workflow/property.md b/docx/introduction/workflow/property.md index ddd4e6a..facd08c 100644 --- a/docx/introduction/workflow/property.md +++ b/docx/introduction/workflow/property.md @@ -4,14 +4,14 @@ ![process](./images/01.png ':size=90%') +* 名称 + + 项目名称 + * 运行时隐藏窗口 在开始运行流程的时候隐藏 *小友+* 的主窗口,这样可以不影响鼠标或者是截图等相关的操作。 -* 输出更多日志 - - 建议在设计流程的时候，勾选此选项，即可在输出窗口看到更多的调试信息；在运行阶段，取消勾选，可加快执行速度和减少输出的信息占用过多的内存。 - * 主流程 项目的入口流程。一个项目是可以包含多个流程,这里可以选择项目一开始所执行的流程。 @@ -23,4 +23,5 @@ # 动作 * 通用属性 * 描述：动作的标题，会显示在动作节点上面。 + * 名称：动作的唯一名称，可用作 *变量*， 必须符合 *Python* 变量的定义语法 \ No newline at end of file From 483aacf8ebf5dcc8c6fc2f429e9eaa8ceb6fc78d Mon Sep 17 00:00:00 2001 From: ff <16729017+shelllet@users.noreply.github.com> Date: Sun, 8 Jun 2025 09:54:03 +0800 Subject: [PATCH 2/3] update --- docx/CHANGELOG.md | 11 ++++++----- docx/_sidebar.md | 2 +- .../{CaptureFullScreen.md => CaptureScreen.md} | 14 +++++++++----- docx/actions/media/CaptureWindow.md | 4 ++-- 4 files changed, 18 insertions(+), 13 deletions(-) rename docx/actions/media/{CaptureFullScreen.md => CaptureScreen.md} (78%) diff --git a/docx/CHANGELOG.md b/docx/CHANGELOG.md index 86bb952..54a59fb 100644 --- a/docx/CHANGELOG.md +++ b/docx/CHANGELOG.md @@ -1,15 +1,16 @@ # [0.45.0](https://github.com/shelllet/winui/compare/main...dev) (2025-xx-xx) ### Changed： -1. 修复图像名称包含中文时崩溃问题。 -2. 添加最近打开窗口，方便打开流程。 -3. 更新动作预览功能（现在会从流程入口开始执行到该动作执行完结束）。 -4. 保存图像动作，支持把图像保存为*PDF*文件（文件名称以 `.pdf` 结尾）。 +1. 添加最近打开窗口，方便打开流程。 +2. 更新动作预览功能（现在会从流程入口开始执行到该动作执行完结束）。 +3. 保存图像动作，支持把图像保存为*PDF*文件（文件名称以 `.pdf` 结尾）。 +4. 截图动作中的*ROI* *中心位置* 更改为图像 *左上角*。 +5. *窗口截图* 动作输出图像大小调整为窗口所在屏幕大小。 ### Note 1. 使用管理员权限运行 *小友+*, 无法显示 *动作* 的拖动效果（已知问题）。 -2. 64位下载(x64)：https://winui.net/_media/simple/小友+0.45.0-setup.x64.exe +2. 64位下载(x64)： ## [0.44.0](https://github.com/shelllet/winui/compare/main...dev) (2025-05-03) diff --git a/docx/_sidebar.md b/docx/_sidebar.md index d774ba4..f419248 100644 --- a/docx/_sidebar.md +++ b/docx/_sidebar.md @@ -149,7 +149,7 @@ - [文字识别（Tesseract）](./actions/ai/TesseractOCR.md) - 媒体 - [窗口截图](./actions/media/CaptureWindow.md) - - [全屏截图](./actions/media/CaptureFullScreen.md) + - [全屏截图](./actions/media/CaptureScreen.md) - [活动窗口截图](./actions/media/CaptureActiveWindow.md) - [声音播放](./actions/media/MediaPlay.md) - [键盘/鼠标宏重放](./actions/media/PlayRecord.md) diff --git a/docx/actions/media/CaptureFullScreen.md b/docx/actions/media/CaptureScreen.md similarity index 78% rename from docx/actions/media/CaptureFullScreen.md rename to docx/actions/media/CaptureScreen.md index 51d0839..49e2b53 100644 --- a/docx/actions/media/CaptureFullScreen.md +++ b/docx/actions/media/CaptureScreen.md @@ -1,23 +1,26 @@ # 全屏截图 -全屏截图，对于多个显示器，只能截取主显示器屏幕图像。 +全屏截图，支持多个显示器屏幕。 -![CaptureFullScreen](./images/02.png ':size=90%') +![CaptureScreen](./images/02.png ':size=90%') ## 子流程 > 不支持 ## 运行参数 +* 显示器 +> 截取屏幕。 * 坐标 > 要选择的 *ROI* 区域左上角位置，默认值 `（0， 0）`。*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 + * 尺寸 > 要选择的 *ROI* 区域的长宽。*ROI* 区域之外，图像将置为黑色。该参数不影响输出图像尺寸。 ## 输出 -> 图像，参考：[`Image`](./types/Image.md)，图像尺寸为整个窗口尺寸。 +> 图像，参考：[`Image`](./types/Image.md)，图像尺寸为整个屏幕尺寸。 ## 脚本调用 @@ -29,7 +32,7 @@ import simple; ## 资源 -示例：https://github.com/shelllet/WinUi/blob/main/media/CaptureFullScreen.simple +示例：https://github.com/shelllet/WinUi/blob/main/media/CaptureScreen.simple @@ -40,4 +43,5 @@ import simple; ## Changed * 0.45 -> 运行参数*中心坐标* 改为 *左上角坐标*。 \ No newline at end of file +> 运行参数*中心坐标* 改为 *左上角坐标*。 +> 添加屏幕选择参数。 \ No newline at end of file diff --git a/docx/actions/media/CaptureWindow.md b/docx/actions/media/CaptureWindow.md index 4648fee..d465d50 100644 --- a/docx/actions/media/CaptureWindow.md +++ b/docx/actions/media/CaptureWindow.md @@ -1,5 +1,5 @@ # 窗口截图 -根据指定的窗口截图，此图像包含标题栏。 +根据指定的窗口截图，包含标题栏。 ![CaptureWindow](./images/01.png ':size=90%') @@ -17,7 +17,7 @@ > 要选择的 *ROI* 区域的长宽。*ROI* 区域之外，图像将置为黑色，该参数不影响输出图像尺寸。 ## 输出 -> 图像，参考：[`Image`](./types/Image.md)，图像尺寸为整个窗口尺寸。 +> 图像，参考：[`Image`](./types/Image.md)，图像尺寸为窗口所在屏幕的尺寸。 ## 资源 From 30e8987b9b90781b60770e5926f02b26520e9ee1 Mon Sep 17 00:00:00 2001 From: ff <16729017+shelllet@users.noreply.github.com> Date: Fri, 13 Jun 2025 15:32:25 +0800 Subject: [PATCH 3/3] update --- docx/CHANGELOG.md | 5 +++-- docx/README.md | 8 ++++---- docx/actions/filesystem/DirectoryIterator.md | 13 ++++++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/docx/CHANGELOG.md b/docx/CHANGELOG.md index 54a59fb..3ffed55 100644 --- a/docx/CHANGELOG.md +++ b/docx/CHANGELOG.md @@ -1,4 +1,4 @@ -# [0.45.0](https://github.com/shelllet/winui/compare/main...dev) (2025-xx-xx) +# [0.45.0](https://github.com/shelllet/winui/compare/main...dev) (2025-06-13) ### Changed： 1. 添加最近打开窗口，方便打开流程。 @@ -10,7 +10,8 @@ ### Note 1. 使用管理员权限运行 *小友+*, 无法显示 *动作* 的拖动效果（已知问题）。 -2. 64位下载(x64)： +2. 此版本会清空缓存目录：`%LOCALAPPDATA%/Simple`。 +3. 64位下载(x64)：https://workdrive.zohopublic.com.cn/external/bd3d721a396c44df20e00de7ccf69d9957777ebe9591a871d9d777f9c7dfcedc/download ## [0.44.0](https://github.com/shelllet/winui/compare/main...dev) (2025-05-03) diff --git a/docx/README.md b/docx/README.md index 272ba62..9762b97 100644 --- a/docx/README.md +++ b/docx/README.md @@ -30,12 +30,12 @@ _小友+_ 绝对不会嵌入任何广告、捆绑任何软件。也不会像国 ![小友+](https://winui.net/introduction/images/01.png) - 开发版文档：https://shelllet.github.io/winui/#/ -- 示例流程：https://github.com/shelllet/winui +- 示例仓库：https://github.com/shelllet/winui -- 版本下载：[https://winui.net/](./CHANGELOG.md) +- 软件下载：[https://winui.net/](./CHANGELOG.md) -- YT: [https://www.youtube.com/playlist?list=UULFs1P87PQvBDJAuJfkKRLqMQ](https://www.youtube.com/playlist?list=UULFs1P87PQvBDJAuJfkKRLqMQ) -- B 站：[https://space.bilibili.com/652005178/channel/collectiondetail?sid=84951](https://space.bilibili.com/652005178/channel/collectiondetail?sid=84951) +- Youtube视频教学: [https://www.youtube.com/playlist?list=UULFs1P87PQvBDJAuJfkKRLqMQ](https://www.youtube.com/playlist?list=UULFs1P87PQvBDJAuJfkKRLqMQ) +- Bilibili 站视频教学：[https://space.bilibili.com/652005178/channel/collectiondetail?sid=84951](https://space.bilibili.com/652005178/channel/collectiondetail?sid=84951) - 如果你有 *Discord*, 加入 [Discord](https://discord.gg/b4MeYbJrfk) 讨论。 diff --git a/docx/actions/filesystem/DirectoryIterator.md b/docx/actions/filesystem/DirectoryIterator.md index 5b93ab5..76009c7 100644 --- a/docx/actions/filesystem/DirectoryIterator.md +++ b/docx/actions/filesystem/DirectoryIterator.md @@ -15,6 +15,10 @@ > 要遍历的文件夹 * [recursive](./types/Boolean.md) > 是否递归遍历, 默认 `False`。 + + * 扩展名 [`extensions`](./types/String.md) +> 根据文件扩展名过滤，多个扩展名使用 `,` 、`;` 或者 `|` 分隔。 + * [async](./types/Boolean.md) > 是否异步处理子流程，也就是开启线程处理子流程。默认 `False`，不支持在脚本中使用。 @@ -42,4 +46,11 @@ r.run(cbk) - \ No newline at end of file + + + + +## 版本变化 + +* 0.45 +> 增加 *扩展名过滤* 参数。 \ No newline at end of file