tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #14549 from abpframework/auto-merge/rel-6-0/1435 

Merge branch dev with rel-6.0
pull/14553/head
liangshiwei 4 years ago
committed by GitHub
parent
7226d897dd 977416cc07
commit
c6c81b271e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor

77
framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
View File

@ -1,49 +1,52 @@
<Modal @ref="@ModalRef" Closing="@OnModalClosing"> <Modal @ref="@ModalRef" Closing="@OnModalClosing">
<ModalContent Centered="@CenterMessage"> <ModalContent Centered="@CenterMessage">
<ModalHeader> @if (!Title.IsNullOrEmpty())
<ModalTitle> {
@Title <ModalHeader>
</ModalTitle> <ModalTitle>
</ModalHeader> @Title
</ModalTitle>
</ModalHeader>
}
<ModalBody> <ModalBody>
@if ( ShowMessageIcon ) @if ( ShowMessageIcon )
{ {
<DisplayHeading Size="DisplayHeadingSize.Is2" Alignment="TextAlignment.Center"> <DisplayHeading Size="DisplayHeadingSize.Is2" TextAlignment="TextAlignment.Center">
<Icon Name="@MessageIcon" Style="@MessageIconStyle" /> <Icon Name="@MessageIcon" Style="@MessageIconStyle" />
</DisplayHeading> </DisplayHeading>
} }
<Text Alignment="TextAlignment.Center"> <Paragraph TextAlignment="TextAlignment.Center" Margin="Margin.Is0.FromBottom">
@Message @Message
</Text> </Paragraph>
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter class="d-flex justify-content-center">
@if ( IsConfirmation ) @if ( IsConfirmation )
{ {
<Button Color="Color.Danger" Padding="Padding.Is2.OnX" Clicked="@OnCancelClicked"> <Button Color="Color.Danger" Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnCancelClicked">
@if ( Options?.CancelButtonIcon != null ) @if ( Options?.CancelButtonIcon != null )
{ {
<Icon Name="@Options.CancelButtonIcon" Margin="Margin.Is2.FromEnd" /> <Icon Name="@Options.CancelButtonIcon" Margin="Margin.Is2.FromEnd" />
} }
@CancelButtonText @CancelButtonText
</Button> </Button>
<Button Color="Color.Primary" Padding="Padding.Is2.OnX" Clicked="@OnConfirmClicked"> <Button Color="Color.Primary" Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnConfirmClicked">
@if ( Options?.ConfirmButtonIcon != null ) @if ( Options?.ConfirmButtonIcon != null )
{ {
<Icon Name="@Options.ConfirmButtonIcon" Margin="Margin.Is2.FromEnd" /> <Icon Name="@Options.ConfirmButtonIcon" Margin="Margin.Is2.FromEnd" />
} }
@ConfirmButtonText @ConfirmButtonText
</Button> </Button>
} }
else else
{ {
<Button Color="Color.Primary" Padding="Padding.Is2.OnX" Clicked="@OnOkClicked"> <Button Color="Color.Primary" Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnOkClicked">
@if ( Options?.OkButtonIcon != null ) @if ( Options?.OkButtonIcon != null )
{ {
<Icon Name="@Options.OkButtonIcon" Margin="Margin.Is2.FromEnd" /> <Icon Name="@Options.OkButtonIcon" Margin="Margin.Is2.FromEnd" />
} }
@OkButtonText @OkButtonText
</Button> </Button>
} }
</ModalFooter> </ModalFooter>
</ModalContent> </ModalContent>
</Modal> </Modal>
Write Preview
Loading…
Cancel
Save