From 47803473438771ddddd838a35f560ce44daa4061 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 1 Jan 2025 13:12:22 +0800 Subject: [PATCH 1/2] Update AntDesign 1.1.0 --- .../Components/GlobalHeaders/RightContent.razor | 2 +- .../example/AntDesign.ProLayout.Wasm/Pages/Admin.razor | 4 ++-- .../AntDesign.ProLayout.Wasm/Pages/Welcome.razor | 2 +- .../AntDesign.ProLayout.Wasm/Shared/ProLayout.razor | 2 +- src/layout/src/AntDesign.ProLayout.csproj | 2 +- src/layout/src/Core/AntProComponentBase.cs | 5 +++-- src/layout/src/GlobalHeader/GlobalHeader.razor | 4 ++-- src/layout/src/HeaderSearch/HeaderSearch.razor | 2 +- src/layout/src/NoticeIcon/NoticeIcon.razor | 2 +- src/layout/src/RightContent/AvatarDropdown.razor | 4 ++-- src/layout/src/RightContent/AvatarDropdown.razor.cs | 2 +- src/layout/src/SelectLang/SelectLang.razor | 2 +- src/layout/src/SettingDrawer/BlockCheckbox.razor | 2 +- src/layout/src/SettingDrawer/LayoutSetting.razor | 8 ++++---- src/layout/src/SettingDrawer/OtherSetting.razor | 2 +- src/layout/src/SettingDrawer/RegionalSetting.razor | 8 ++++---- src/layout/src/SettingDrawer/SettingDrawer.razor | 10 +++++----- src/layout/src/SettingDrawer/ThemeColor.razor | 2 +- src/layout/src/SiderMenu/BaseMenu.razor | 2 +- src/layout/src/SiderMenu/SiderMenu.razor.cs | 6 +++--- 20 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Components/GlobalHeaders/RightContent.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Components/GlobalHeaders/RightContent.razor index 9aee886..9a4c202 100644 --- a/src/layout/example/AntDesign.ProLayout.Wasm/Components/GlobalHeaders/RightContent.razor +++ b/src/layout/example/AntDesign.ProLayout.Wasm/Components/GlobalHeaders/RightContent.razor @@ -12,7 +12,7 @@ - + diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Admin.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Admin.razor index c77ff5d..3275901 100644 --- a/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Admin.razor +++ b/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Admin.razor @@ -5,12 +5,12 @@ - <Icon Type="smile" Theme="twotone" /> Ant Design Pro <Icon Type="heart" Theme="twotone" TwotoneColor="#eb2f96" /> You + <Icon Type="smile" Theme="@IconThemeType.TwoTone" /> Ant Design Pro <Icon Type="heart" Theme="@IconThemeType.TwoTone" TwotoneColor="#eb2f96" /> You

diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Welcome.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Welcome.razor index 7cb3de4..860f415 100644 --- a/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Welcome.razor +++ b/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Welcome.razor @@ -5,7 +5,7 @@ diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor index 98a88c1..823f4f5 100644 --- a/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor +++ b/src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor @@ -22,7 +22,7 @@ TItem="string" TItemValue="string" DefaultValue="@("product")" - Size="small" + Size="@InputSize.Small" Style="width: 100%;"> diff --git a/src/layout/src/AntDesign.ProLayout.csproj b/src/layout/src/AntDesign.ProLayout.csproj index 6e7ac31..f361987 100644 --- a/src/layout/src/AntDesign.ProLayout.csproj +++ b/src/layout/src/AntDesign.ProLayout.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/layout/src/Core/AntProComponentBase.cs b/src/layout/src/Core/AntProComponentBase.cs index d44e16c..f828047 100644 --- a/src/layout/src/Core/AntProComponentBase.cs +++ b/src/layout/src/Core/AntProComponentBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Components; +using System.Collections.Generic; +using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Options; namespace AntDesign.ProLayout @@ -17,7 +18,7 @@ public MenuTheme NavTheme _ => MenuTheme.Dark }; } - set => SettingState.Value.NavTheme = value.Name; + set => SettingState.Value.NavTheme = value.ToString().ToLowerInvariant(); } [Parameter] diff --git a/src/layout/src/GlobalHeader/GlobalHeader.razor b/src/layout/src/GlobalHeader/GlobalHeader.razor index 23933e0..0fa76e9 100644 --- a/src/layout/src/GlobalHeader/GlobalHeader.razor +++ b/src/layout/src/GlobalHeader/GlobalHeader.razor @@ -35,11 +35,11 @@ else @onclick="@(async () => { await OnCollapse.InvokeAsync(!Collapsed);})"> @if (Collapsed) { - + } else { - + } } diff --git a/src/layout/src/HeaderSearch/HeaderSearch.razor b/src/layout/src/HeaderSearch/HeaderSearch.razor index 6677c71..939227c 100644 --- a/src/layout/src/HeaderSearch/HeaderSearch.razor +++ b/src/layout/src/HeaderSearch/HeaderSearch.razor @@ -2,7 +2,7 @@ @inherits AntDomComponentBase

- + @* *@ diff --git a/src/layout/src/NoticeIcon/NoticeIcon.razor b/src/layout/src/NoticeIcon/NoticeIcon.razor index 5a849fd..dbfba27 100644 --- a/src/layout/src/NoticeIcon/NoticeIcon.razor +++ b/src/layout/src/NoticeIcon/NoticeIcon.razor @@ -17,7 +17,7 @@ - + diff --git a/src/layout/src/RightContent/AvatarDropdown.razor b/src/layout/src/RightContent/AvatarDropdown.razor index 5526f9f..65a4390 100644 --- a/src/layout/src/RightContent/AvatarDropdown.razor +++ b/src/layout/src/RightContent/AvatarDropdown.razor @@ -27,11 +27,11 @@ @if (string.IsNullOrEmpty(Avatar)) { - + } else { - + } @Name diff --git a/src/layout/src/RightContent/AvatarDropdown.razor.cs b/src/layout/src/RightContent/AvatarDropdown.razor.cs index c2a3db4..5133c0f 100644 --- a/src/layout/src/RightContent/AvatarDropdown.razor.cs +++ b/src/layout/src/RightContent/AvatarDropdown.razor.cs @@ -24,7 +24,7 @@ public class AvatarMenuItem { public string Key { get; set; } public string IconType { get; set; } - public string IconTheme { get; set; } = "outline"; + public IconThemeType IconTheme { get; set; } = IconThemeType.Outline; public string Option { get; set; } public bool IsDivider { get; set; } } diff --git a/src/layout/src/SelectLang/SelectLang.razor b/src/layout/src/SelectLang/SelectLang.razor index 684a348..256367a 100644 --- a/src/layout/src/SelectLang/SelectLang.razor +++ b/src/layout/src/SelectLang/SelectLang.razor @@ -20,7 +20,7 @@ - + diff --git a/src/layout/src/SettingDrawer/BlockCheckbox.razor b/src/layout/src/SettingDrawer/BlockCheckbox.razor index 6d02f9d..e02a178 100644 --- a/src/layout/src/SettingDrawer/BlockCheckbox.razor +++ b/src/layout/src/SettingDrawer/BlockCheckbox.razor @@ -9,7 +9,7 @@ @item.Key
- +
} diff --git a/src/layout/src/SettingDrawer/LayoutSetting.razor b/src/layout/src/SettingDrawer/LayoutSetting.razor index adeb6a2..5fe3d59 100644 --- a/src/layout/src/SettingDrawer/LayoutSetting.razor +++ b/src/layout/src/SettingDrawer/LayoutSetting.razor @@ -28,7 +28,7 @@ Action = @