Browse Source

Merge pull request #20792 from nebula2/19785-html-uimessagealert

feat(blazor): html ui message alert
pull/20829/head
maliming 2 years ago
committed by GitHub
parent
commit
b23affb0ed
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 5
      framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Messages/UiMessageOptions.cs
  2. 9
      framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
  3. 3
      framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs

5
framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/Messages/UiMessageOptions.cs

@ -49,4 +49,9 @@ public class UiMessageOptions
/// Custom icon for the Cancel button. /// Custom icon for the Cancel button.
/// </summary> /// </summary>
public object? CancelButtonIcon { get; set; } public object? CancelButtonIcon { get; set; }
/// <summary>
/// Whether the message is html (true) or plain text (false)
/// </summary>
public bool IsMessageHtmlMarkup { get; set; }
} }

9
framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor

@ -16,7 +16,14 @@
</DisplayHeading> </DisplayHeading>
} }
<Paragraph TextAlignment="TextAlignment.Center" Margin="Margin.Is0.FromBottom" Style="white-space: break-spaces;"> <Paragraph TextAlignment="TextAlignment.Center" Margin="Margin.Is0.FromBottom" Style="white-space: break-spaces;">
@Message @if (!IsMessageHtmlMarkup)
{
@Message
}
else
{
@((MarkupString)Message)
}
</Paragraph> </Paragraph>
</ModalBody> </ModalBody>
<ModalFooter class="d-flex justify-content-center"> <ModalFooter class="d-flex justify-content-center">

3
framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs

@ -21,6 +21,9 @@ public partial class UiMessageAlert : ComponentBase, IDisposable
protected virtual bool ShowMessageIcon protected virtual bool ShowMessageIcon
=> Options?.ShowMessageIcon ?? true; => Options?.ShowMessageIcon ?? true;
protected virtual bool IsMessageHtmlMarkup
=> Options?.IsMessageHtmlMarkup ?? false;
protected virtual object? MessageIcon => Options?.MessageIcon ?? MessageType switch protected virtual object? MessageIcon => Options?.MessageIcon ?? MessageType switch
{ {
UiMessageType.Info => IconName.Info, UiMessageType.Info => IconName.Info,

Loading…
Cancel
Save