Update AntDesign 1.1.0 (#114)

* Update AntDesign 1.1.0 * ignore css
ant-design-blazor · Jan 1, 2025 · 568b607 · 568b607
1 parent 4561eb8
commit 568b607
Show file tree

Hide file tree

Showing 36 changed files with 37 additions and 52 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
@@ -12,7 +12,7 @@
     <SpaceItem>
         <Tooltip Title="@("Help")" Placement="@Placement.Bottom">
             <span class="action">
-                <Icon Type="question-circle" Theme="outline" />
+                <Icon Type="question-circle" Theme="@IconThemeType.Outline" />
             </span>
         </Tooltip>
     </SpaceItem>

diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Admin.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Admin.razor
@@ -5,12 +5,12 @@
     <Card>
         <Alert 
             Message="umi ui 现已发布，欢迎使用 npm run ui 启动体验。"
-            Type="success"
+            Type="@AlertType.Success"
             ShowIcon="true"
             Banner
             Style="margin: -12px; margin-bottom: 48px;"/>
         <Title Level="2" Style="text-align: center;">
-            <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
         </Title>
     </Card>
     <p style="text-align: center; margin-top: 24px;">

diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Welcome.razor b/src/layout/example/AntDesign.ProLayout.Wasm/Pages/Welcome.razor
@@ -5,7 +5,7 @@
     <Card>
         <Alert
             Message="umi ui 现已发布，点击右下角 umi 图标即可使用"
-            Type="success"
+            Type="AlertType.Success"
             ShowIcon="true"
             Banner
             Style="margin: -12px; margin-bottom: 24px"/>

diff --git 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%;">
             <SelectOptions>
                 <SelectOption TItem="string" TItemValue="string" Value="@("product")" Label="Product" />

diff --git a/src/layout/example/AntDesign.ProLayout.Wasm/wwwroot/css/app.css b/src/layout/example/AntDesign.ProLayout.Wasm/wwwroot/css/app.css
diff --git a/src/layout/src/AntDesign.ProLayout.csproj b/src/layout/src/AntDesign.ProLayout.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AntDesign" Version="1.0.1" />
+    <PackageReference Include="AntDesign" Version="1.1.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' And '$(SolutionDir)'==''">

diff --git 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
@@ -35,11 +35,11 @@ else
                     @onclick="@(async () => { await OnCollapse.InvokeAsync(!Collapsed);})">
                     @if (Collapsed)
                     {
-                        <Icon Type="menu-unfold" Theme="outline" />
+                        <Icon Type="menu-unfold" Theme="@IconThemeType.Outline" />
                     }
                     else
                     {
-                        <Icon Type="menu-fold" Theme="outline" />
+                        <Icon Type="menu-fold" Theme="@IconThemeType.Outline" />
                     }
                 </span>
             }

diff --git a/src/layout/src/HeaderSearch/HeaderSearch.razor b/src/layout/src/HeaderSearch/HeaderSearch.razor
@@ -2,7 +2,7 @@
 @inherits AntDomComponentBase
 
 <div class="@ClassMapper.Class" @onclick="@(async args => await SetSearchMode(true))">
-    <Icon Type="search" Theme="outline" Style="cursor: pointer;" />
+    <Icon Type="search" Theme="@IconThemeType.Outline" Style="cursor: pointer;" />
     <!--todo: auto complete not working-->
     @* <AutoComplete Class="@AutoCompleteClassMapper.Class" *@
     @*               Options="@Options"> *@

diff --git a/src/layout/src/NoticeIcon/NoticeIcon.razor b/src/layout/src/NoticeIcon/NoticeIcon.razor
@@ -17,7 +17,7 @@
     <Unbound>
         <span @ref="@context.Current" class="@ClassMapper.Class">
             <Badge Count="Count" Style="box-shadow: none;" Class="badge">
-                <Icon Type="bell" Theme="outline" />
+                <Icon Type="bell" Theme="@IconThemeType.Outline" />
             </Badge>
         </span>
     </Unbound>

diff --git a/src/layout/src/RightContent/AvatarDropdown.razor b/src/layout/src/RightContent/AvatarDropdown.razor
@@ -27,11 +27,11 @@
 
             @if (string.IsNullOrEmpty(Avatar))
             {
-                <Avatar Size="small" Icon="user" />
+                <Avatar Size="@AvatarSize.Small" Icon="user" />
             }
             else
             {
-                <Avatar Size="small" Class="avatar" Src="@Avatar" Alt="avatar" />
+                <Avatar Size="@AvatarSize.Small" Class="avatar" Src="@Avatar" Alt="avatar" />
             }
 
             <span class="name anticon">@Name</span>

diff --git 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
@@ -20,7 +20,7 @@
     </Overlay>
     <Unbound>
         <span class="dropDown" @ref="@context.Current">
-            <Icon Type="global" Theme="outline" />
+            <Icon Type="global" Theme="@IconThemeType.Outline" />
         </span>
     </Unbound>
 </Dropdown>
diff --git a/src/layout/src/SettingDrawer/BlockCheckbox.razor b/src/layout/src/SettingDrawer/BlockCheckbox.razor
@@ -9,7 +9,7 @@
                 <img src="@item.Url" alt="@item.Key" />
             </Tooltip>
             <div class="@BaseClassName-selectIcon" style="display: @(Value == item.Key ? "block" : "none");">
-                <Icon Type="check" Theme="outline" />
+                <Icon Type="check" Theme="@IconThemeType.Outline" />
             </div>
         </div>
     }

diff --git a/src/layout/src/SettingDrawer/LayoutSetting.razor b/src/layout/src/SettingDrawer/LayoutSetting.razor
@@ -28,7 +28,7 @@
                 Action = @<Select
                               TItem="string"
                               TItemValue="string"
-                              Size="small"
+                              Size="@InputSize.Small"
                               Style="width: 80px;"
                               DefaultValue="SettingState.Value.ContentWidth"
                               @bind-Value="SettingState.Value.ContentWidth">
@@ -41,17 +41,17 @@
             new SettingItem
             {
                 Title="Fixed Header",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.FixedHeader" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.FixedHeader" />
             },
             new SettingItem
             {
                 Title="Works on Side Menu Layout",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.FixSiderbar" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.FixSiderbar" />
             },
             new SettingItem
             {
                 Title="Split Menus",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.SplitMenus" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.SplitMenus" />
             },
         };
     }

diff --git a/src/layout/src/SettingDrawer/OtherSetting.razor b/src/layout/src/SettingDrawer/OtherSetting.razor
@@ -26,7 +26,7 @@
             new SettingItem
             {
                 Title = "Weakmode",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.ColorWeak" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.ColorWeak" />
             },
             new SettingItem()
         };

diff --git a/src/layout/src/SettingDrawer/RegionalSetting.razor b/src/layout/src/SettingDrawer/RegionalSetting.razor
@@ -25,22 +25,22 @@
             new SettingItem
             {
                 Title = "header",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.HeaderRender" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.HeaderRender" />
             },
             new SettingItem
             {
                 Title = "footer",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.FooterRender" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.FooterRender" />
             },
             new SettingItem
             {
                 Title = "menu",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.MenuRender" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.MenuRender" />
             },
             new SettingItem
             {
                 Title = "menuHeader",
-                Action = @<Switch Size="small" @bind-Value="SettingState.Value.MenuHeaderRender" />
+                Action = @<Switch Size="@InputSize.Small" @bind-Value="SettingState.Value.MenuHeaderRender" />
             },
         };
     }

diff --git a/src/layout/src/SettingDrawer/SettingDrawer.razor b/src/layout/src/SettingDrawer/SettingDrawer.razor
@@ -4,17 +4,17 @@
 <Drawer
     Visible="_show"
     Width="@("300")"
-    Placement="right"
+    Placement="@DrawerPlacement.Right"
     Style="z-index: 999;">
     <Handler>
         <div class="@BaseClassName-drawer-handle" @onclick="SetShow">
             @if (_show)
             {
-                <Icon Type="close" Theme="outline" Style="color: #fff; font-size: 20px;" />
+                <Icon Type="close" Theme="@IconThemeType.Outline" Style="color: #fff; font-size: 20px;" />
             }
             else
             {
-                <Icon Type="setting" Theme="outline" Style="color: #fff; font-size: 20px;" />
+                <Icon Type="setting" Theme="@IconThemeType.Outline" Style="color: #fff; font-size: 20px;" />
             }
         </div>
     </Handler>
@@ -74,7 +74,7 @@
             @if (!HideHintAlert)
             {
                 <Alert
-                    Type="warning"
+                    Type="AlertType.Warning"
                     Message="Setting panel shows in development environment only, please manually modify"
                     Icon="_notification"
                     ShowIcon="true"
@@ -84,7 +84,7 @@
             @if (!HideCopyButton)
             {
                 <Button Block OnClick="CopySetting">
-                    <Icon Type="copy" Theme="outline" /> Copy Setting
+                    <Icon Type="copy" Theme="IconThemeType.Outline" /> Copy Setting
                 </Button>
             }
         </div>

diff --git a/src/layout/src/SettingDrawer/ThemeColor.razor b/src/layout/src/SettingDrawer/ThemeColor.razor
@@ -13,7 +13,7 @@
             <div class="theme-color-block" style="background-color: @item.Color" @onclick="@(async x=> await HandleClickAsync(item.Key))">
                 @if (Value == item.Key)
                 {
-                    <Icon Type="check" Theme="outline" />
+                    <Icon Type="check" Theme="IconThemeType.Outline" />
                 }
             </div>
         }

diff --git a/src/layout/src/SiderMenu/BaseMenu.razor b/src/layout/src/SiderMenu/BaseMenu.razor
@@ -26,7 +26,7 @@
         return @<span>
             @if (!string.IsNullOrEmpty(menuItem.Icon))
             {
-                <Icon IconFont="@menuItem.IconFont" Type="@menuItem.Icon" Theme="outline" />
+                <Icon IconFont="@menuItem.IconFont" Type="@menuItem.Icon" Theme="IconThemeType.Outline" />
             }
             <span>@menuItem.Name</span>
             </span>

diff --git a/src/layout/src/SiderMenu/SiderMenu.razor.cs b/src/layout/src/SiderMenu/SiderMenu.razor.cs
@@ -54,10 +54,10 @@ public SiderTheme SiderTheme
         {
             get
             {
-                return NavTheme.Name switch
+                return NavTheme switch
                 {
-                    "light" => SiderTheme.Light,
-                    "dark" => SiderTheme.Dark,
+                    MenuTheme.Light => SiderTheme.Light,
+                    MenuTheme.Dark => SiderTheme.Dark,
                     _ => SiderTheme.Light
                 };
             }

diff --git a/src/layout/src/wwwroot/theme/cyan.css b/src/layout/src/wwwroot/theme/cyan.css
diff --git a/src/layout/src/wwwroot/theme/dark-cyan.css b/src/layout/src/wwwroot/theme/dark-cyan.css
diff --git a/src/layout/src/wwwroot/theme/dark-dust.css b/src/layout/src/wwwroot/theme/dark-dust.css
diff --git a/src/layout/src/wwwroot/theme/dark-geekblue.css b/src/layout/src/wwwroot/theme/dark-geekblue.css
diff --git a/src/layout/src/wwwroot/theme/dark-green.css b/src/layout/src/wwwroot/theme/dark-green.css
diff --git a/src/layout/src/wwwroot/theme/dark-purple.css b/src/layout/src/wwwroot/theme/dark-purple.css
diff --git a/src/layout/src/wwwroot/theme/dark-sunset.css b/src/layout/src/wwwroot/theme/dark-sunset.css
diff --git a/src/layout/src/wwwroot/theme/dark-volcano.css b/src/layout/src/wwwroot/theme/dark-volcano.css
diff --git a/src/layout/src/wwwroot/theme/dark.css b/src/layout/src/wwwroot/theme/dark.css
diff --git a/src/layout/src/wwwroot/theme/dust.css b/src/layout/src/wwwroot/theme/dust.css
diff --git a/src/layout/src/wwwroot/theme/geekblue.css b/src/layout/src/wwwroot/theme/geekblue.css
diff --git a/src/layout/src/wwwroot/theme/green.css b/src/layout/src/wwwroot/theme/green.css
diff --git a/src/layout/src/wwwroot/theme/purple.css b/src/layout/src/wwwroot/theme/purple.css
diff --git a/src/layout/src/wwwroot/theme/sunset.css b/src/layout/src/wwwroot/theme/sunset.css
diff --git a/src/layout/src/wwwroot/theme/volcano.css b/src/layout/src/wwwroot/theme/volcano.css