Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/shelllet/winui into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
shelllet committed Jan 18, 2024
2 parents 9d9f16a + f00527f commit bc43d5b
Show file tree
Hide file tree
Showing 56 changed files with 294 additions and 250 deletions.
6 changes: 5 additions & 1 deletion docx/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
### Changed:

1. 移动鼠标动作支持多显示器。
2. 优化统计分析模块
2. 优化统计分析模块。
3. 优化浏览器操作
4. 恢复 *For*(循环)动作名称。
5. *访问数组* 中的索引参数,去掉数字类型,使用表达式,同时支持字典访问。
5. 恢复 *前置窗口截图*,重命名为:[CaptureActiveWindow(活动窗口截取)](./actions/media/CaptureActiveWindow.md)

### Deprecated:

Expand Down
6 changes: 5 additions & 1 deletion docx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ _WinUi++_ 绝对不会嵌入任何广告、捆绑任何软件。也不会像国
- 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)

- 加入 [Discord](https://discord.gg/b4MeYbJrfk) 讨论。
- 如果你有 *Discord*, 加入 [Discord](https://discord.gg/b4MeYbJrfk) 讨论。

- 扫码加入微信交流群。

![wx](./introduction/images/wx.png ':size=40%')

<script>
Docsify.get('https://api.winui.net/simple/v3/latest').then(()=>{}, (reason)=>{
Expand Down
22 changes: 12 additions & 10 deletions docx/_sidebar.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
- 媒体
- [窗口截图](./actions/media/CaptureWindow.md)
- [全屏截图](./actions/media/CaptureFullScreen.md)
- [活动窗口截图](./actions/media/CaptureActiveWindow.md)
- [声音播放](./actions/media/MediaPlay.md)
- [键盘/鼠标宏重放](./actions/media/PlayRecord.md)
- [相机图像](./actions/media/VideoFrame.md)
Expand All @@ -129,18 +130,19 @@
- [GET 请求](./actions/network/HttpGet.md)
- [POST 请求](./actions/network/HttpPost.md)
- [网络服务](./actions/network/NetworkListen.md)
- [网络发送](./actions/network/NetworkSend.md)
- [网络接收](./actions/network/NetworkReceive.md)
- [数据发送](./actions/network/NetworkSend.md)
- [数据接收](./actions/network/NetworkReceive.md)
- [服务连接](./actions/network/NetworkConnect.md)
- 统计分析
- [加载文档](./actions/xml/LoadDocument.md)
- [查询](./actions/xml/DataFrameQuery.md)
- [节点名称](./actions/xml/XmlNodeName.md)
- [元素](./actions/xml/DataFrameSize.md)
- [读取 Json](./actions/json/ReadJson.md)
- [保存文档](./actions/xml/SaveDocument.md)
- [加载文档](./actions/pandas/LoadDocument.md)
- [查询](./actions/pandas/DataFrameQuery.md)
- [统计行数](./actions/pandas/RowsCount.md)
- [行列选择 * 标签](./actions/pandas/NameLoc.md)
- [行列选择 * 索引](./actions/pandas/IndexLoc.md)
- [迭代行](./actions/pandas/IterRow.md)
- [保存文档](./actions/pandas/SaveDocument.md)
- 逻辑
- [迭代](./actions/control/Iterate.md)
- [循环](./actions/control/For.md)
- [判断](./actions/control/If.md)
- [判空](./actions/control/IsEmpty.md)
- [调用](./actions/control/Invoke.md)
Expand Down Expand Up @@ -176,7 +178,6 @@
- [颜色统计](./actions/algorithm/JoinString.md)
- 类型
- [字符串](./actions/type/TypeString.md)
- [Json](./actions/type/TypeJson.md)
- [网址](./actions/type/TypeUri.md)
- [坐标](./actions/type/TypePoint.md)
- [文件](./actions/type/TypeFile.md)
Expand Down Expand Up @@ -288,4 +289,5 @@
- [ContourApproximationModes](./enums/ContourApproximationModes.md)
- [FeatureAlgorithm](./enums/FeatureAlgorithm.md)
- [WindowSortDirection](./enums/WindowSortDirection.md)
- [FileExtension](./enums/FileExtension.md)
- [Changelog](./CHANGELOG.md)
2 changes: 1 addition & 1 deletion docx/actions/algorithm/ColorPercentage.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
## 输出

> 所要统计的颜色所占的百分比,参考:[Number](../types/Number.md)
> 所要统计的颜色所占的百分比,参考:[Number](./types/Number.md)

## 脚本调用
Expand Down
2 changes: 1 addition & 1 deletion docx/actions/algorithm/ImageDifference.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
## 输出

> 相似性的指标(小数)。越低,表示匹配越好。*0*:表示完全匹配,参考: [Number](../types/Number.md)
> 相似性的指标(小数)。越低,表示匹配越好。*0*:表示完全匹配,参考: [Number](./types/Number.md)

## 脚本调用
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 迭代
# 循环
用来迭代相应的列表数据,遍历列表的每一个元素,也可称为*循环*

![action](./images/2022-11-17_184608.png ':size=90%')
![For](./images/2022-11-17_184608.png ':size=90%')

## 子流程

Expand Down
2 changes: 1 addition & 1 deletion docx/actions/detection/FeatureDetect.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
> 参考 [FeatureAlgorithm](../enums/FeatureAlgorithm.md)
## 输出

> 检测到的位置区域,参考:[RotatedRects](../types/RotatedRect.md)
> 检测到的位置区域,参考:[RotatedRects](./types/RotatedRect.md)

## 脚本调用
Expand Down
2 changes: 1 addition & 1 deletion docx/actions/dnn/QRCode.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
## 输出

> 二维码信息,字符串类型,参考:[String](../types/String.md)
> 二维码信息,字符串类型,参考:[String](./types/String.md)
## 脚本调用

Expand Down
2 changes: 1 addition & 1 deletion docx/actions/filesystem/StandardPath.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
## 输出

> 路径,参考:[Path](../types/Path.md)
> 路径,参考:[Path](./types/Path.md)

## 脚本调用
Expand Down
25 changes: 0 additions & 25 deletions docx/actions/json/ReadJson.md

This file was deleted.

27 changes: 27 additions & 0 deletions docx/actions/media/CaptureActiveWindow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 活动窗口截图
截取当前活动窗口图像


![CaptureActiveWindow](./images/07.png ':size=90%')

## 子流程
> 不支持
## 运行参数

* 中心
> 要选择的 *ROI* 区域中心位置,*ROI* 区域之外,图像将置为黑色,该参数不影响输出图像尺寸。
* 尺寸
> 要选择的 *ROI* 区域的长宽。*ROI* 区域之外,图像将置为黑色,该参数不影响输出图像尺寸。
## 输出

> 图像,参考:[`Image`](./types/Image.md),图像尺寸为整个窗口尺寸。

## 资源

示例:https://github.com/shelllet/WinUi/blob/main/media/CaptureActiveWindow.simple

<!-- <iframe type="text/html" height="640px" src="https://www.youtube.com/embed/09cpr-z22Uc" frameborder="0"></iframe>
<iframe src="//player.bilibili.com/player.html?bvid=BV1Xe411m741&page=1&autoplay=0" height='640px' scrolling="no" frameborder="no" framespacing="0" allowfullscreen="true"></iframe> -->
5 changes: 5 additions & 0 deletions docx/actions/media/CaptureFullScreen.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ import simple;
## 资源

示例:https://github.com/shelllet/WinUi/blob/main/media/CaptureFullScreen.simple


<iframe type="text/html" height="640px" src="https://www.youtube.com/embed/UacjErnsl08" frameborder="0"></iframe>

<iframe src="//player.bilibili.com/player.html?bvid=BV1WW4y1A7GU&page=1&autoplay=0" height='640px' scrolling="no" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>
3 changes: 3 additions & 0 deletions docx/actions/media/CaptureWindow.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@

示例:https://github.com/shelllet/WinUi/blob/main/media/CaptureWindow.simple

<iframe type="text/html" height="640px" src="https://www.youtube.com/embed/ETOELc3iYhs" frameborder="0"></iframe>

<iframe src="//player.bilibili.com/player.html?bvid=BV1Xe411m741&page=1&autoplay=0" height='640px' scrolling="no" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>
4 changes: 4 additions & 0 deletions docx/actions/media/MediaPlay.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@
示例:https://github.com/shelllet/WinUi/blob/main/media/MediaPlay.simple


<iframe type="text/html" height="640px" src="https://www.youtube.com/embed/OgzOJiRrlhg" frameborder="0"></iframe>

<iframe src="//player.bilibili.com/player.html?bvid=BV1mN4y1v7AV&page=1&autoplay=0" height='640px' scrolling="no" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>

!> 该动作是同步动作,声音文件播放完毕后返回。
3 changes: 3 additions & 0 deletions docx/actions/media/PixelPoint.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@

示例:https://github.com/shelllet/WinUi/blob/main/media/CaptureWindow.simple

<iframe type="text/html" height="640px" src="https://www.youtube.com/embed/mHbnrU2eYfE" frameborder="0"></iframe>

<iframe src="//player.bilibili.com/player.html?bvid=BV11W4y1c7C3&page=1&autoplay=0" height='640px' scrolling="no" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>
5 changes: 5 additions & 0 deletions docx/actions/media/PlayRecord.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@
## 资源

示例:https://github.com/shelllet/WinUi/blob/main/media/PlayRecord.simple


<iframe type="text/html" height="640px" src="https://www.youtube.com/embed/B8Dvr9VTWIU" frameborder="0"></iframe>

<iframe src="//player.bilibili.com/player.html?bvid=BV1He411m7am&page=1&autoplay=0" height='640px' scrolling="no" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>
4 changes: 4 additions & 0 deletions docx/actions/media/VideoFrame.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ import simple;

示例:https://github.com/shelllet/WinUi/blob/main/media/VideoFrame.simple


<iframe type="text/html" height="640px" src="https://www.youtube.com/embed/otoC0du9to0" frameborder="0"></iframe>

<iframe src="//player.bilibili.com/player.html?bvid=BV1fa4y1173y&page=1&autoplay=0" height='640px' scrolling="no" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>
Binary file added docx/actions/media/images/07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docx/actions/method/SubString.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
## 输出

> 部分字符串,参考:[String](../types/String.md)
> 部分字符串,参考:[String](./types/String.md)

## 脚本调用
Expand Down
2 changes: 1 addition & 1 deletion docx/actions/network/HttpDownload.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
## 输出

> 下载的文件的完整路径。参考:[`Path`](../types/Path.md)
> 下载的文件的完整路径。参考:[`Path`](./types/Path.md)


Expand Down
4 changes: 2 additions & 2 deletions docx/actions/network/HttpGet.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* 标头
> 在 HTTP GET 请求中传递 HTTP 标头,例如:`Accept: application/json`
* 参数
* 查询字符串
> 查询字符串(名称/值对),在 GET 请求的 URL 中发送:`/test/demo.html?name1=value1&name2=value2`,可选项。
## 输出

> GET 方法返回的内容,参考字符串类型:[String](../types/String.md)
> GET 方法返回的内容,参考字符串类型:[String](./types/String.md)

## 脚本调用
Expand Down
2 changes: 1 addition & 1 deletion docx/actions/network/HttpHead.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

## 输出

> 输出 *HEAD* 方法的返回内容,参考类型:[String](../types/String.md)
> 输出 *HEAD* 方法的返回内容,参考类型:[String](./types/String.md)

## 资源
Expand Down
11 changes: 7 additions & 4 deletions docx/actions/network/HttpPost.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
例如:

* application/x-www-form-urlencoded
> 这是默认的 Content-Type,键和值被编码在由 分隔的键值元组中 '&','='键和值之间有一个。非字母数字值使用百分比编码进行转义。
> 这是默认的 Content-Type,将键值对使用 `&`连接,键和值之间用 `=` 号连接,非字母数字值使用百分比编码进行转义。如果有空格,将空格转换为 `+` 加号
* multipart/form-data
> 每个值都作为数据块(正文部分)发送,并用用户代理定义的分隔符(边界)分隔每个部分。
> 每个值都作为数据块(正文部分)发送,并用用户定义的分隔符(边界)分隔每个部分。
* text/plain
> 消息体没有规定的格式,服务器需要进行相应的处理。
Expand All @@ -20,7 +20,10 @@
## 运行参数

* 网址
>
> *Post* 请求的服务器。
* 标头
> 在 HTTP GET 请求中传递 HTTP 标头,例如:`Accept: application/json`
* 数据类型
> Content-Type 如:`application/json`,要将 JSON 数据发布到服务器。
* 数据
Expand All @@ -29,7 +32,7 @@

## 输出

> 请求返回的数据,字符串类型,参考:[String](../types/String.md)
> 请求返回的数据,字符串类型,参考:[String](./types/String.md)

## 资源
Expand Down
5 changes: 3 additions & 2 deletions docx/actions/network/NetworkConnect.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@


* 主机
> 服务器地址,通常包含 *IP* 和端口。参考:[HostAddress](../types/HostAddress.md)
> 服务器地址,通常包含 *IP* 和端口。参考:[HostAddress](./types/HostAddress.md)
* 类型
> 网络协议。
## 输出
> 套接字,可用于读取或者发送数据,*UDP*协议,参考:[UDPSocket](../types/UDPSocket.md)*TCP*协议,参考:[TCPSocket](../types/TCPSocket.md)
> 套接字,可用于读取或者发送数据,*UDP*协议,参考:[UDPSocket](./types/UDPSocket.md)*TCP*协议,参考:[TCPSocket](./types/TCPSocket.md)
### 资源

*TCP*示例: https://github.com/shelllet/WinUi/blob/main/network/TcpListen.simple

*UDP* 示例: https://github.com/shelllet/WinUi/blob/main/network/UdpListen.simple


8 changes: 4 additions & 4 deletions docx/actions/network/NetworkListen.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
![NetworkListen](./images/06.png ':size=90%')

## 子动作
> 不支持,客户端连接的 *套接字* 会传入子流程中。如果是 *UDP*, 传递参数:[UDPSocket](../types/UDPSocket.md)。如果是*TCP*, 传递参数: [TCPSocket](../types/TCPSocket.md)
> 支持,客户端连接的 *套接字* 会传入子流程中。如果是 *UDP*, 传递参数:[UDPSocket](./types/UDPSocket.md)。如果是*TCP*, 传递参数: [TCPSocket](./types/TCPSocket.md)
## 运行参数


* 端口
> 监听的主机地址,通常包含 *IP* 地址和端口,*IP* 地址可空。参考:[HostAddress](../types/HostAddress.md)
* 主机
> 监听的主机地址,通常包含 *IP* 地址和端口,*IP* 地址可空。参考:[HostAddress](./types/HostAddress.md)
* 类型
> 网络协议,支持 *TCP* 或者 *UDP* 协议。
## 输出

> 如果是 *TCP* 协议,返回[TcpServer](../types/TcpServer.md) ,如果是*UDP*协议,返回 [UDPSocket](../types/UDPSocket.md)
> 如果是 *TCP* 协议,返回[TcpServer](./types/TcpServer.md) ,如果是*UDP*协议,返回 [UDPSocket](./types/UDPSocket.md)
### 资源

Expand Down
4 changes: 2 additions & 2 deletions docx/actions/network/NetworkReceive.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

* 主机

> 如果是 *TCP* 协议,该参数类型为:[TCPSocket](../types/TCPSocket.md)。如果是*UDP* 协议,该参数是主机地址,参考:[主机地址](../types/HostAddress.md)或者 [UDPSocket](../types/UDPSocket.md)
> 如果是 *TCP* 协议,该参数类型为:[TCPSocket](./types/TCPSocket.md)。如果是*UDP* 协议,该参数是主机地址,参考:[主机地址](./types/HostAddress.md)或者 [UDPSocket](./types/UDPSocket.md)

## 输出

> 收到的数据,参考:[字符串](../types/String.md)
> 收到的数据,参考:[字符串](./types/String.md)

## 资源
Expand Down
6 changes: 3 additions & 3 deletions docx/actions/network/NetworkSend.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
## 运行参数

* 主机
>> 如果是 *TCP* 协议,该参数类型为:[TCPSocket](../types/TCPSocket.md)。如果是*UDP* 协议,该参数是主机地址,参考:[主机地址](../types/HostAddress.md)或者 [UDPSocket](../types/UDPSocket.md)
>> 如果是 *TCP* 协议,该参数类型为:[TCPSocket](./types/TCPSocket.md)。如果是*UDP* 协议,该参数是主机地址,参考:[主机地址](./types/HostAddress.md)或者 [UDPSocket](./types/UDPSocket.md)
* 数据
> 发送的数据。该数据会被序列化成[字符串](../types/String.md)发送。
> 发送的数据。该数据会被序列化成[字符串](./types/String.md)发送。
## 输出

> 如果是 *TCP* 协议,该动作返回:[TCPSocket](../types/TCPSocket.md)。如果是*UDP* 协议,该动作返回: [UDPSocket](../types/UDPSocket.md)
> 如果是 *TCP* 协议,该动作返回:[TCPSocket](./types/TCPSocket.md)。如果是*UDP* 协议,该动作返回: [UDPSocket](./types/UDPSocket.md)
### 资源

Expand Down
Loading

0 comments on commit bc43d5b

Please sign in to comment.