diff --git a/src/BootstrapBlazor/Components/Dialog/DialogOption.cs b/src/BootstrapBlazor/Components/Dialog/DialogOption.cs index 6d0381cb66a..13b9674d680 100644 --- a/src/BootstrapBlazor/Components/Dialog/DialogOption.cs +++ b/src/BootstrapBlazor/Components/Dialog/DialogOption.cs @@ -33,11 +33,13 @@ public class DialogOption /// /// 获得/设置 全屏弹窗 默认 None /// + /// 为保证功能正常,设置值后 均不可用 public FullScreenSize FullScreenSize { get; set; } = FullScreenSize.None; /// /// 获得/设置 是否显示最大化按钮 默认 false 不显示 /// + /// 为保证功能正常,设置值为 true 后 均不可用 public bool ShowMaximizeButton { get; set; } /// diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs index 4addf1cf229..bcc6e5717e7 100644 --- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs +++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs @@ -61,6 +61,7 @@ public partial class ModalDialog : IHandlerException /// /// 获得/设置 弹窗大小 默认为 /// + /// 为保证功能正常,设置值后 均不可用 [Parameter] public FullScreenSize FullScreenSize { get; set; } @@ -85,6 +86,7 @@ public partial class ModalDialog : IHandlerException /// /// 获得/设置 是否显示最大化按钮 默认为 false /// + /// 为保证功能正常,设置值为 true 后 均不可用 [Parameter] public bool ShowMaximizeButton { get; set; } @@ -329,6 +331,18 @@ protected override void OnParametersSet() ExportPdfButtonOptions.Icon ??= IconTheme.GetIconByKey(ComponentIcons.TableExportPdfIcon); MaximizeIconString = MaximizeWindowIcon; + + if (FullScreenSize != FullScreenSize.None) + { + ShowMaximizeButton = false; + ShowResize = false; + IsDraggable = false; + } + else if (ShowMaximizeButton) + { + ShowResize = false; + IsDraggable = false; + } } /// diff --git a/test/UnitTest/Components/DialogTest.cs b/test/UnitTest/Components/DialogTest.cs index c8f9619a398..30399084d30 100644 --- a/test/UnitTest/Components/DialogTest.cs +++ b/test/UnitTest/Components/DialogTest.cs @@ -64,7 +64,9 @@ await cut.InvokeAsync(() => dialog.Show(new DialogOption() return Task.CompletedTask; } })); - Assert.Contains("