Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 82e85a9

Browse files
committed
fix: DialogResult 的 Close 改为 Cancelled,用于表示点击的是取消操作
1 parent fa48d92 commit 82e85a9

7 files changed

Lines changed: 27 additions & 27 deletions

File tree

doc/TDesign.Docs.ServerSide/TDesign.xml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/TDesign.Docs.Shared/Pages/Components/Notification/DialogPage.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ async Task GetResult()
170170
{
171171
var dialog = await DialogService.Open<Templates.ReturnDataDialogTemplate>();
172172
var result = await dialog.Result;//对话框操作过后才有值
173-
if ( result.Closed )//表示对话框已经关闭
173+
if ( !result.Cancelled )//点击的是确认操作
174174
{
175175
await DialogService.OpenInfo(result.Data?.ToString());
176176
}
@@ -221,7 +221,7 @@ async Task GetResult()
221221
{
222222
var dialog = await DialogService.Open<Templates.ReturnDataDialogTemplate>();
223223
var result = await dialog.Result;//对话框操作过后才有值
224-
if ( result.Closed )//表示对话框已经关闭
224+
if ( !result.Cancelled )//点击的是确认操作
225225
{
226226
await DialogService.OpenInfo(result.Data?.ToString());
227227
}

doc/TDesign.Docs.WebAssembly/wwwroot/TDesign.xml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/TDesign/Components/Dialog/DialogContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ public class DialogContext : ComponentBase
1818
/// <summary>
1919
/// 取消操作并关闭对话框。
2020
/// </summary>
21-
public Task Cancel() => Wrapper.Close(DialogResult.Close());
21+
public Task Cancel() => Wrapper.Close(DialogResult.Cancel());
2222

2323
/// <summary>
2424
/// 确定操作并关闭对话框。
2525
/// </summary>
2626
/// <typeparam name="TResult">结果类型。</typeparam>
2727
/// <param name="result">确定操作要返回的结果。</param>
28-
public Task Confirm<TResult>(TResult? result = default) => Wrapper.Close(DialogResult.Ok(result));
28+
public Task Confirm<TResult>(TResult? result = default) => Wrapper.Close(DialogResult.Confirm(result));
2929

3030
/// <inheritdoc/>
3131
protected override void BuildRenderTree(RenderTreeBuilder builder)

src/TDesign/Components/Dialog/DialogResult.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
public record struct DialogResult
77
{
88
/// <summary>
9-
/// 获取一个布尔值,表示对话框是否已经关闭
9+
/// 获取一个布尔值,表示对话框的结果是点击了取消操作
1010
/// </summary>
11-
public bool Closed { get; private set; }
11+
public bool Cancelled { get; private set; }
1212

1313
/// <summary>
1414
/// 获取自定义数据。
1515
/// </summary>
1616
public object? Data { get; private set; }
1717
/// <summary>
18-
/// 关闭对话框
18+
/// 设置对话框的结果是取消的,并设置 <see cref="Cancelled"/> 为 <c>true</c>
1919
/// </summary>
2020
/// <returns>对话框结果。</returns>
21-
public static DialogResult Close() => new() { Closed = true };
21+
public static DialogResult Cancel() => new() { Cancelled = true };
2222
/// <summary>
23-
/// 确认对话框
23+
/// 设置对话框的结果是确认的,并可以返回一个结果
2424
/// </summary>
2525
/// <typeparam name="T">返回数据的类型。</typeparam>
2626
/// <param name="result">要返回的结果。</param>
2727
/// <returns>对话框结果。</returns>
28-
public static DialogResult Ok<T>(T? result=default) => new() { Data = result, Closed = true };
28+
public static DialogResult Confirm<T>(T? result = default) => new() { Data = result };
2929
}

src/TDesign/Components/Dialog/DialogWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public async Task Close(DialogResult result)
147147
Reset();
148148
}
149149

150-
public Task Close() => Close(DialogResult.Close());
150+
public Task Close() => Close(DialogResult.Cancel());
151151

152152

153153
bool _parameterSet;

src/TDesign/TDesign.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
<SupportedPlatform Include="browser" />
4040
</ItemGroup>
4141
<ItemGroup>
42-
<PackageReference Include="ComponentBuilder" Version="4.0.0-beta-3" />
43-
<PackageReference Include="ComponentBuilder.Extensions" Version="4.0.0-beta-3" />
44-
<PackageReference Include="ComponentBuilder.FluentRenderTree" Version="4.0.0-beta-3" />
45-
<PackageReference Include="ComponentBuilder.JSInterop" Version="4.0.0-beta-3" />
42+
<PackageReference Include="ComponentBuilder" Version="4.0.0" />
43+
<PackageReference Include="ComponentBuilder.Extensions" Version="4.0.0" />
44+
<PackageReference Include="ComponentBuilder.FluentRenderTree" Version="4.0.0" />
45+
<PackageReference Include="ComponentBuilder.JSInterop" Version="4.0.0" />
4646
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
4747
<PackageReference Include="OneOf" Version="3.0.243" />
4848
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060">

0 commit comments

Comments
 (0)