Skip to content

Commit df0051d

Browse files
committed
migrate to mudblazor v9
1 parent 74cdc18 commit df0051d

7 files changed

Lines changed: 29 additions & 27 deletions

File tree

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Layout/Components/Culture/CultureIcon.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MudMenu Color="Color.Inherit" Dense="true"
88
AnchorOrigin="Origin.BottomLeft" TransformOrigin="Origin.TopRight">
99
<ActivatorContent>
10-
<MudIcon Icon="@Icons.Material.Filled.Language" Size="Size.Small" Color="Color.Inherit" />
10+
<MudIcon Icon="@Icons.Material.Filled.Language" Size="Size.Small" Color="Color.Inherit" @onclick="@context.ToggleAsync" />
1111
<MudText Typo="Typo.caption" Color="Color.Surface">@_loc["CultureLanguage"]</MudText>
1212
</ActivatorContent>
1313
<ChildContent>

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Layout/Components/NavTabs/NavTab.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
@using BlazorAdmin.Servers.Core.States
33
@rendermode InteractiveServer
44

5-
<MudDynamicTabs MinimumTabWidth="120px" AddIconStyle="display:none;"
6-
@bind-ActivePanelIndex="_selectedTabIndex" CloseIconStyle="padding:0;"
5+
<MudDynamicTabs MinimumTabWidth="120px" AddIconClass="d-none"
6+
@bind-ActivePanelIndex="_selectedTabIndex" CloseIconClass="pa-0"
77
Class="mud-elevation-1 rounded-t" Style="overflow:hidden;"
88
CloseTab="OnTabClose">
99
@foreach (var tab in _userTabs)

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Layout/Components/Notification/NotificationIcon.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
@rendermode InteractiveServer
1616

1717
<MudMenu Icon="@Icons.Material.Filled.Notifications" Color="Color.Inherit" Dense="true"
18-
TransformOrigin="Origin.TopRight">
18+
TransformOrigin="Origin.TopRight" >
1919
<ActivatorContent>
2020
@if (UnreadCount > 0)
2121
{
2222
<MudBadge Content="@UnreadCount" Color="Color.Primary" Class="dense-badge"
2323
Overlap="true" Style="margin-right:12px;">
24-
<MudIconButton Icon="@Icons.Material.Filled.Notifications" Color="Color.Inherit">
24+
<MudIconButton Icon="@Icons.Material.Filled.Notifications" Color="Color.Inherit" OnClick="@context.ToggleAsync">
2525
</MudIconButton>
2626
</MudBadge>
2727
}
2828
else
2929
{
3030
<MudIconButton Icon="@Icons.Material.Filled.Notifications" Color="Color.Inherit"
31-
Style="margin-right:12px;">
31+
Style="margin-right:12px;" OnClick="@context.ToggleAsync">
3232
</MudIconButton>
3333
}
3434
</ActivatorContent>

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Layout/Components/Themes/ProvidersAggregate.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<MudThemeProvider IsDarkMode="@_themeState.IsDark" Theme="@_themeState.MudTheme" />
66
<MudPopoverProvider />
7-
<MudDialogProvider />
7+
<MudDialogProvider DefaultFocus="DefaultFocus.FirstChild" />
88
<MudSnackbarProvider />
99

1010
@code {

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Layout/Components/UserAvatar/Dialogs/Com/BasicInfoConfig.razor

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<MudText>头像</MudText>
1313
<MudSpacer />
1414
<MudFileUpload Class="flex-none" T="IBrowserFile" FilesChanged="UploadFiles" Accept=".png, .jpg">
15-
<ActivatorContent>
16-
<MudIconButton>
15+
<CustomContent Context="fileUpload">
16+
<MudIconButton OnClick="@fileUpload.OpenFilePickerAsync">
1717
@if (string.IsNullOrEmpty(_user.Avatar))
1818
{
1919
<MudAvatar Color="Color.Primary">
@@ -27,7 +27,9 @@
2727
</MudAvatar>
2828
}
2929
</MudIconButton>
30-
</ActivatorContent>
30+
</CustomContent>
31+
<SelectedTemplate>
32+
</SelectedTemplate>
3133
</MudFileUpload>
3234
</div>
3335
</MudListItem>
@@ -43,7 +45,7 @@
4345
else
4446
{
4547
<MudTextField @bind-Value="_editUserName" Immediate="true" @onblur="EditUserNameBlur"
46-
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
48+
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
4749
}
4850
</div>
4951
</MudListItem>
@@ -59,7 +61,7 @@
5961
else
6062
{
6163
<MudTextField @bind-Value="_editRealName" Immediate="true" @onblur="EditRealNameBlur"
62-
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
64+
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
6365
}
6466
</div>
6567
</MudListItem>
@@ -75,7 +77,7 @@
7577
else
7678
{
7779
<MudTextField @bind-Value="_editEmail" Immediate="true" @onblur="EditEmailBlur"
78-
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
80+
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
7981
}
8082
</div>
8183
</MudListItem>
@@ -91,7 +93,7 @@
9193
else
9294
{
9395
<MudTextField @bind-Value="_editPhone" Immediate="true" @onblur="EditPhoneBlur"
94-
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
96+
Margin="Margin.Dense" Variant="Variant.Outlined" AutoFocus="true"></MudTextField>
9597
}
9698
</div>
9799
</MudListItem>

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Layout/Components/UserAvatar/Dialogs/ProfileSetting.razor

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55

66
<MudDialog Gutters="false">
7-
<DialogContent>
8-
<div style="width:800px;height:600px;" class="pa-4">
9-
<MudText Typo="Typo.h6">账号设置</MudText>
10-
<MudTabs Position="Position.Left" Rounded="true" Class="mt-2" PanelClass="pa-2" Elevation="1"
11-
Style="height:calc(100% - 20px);">
12-
<MudTabPanel Text="基本信息" Icon="@Icons.Material.Filled.SettingsApplications" Style="justify-content:start;">
13-
<BasicInfoConfig/>
14-
</MudTabPanel>
7+
<DialogContent>
8+
<div style="width:800px;height:600px;" class="pa-4">
9+
<MudText Typo="Typo.h6">账号设置</MudText>
10+
<MudTabs Position="Position.Left" Rounded="true" Class="mt-2" TabPanelsClass="pa-2" Elevation="1"
11+
Style="height:calc(100% - 20px);">
12+
<MudTabPanel Text="基本信息" Icon="@Icons.Material.Filled.SettingsApplications" Style="width:100%;">
13+
<BasicInfoConfig />
14+
</MudTabPanel>
1515

16-
</MudTabs>
17-
</div>
18-
</DialogContent>
16+
</MudTabs>
17+
</div>
18+
</DialogContent>
1919
</MudDialog>

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Layout/Components/UserAvatar/UserMenuAvatar.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<ActivatorContent>
1010
@if (string.IsNullOrEmpty(_avatar))
1111
{
12-
<MudAvatar Size="Size.Small" Color=" Color.Primary">
12+
<MudAvatar Size="Size.Small" Color=" Color.Primary" @onclick="@context.ToggleAsync">
1313
@_userName.FirstOrDefault()
1414
</MudAvatar>
1515
}
1616
else
1717
{
18-
<MudAvatar Size="Size.Small">
18+
<MudAvatar Size="Size.Small" @onclick="@context.ToggleAsync">
1919
<MudImage Src="@("Avatars/" + _avatar)"></MudImage>
2020
</MudAvatar>
2121
}

0 commit comments

Comments
 (0)