diff --git a/.github/workflows/azure-static-web-apps-brave-coast-0edcf6600.yml b/.github/workflows/azure-static-web-apps-brave-coast-0edcf6600.yml
index 45eca3f9..7c7d88fd 100644
--- a/.github/workflows/azure-static-web-apps-brave-coast-0edcf6600.yml
+++ b/.github/workflows/azure-static-web-apps-brave-coast-0edcf6600.yml
@@ -15,9 +15,11 @@ jobs:
         with:
             persist-credentials: false
 
-      - uses: actions/setup-dotnet@v1
+      - name: Setup .NET SDKs
+        uses: actions/setup-dotnet@v4
         with:
-            dotnet-version: 8.0.100
+            dotnet-version: |
+              9.0.x
 
       - uses: actions/setup-node@v1
         with:
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index bd2ebabe..0262d1b9 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -20,10 +20,11 @@ jobs:
               with:
                   persist-credentials: false
 
-            - name: Setup .NET Core
-              uses: actions/setup-dotnet@v1
+            - name: Setup .NET SDKs
+              uses: actions/setup-dotnet@v4
               with:
-                  dotnet-version: 8.0.100
+                dotnet-version: |
+                  9.0.x
 
             - uses: actions/setup-node@v1
               with:
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 63ed171e..fef4f85c 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -12,10 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET SDKs
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: |
+            9.0.x
 
       - uses: actions/setup-node@v1
         with:
diff --git a/.template.config/templates/assets/package.json b/.template.config/templates/assets/package.json
index 33279b83..f97da15d 100644
--- a/.template.config/templates/assets/package.json
+++ b/.template.config/templates/assets/package.json
@@ -1,6 +1,6 @@
 {
     "name": "AntDesign.Pro.Template",
-    "version": "1.0.0",
+    "version": "1.1.2",
     "description": "An out-of-box UI solution for enterprise applications as a Blazor boilerplate.",
     "scripts": {
         "start": "dotnet watch -p ./ run",
diff --git a/.template.config/templates/server/AntDesign.Pro.Template.csproj b/.template.config/templates/server/AntDesign.Pro.Template.csproj
index ac49a6d7..2494caeb 100644
--- a/.template.config/templates/server/AntDesign.Pro.Template.csproj
+++ b/.template.config/templates/server/AntDesign.Pro.Template.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
-    <PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
+    <PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
   </ItemGroup>
   
   <!--#if (UseNodeJS) -->
diff --git a/.template.config/templates/server/Pages/Welcome.razor b/.template.config/templates/server/Pages/Welcome.razor
index e632e99c..ed3e744c 100644
--- a/.template.config/templates/server/Pages/Welcome.razor
+++ b/.template.config/templates/server/Pages/Welcome.razor
@@ -4,7 +4,7 @@
     <Card>
         <Alert
             Message="AntDesign.Templates have been published to nuget, you can download and use them directly."
-            Type="success"
+            Type="@AlertType.Success"
             ShowIcon="true"
             Banner
             Style="margin: -12px; margin-bottom: 24px"/>
diff --git a/.template.config/templates/wasm/AntDesign.Pro.Template.csproj b/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
index be3afeec..fb898a6b 100644
--- a/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
+++ b/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
 	  <Nullable>enable</Nullable>
@@ -9,13 +9,13 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
-    <PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
+    <PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
   </ItemGroup>
 
   <!--#if (UseNodeJS) -->
diff --git a/.template.config/templates/wasm/Pages/Welcome.razor b/.template.config/templates/wasm/Pages/Welcome.razor
index 52b7a104..da8b0c88 100644
--- a/.template.config/templates/wasm/Pages/Welcome.razor
+++ b/.template.config/templates/wasm/Pages/Welcome.razor
@@ -4,7 +4,7 @@
     <Card>
         <Alert
             Message="AntDesign.Templates have been published to nuget, you can download and use them directly."
-            Type="success"
+            Type="@AlertType.Success"
             ShowIcon="true"
             Banner
             Style="margin: -12px; margin-bottom: 24px"/>
diff --git a/.template.config/templates/webapp/package.json b/.template.config/templates/webapp/package.json
index c986cb46..ce85efed 100644
--- a/.template.config/templates/webapp/package.json
+++ b/.template.config/templates/webapp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "AntDesign.Pro.Template",
-    "version": "1.0.0",
+    "version": "1.1.2",
     "description": "An out-of-box UI solution for enterprise applications as a Blazor boilerplate.",
     "scripts": {
         "start": "dotnet watch -p ./src/AntDesign.Pro.Template run",
diff --git a/.template.config/templates/webapp/src/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj b/.template.config/templates/webapp/src/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj
index ab3af17f..9f6931e6 100644
--- a/.template.config/templates/webapp/src/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj
+++ b/.template.config/templates/webapp/src/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
-    <PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
+    <PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
   </ItemGroup>
 
   <!--#if (UseNodeJS) -->
diff --git a/.template.config/templates/webapp/src/AntDesign.Pro.Template/AntDesign.Pro.Template.csproj b/.template.config/templates/webapp/src/AntDesign.Pro.Template/AntDesign.Pro.Template.csproj
index ad793fe5..e3b1fc29 100644
--- a/.template.config/templates/webapp/src/AntDesign.Pro.Template/AntDesign.Pro.Template.csproj
+++ b/.template.config/templates/webapp/src/AntDesign.Pro.Template/AntDesign.Pro.Template.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AntDesign.Pro.Template.Client\AntDesign.Pro.Template.Client.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/package.json b/package.json
index 79bb83e1..2d7dc595 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "AntDesign.Pro",
-    "version": "1.0.0",
+    "version": "1.1.2",
     "description": "An out-of-box UI solution for enterprise applications as a Blazor boilerplate.",
     "scripts": {
         "start": "dotnet watch -p ./src/AntDesign.Pro run",
diff --git a/src/AntDesign.Pro/AntDesign.Pro.csproj b/src/AntDesign.Pro/AntDesign.Pro.csproj
index 9781b601..4a22cb75 100644
--- a/src/AntDesign.Pro/AntDesign.Pro.csproj
+++ b/src/AntDesign.Pro/AntDesign.Pro.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net8</TargetFramework>
+    <TargetFramework>net9</TargetFramework>
 	  <ImplicitUsings>enable</ImplicitUsings>
 	  <Nullable>enable</Nullable>
     <AssemblyName>AntDesign.Pro.Template</AssemblyName>
@@ -12,13 +12,13 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.5.1" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.0.0" />
-    <PackageReference Include="AntDesign.ProLayout" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="1.1.2" />
+    <PackageReference Include="AntDesign.ProLayout" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(SolutionDir)'==''">
diff --git a/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor b/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor
index 151d6432..cd6a5691 100644
--- a/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor
+++ b/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor
@@ -12,7 +12,7 @@
         <AntDesign.Tooltip Title="@("Help")" Placement="@Placement.Bottom">
             <Unbound>
                 <span @ref="@context.Current" class="action">
-                    <Icon Type="question-circle" Theme="outline" />
+                    <Icon Type="question-circle" Theme="IconThemeType.Outline" />
                 </span>
             </Unbound>
         </AntDesign.Tooltip>
diff --git a/src/AntDesign.Pro/Layouts/BasicLayout.razor b/src/AntDesign.Pro/Layouts/BasicLayout.razor
index ab312778..5b5191bf 100644
--- a/src/AntDesign.Pro/Layouts/BasicLayout.razor
+++ b/src/AntDesign.Pro/Layouts/BasicLayout.razor
@@ -12,7 +12,7 @@
                 <Icon Class="action" Type="@(collapsed?"menu-unfold":"menu-fold")" OnClick="Toggle" />
             </SpaceItem>
             <SpaceItem>
-                <Icon Class="action" Type="reload" Theme="outline" OnClick="Reload" />
+                <Icon Class="action" Type="reload" Theme="@IconThemeType.Outline" OnClick="Reload" />
             </SpaceItem>
         </Space>
     </HeaderContentRender>
diff --git a/src/AntDesign.Pro/Pages/Account/Center/Components/Applications/Applications.razor b/src/AntDesign.Pro/Pages/Account/Center/Components/Applications/Applications.razor
index c3cb3afa..c7db96ba 100644
--- a/src/AntDesign.Pro/Pages/Account/Center/Components/Applications/Applications.razor
+++ b/src/AntDesign.Pro/Pages/Account/Center/Components/Applications/Applications.razor
@@ -11,7 +11,7 @@
               Actions="Actions">
             <CardMeta>
                 <AvatarTemplate>
-                    <Avatar Size="small" Src="@context.Avatar" />
+                    <Avatar Size="@AvatarSize.Small" Src="@context.Avatar" />
                 </AvatarTemplate>
                 <TitleTemplate>@context.Title</TitleTemplate>
             </CardMeta>
@@ -35,15 +35,15 @@
 {
 
     private static readonly RenderFragment Download =@<AntDesign.Tooltip Title="@("下载")">
-    <Icon Type="download" Theme="outline" />
+    <Icon Type="download" Theme="@IconThemeType.Outline" />
 </AntDesign.Tooltip>;
 
 private static readonly IList<RenderFragment> Actions = new List<RenderFragment>
 {
         Download,
-@<AntDesign.Tooltip Title="@("Edit")"><Icon Type="edit" Theme="outline" /></AntDesign.Tooltip>,
-@<AntDesign.Tooltip Title="@("Share")"><Icon Type="share-alt" Theme="outline" /></AntDesign.Tooltip>,
-@<Dropdown><Icon Type="ellipsis" Theme="outline" /></Dropdown>
+@<AntDesign.Tooltip Title="@("Edit")"><Icon Type="edit" Theme="@IconThemeType.Outline" /></AntDesign.Tooltip>,
+@<AntDesign.Tooltip Title="@("Share")"><Icon Type="share-alt" Theme="@IconThemeType.Outline" /></AntDesign.Tooltip>,
+@<Dropdown><Icon Type="ellipsis" Theme="@IconThemeType.Outline" /></Dropdown>
     };
 
         private static RenderFragment FormatWan(int val) {
diff --git a/src/AntDesign.Pro/Pages/Account/Center/Components/ArticleListContent/ArticleListContent.razor b/src/AntDesign.Pro/Pages/Account/Center/Components/ArticleListContent/ArticleListContent.razor
index 7b0dc55b..efe01bce 100644
--- a/src/AntDesign.Pro/Pages/Account/Center/Components/ArticleListContent/ArticleListContent.razor
+++ b/src/AntDesign.Pro/Pages/Account/Center/Components/ArticleListContent/ArticleListContent.razor
@@ -4,7 +4,7 @@
 <div class="listContent">
     <div class="description">@Data.Content</div>
     <div class="extra">
-        <Avatar Src="@Data.Avatar" Size="small" />
+        <Avatar Src="@Data.Avatar" Size="@AvatarSize.Small" />
         <a href="@Data.Href">@Data.Owner</a> Posted on <a href="@Data.Href">@Data.Href</a>
         <em>@Data.UpdatedAt.ToString("yyyy-MM-dd HH:mm:ss")</em>
     </div>
diff --git a/src/AntDesign.Pro/Pages/Account/Center/Components/Articles/Articles.razor b/src/AntDesign.Pro/Pages/Account/Center/Components/Articles/Articles.razor
index 1d4ad70b..5396649d 100644
--- a/src/AntDesign.Pro/Pages/Account/Center/Components/Articles/Articles.razor
+++ b/src/AntDesign.Pro/Pages/Account/Center/Components/Articles/Articles.razor
@@ -2,7 +2,7 @@
 
 <AntList 
     TItem="ListItemDataType"
-    Size="large"
+    Size="ListSize.Large"
     Class="articleList"
     DataSource="List">
     <ListItem NoFlex>
diff --git a/src/AntDesign.Pro/Pages/Account/Center/Index.razor b/src/AntDesign.Pro/Pages/Account/Center/Index.razor
index 66709ba3..90e5a511 100644
--- a/src/AntDesign.Pro/Pages/Account/Center/Index.razor
+++ b/src/AntDesign.Pro/Pages/Account/Center/Index.razor
@@ -13,15 +13,15 @@
 
                 <div class="detail">
                     <p>
-                        <Icon Type="contacts" Theme="outline" Style="margin-right:8px;" />
+                        <Icon Type="contacts" Theme="@IconThemeType.Outline" Style="margin-right:8px;" />
                         @_currentUser.Title
                     </p>
                     <p>
-                        <Icon Type="cluster" Theme="outline" Style="margin-right:8px;" />
+                        <Icon Type="cluster" Theme="@IconThemeType.Outline" Style="margin-right:8px;" />
                         @_currentUser.Group
                     </p>
                     <p>
-                        <Icon Type="home" Theme="outline" Style="margin-right:8px;" />
+                        <Icon Type="home" Theme="@IconThemeType.Outline" Style="margin-right:8px;" />
                         <!--todo: add userinfo-->
                         @_currentUser.Geographic.Province.Label
                         @_currentUser.Geographic.City.Label
@@ -32,20 +32,20 @@
 
                 <div class="tags">
                     <div class="tagsTitle">Tags</div>
-                    @foreach (var tag in _currentUser.Tags) {
+                    @foreach (var tag in _currentUser.Tags)
+                    {
                         <Tag>@tag.Label</Tag>
                     }
 
-                    @if (_inputVisible) {
-                        <AntDesign.Input Type="text"
-                                         Size="small"
-                                         Style="width: 78px"
-                                         @bind-Value="InputValue"
-                                         OnBlur="HandleInputConfirm" />
+                    @if (_inputVisible)
+                    {
+                        <AntDesign.Input Type="InputType.Text" Size="InputSize.Small" Style="width: 78px"
+                            @bind-Value="InputValue" OnBlur="HandleInputConfirm" />
                     }
-                    else {
+                    else
+                    {
                         <Tag OnClick="ShowInput" Style="border-style: dashed">
-                            <Icon Type="plus" Theme="outline" />
+                            <Icon Type="plus" Theme="@IconThemeType.Outline" />
                         </Tag>
                     }
                 </div>
@@ -60,28 +60,26 @@
         </AntDesign.Col>
         <AntDesign.Col Lg="17" Md="24">
             <Card Class="tabsCard">
-                <CardTabs>
-                    <Tabs DefaultActiveKey="1">
-                        <TabPane Key="1">
-                            <TabTemplate>Articles (@_fakeList.Count)</TabTemplate>
-                            <ChildContent>
-                                <Articles List="_fakeList" />
-                            </ChildContent>
-                        </TabPane>
-                        <TabPane Key="2">
-                            <TabTemplate>Applications (@_fakeList.Count)</TabTemplate>
-                            <ChildContent>
-                                <Applications List="_fakeList" />
-                            </ChildContent>
-                        </TabPane>
-                        <TabPane Key="3">
-                            <TabTemplate>Projects (@_fakeList.Count)</TabTemplate>
-                            <ChildContent>
-                                <Projects List="_fakeList" />
-                            </ChildContent>
-                        </TabPane>
-                    </Tabs>
-                </CardTabs>
+                <Tabs DefaultActiveKey="1">
+                    <TabPane Key="1">
+                        <TabTemplate>Articles (@_fakeList.Count)</TabTemplate>
+                        <ChildContent>
+                            <Articles List="_fakeList" />
+                        </ChildContent>
+                    </TabPane>
+                    <TabPane Key="2">
+                        <TabTemplate>Applications (@_fakeList.Count)</TabTemplate>
+                        <ChildContent>
+                            <Applications List="_fakeList" />
+                        </ChildContent>
+                    </TabPane>
+                    <TabPane Key="3">
+                        <TabTemplate>Projects (@_fakeList.Count)</TabTemplate>
+                        <ChildContent>
+                            <Projects List="_fakeList" />
+                        </ChildContent>
+                    </TabPane>
+                </Tabs>
             </Card>
         </AntDesign.Col>
     </Row>
diff --git a/src/AntDesign.Pro/Pages/Account/Settings/Components/BaseView.razor b/src/AntDesign.Pro/Pages/Account/Settings/Components/BaseView.razor
index 433a8e85..0041ba42 100644
--- a/src/AntDesign.Pro/Pages/Account/Settings/Components/BaseView.razor
+++ b/src/AntDesign.Pro/Pages/Account/Settings/Components/BaseView.razor
@@ -3,7 +3,7 @@
 <div class="baseView">
     <div class="left" style="min-width: 310px;">
         <Form 
-            Layout="vertical"
+            Layout="@FormLayout.Vertical"
             OnFinish="HandleFinish"
             Model="@_currentUser">
             <FormItem Label="Email">
@@ -36,7 +36,7 @@
                 <PhoneView />
             </FormItem>
             <FormItem>
-                <Button HtmlType="submit" Type="primary">
+                <Button HtmlType="submit" Type="@ButtonType.Primary">
                     Update Information
                 </Button>
             </FormItem>
diff --git a/src/AntDesign.Pro/Pages/Account/Settings/Components/BindingView.razor b/src/AntDesign.Pro/Pages/Account/Settings/Components/BindingView.razor
index 0dd40c20..443a20f7 100644
--- a/src/AntDesign.Pro/Pages/Account/Settings/Components/BindingView.razor
+++ b/src/AntDesign.Pro/Pages/Account/Settings/Components/BindingView.razor
@@ -7,7 +7,7 @@
     <ListItem Actions="_actions">
         <ListItemMeta Title="@context.Title" Description="@context.Description">
             <AvatarTemplate>
-                <Icon Type="@context.Avater" Theme="outline" Class="@context.Avater" />
+                <Icon Type="@context.Avater" Theme="@IconThemeType.Outline" Class="@context.Avater" />
             </AvatarTemplate>
         </ListItemMeta>
     </ListItem>
diff --git a/src/AntDesign.Pro/Pages/Dashboard/Workplace/Components/EditableLinkGroup/EditableLinkGroup.razor b/src/AntDesign.Pro/Pages/Dashboard/Workplace/Components/EditableLinkGroup/EditableLinkGroup.razor
index f34f6c7c..cb6c919e 100644
--- a/src/AntDesign.Pro/Pages/Dashboard/Workplace/Components/EditableLinkGroup/EditableLinkGroup.razor
+++ b/src/AntDesign.Pro/Pages/Dashboard/Workplace/Components/EditableLinkGroup/EditableLinkGroup.razor
@@ -6,7 +6,7 @@
         <a href="@link.Href">@link.Title</a>
     }
     
-    <Button Size="small" Type="primary" Ghost>
+    <Button Size="@ButtonSize.Small" Type="@ButtonType.Primary" Ghost>
         <Icon Type="plus" /> Add
     </Button>
 </div>
\ No newline at end of file
diff --git a/src/AntDesign.Pro/Pages/Dashboard/Workplace/Index.razor b/src/AntDesign.Pro/Pages/Dashboard/Workplace/Index.razor
index b8d9486d..2702c031 100644
--- a/src/AntDesign.Pro/Pages/Dashboard/Workplace/Index.razor
+++ b/src/AntDesign.Pro/Pages/Dashboard/Workplace/Index.razor
@@ -13,7 +13,7 @@
     <Content>
         <div class="pageHeaderContent__b__0">
             <div class="avatar">
-                <Avatar size="large" src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" />
+                <Avatar size="@AvatarSize.Large" src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" />
             </div>
             <div class="content">
                 <div class="contentTitle">
@@ -55,7 +55,7 @@
                                     <CardMeta>
                                         <TitleTemplate>
                                             <div class="cardTitle">
-                                                <Avatar Size="small" Src="@item.Logo"></Avatar>
+                                                <Avatar Size="@AvatarSize.Small" Src="@item.Logo"></Avatar>
                                                 <a href="@item.Href">@item.Title</a>
                                             </div>
                                         </TitleTemplate>
@@ -86,7 +86,7 @@
                     <AntList TItem="ActivitiesType"
                              DataSource="@_activities"
                              Class="activitiesList"
-                             Size="large"
+                             Size="ListSize.Large"
                              ItemLayout="ListItemLayout.Horizontal">
                         <ListItem>
                             <ListItemMeta Avatar="@context.User.Avatar" Description="@context.UpdatedAt.ToFriendlyDisplay()">
@@ -139,7 +139,7 @@
                             @foreach (var item in _projectNotice) {
                                 <AntDesign.Col Span="12" Style="padding-left: 24px; padding-right: 24px;">
                                     <a href="@item.Href">
-                                        <Avatar Src="@item.Logo" Size="small" />
+                                        <Avatar Src="@item.Logo" Size="@AvatarSize.Small" />
                                         <span class="member">@item.Member</span>
                                     </a>
                                 </AntDesign.Col>
diff --git a/src/AntDesign.Pro/Pages/Exception/403/403.razor b/src/AntDesign.Pro/Pages/Exception/403/403.razor
index 2737168e..30e2f937 100644
--- a/src/AntDesign.Pro/Pages/Exception/403/403.razor
+++ b/src/AntDesign.Pro/Pages/Exception/403/403.razor
@@ -1,10 +1,10 @@
 @namespace AntDesign.Pro.Template.Pages.Exception
 @page "/exception/403"
 
-<Result Status="403"
+<Result Status="@ResultStatus.Http403"
         Title="403"
         SubTitle="Sorry, you are not authorized to access this page.">
     <Extra>
-        <Button Type="primary">Back Home</Button>
+        <Button Type="@ButtonType.Primary">Back Home</Button>
     </Extra>
 </Result>
\ No newline at end of file
diff --git a/src/AntDesign.Pro/Pages/Exception/404/404.razor b/src/AntDesign.Pro/Pages/Exception/404/404.razor
index 399b929b..1103e59e 100644
--- a/src/AntDesign.Pro/Pages/Exception/404/404.razor
+++ b/src/AntDesign.Pro/Pages/Exception/404/404.razor
@@ -1,10 +1,10 @@
 @namespace AntDesign.Pro.Template.Pages.Exception
 @page "/exception/404"
 
-<Result Status="404"
+<Result Status="@ResultStatus.Http404"
         Title="404"
         SubTitle="Sorry, the page you visited does not exist.">
     <Extra>
-        <Button Type="primary">Back Home</Button>
+        <Button Type="@ButtonType.Primary">Back Home</Button>
     </Extra>
 </Result>
\ No newline at end of file
diff --git a/src/AntDesign.Pro/Pages/Exception/500/500.razor b/src/AntDesign.Pro/Pages/Exception/500/500.razor
index 54cacff0..09cbebdf 100644
--- a/src/AntDesign.Pro/Pages/Exception/500/500.razor
+++ b/src/AntDesign.Pro/Pages/Exception/500/500.razor
@@ -1,10 +1,10 @@
 @namespace AntDesign.Pro.Template.Pages.Exception
 @page "/exception/500"
 
-<Result Status="500"
+<Result Status="@ResultStatus.Http500"
         Title="500"
         SubTitle="Sorry, something went wrong.">
     <Extra>
-        <Button Type="primary">Back Home</Button>
+        <Button Type="@ButtonType.Primary">Back Home</Button>
     </Extra>
 </Result>
\ No newline at end of file
diff --git a/src/AntDesign.Pro/Pages/Form/BasicForm/BasicForm.razor b/src/AntDesign.Pro/Pages/Form/BasicForm/BasicForm.razor
index 59ae9f09..3a65574b 100644
--- a/src/AntDesign.Pro/Pages/Form/BasicForm/BasicForm.razor
+++ b/src/AntDesign.Pro/Pages/Form/BasicForm/BasicForm.razor
@@ -48,7 +48,7 @@
                     </RadioGroup>
                 </FormItem>
                 <FormItem Label=" " Style="margin-top:32px" WrapperCol="_submitFormLayout.WrapperCol">
-                    <Button Type="primary" HtmlType="submit">
+                    <Button Type="@ButtonType.Primary" HtmlType="submit">
                         Submit
                     </Button>
                     <Button Style="margin-left:8px">
diff --git a/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step1/Step1.razor b/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step1/Step1.razor
index d085998d..ed01e0d7 100644
--- a/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step1/Step1.razor
+++ b/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step1/Step1.razor
@@ -37,7 +37,7 @@
         <Input Placeholder="Please enter the transfer amount" @bind-Value="@context.Amount" />
     </FormItem>
     <FormItem WrapperCol="_formLayout.WrapperCol">
-        <Button Type="primary" OnClick="OnValidateForm">
+        <Button Type="@ButtonType.Primary" OnClick="OnValidateForm">
             Next Step
         </Button>
     </FormItem>
diff --git a/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step2/Step2.razor b/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step2/Step2.razor
index 97b691b5..83cd81a6 100644
--- a/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step2/Step2.razor
+++ b/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step2/Step2.razor
@@ -19,10 +19,10 @@
     </Descriptions>
     <Divider Style="margin: 24px 0" />
     <FormItem Label="Password">
-        <Input Type="password" Style="width: 80%" @bind-Value="@context.Password" />
+        <Input Type="@InputType.Password" Style="width: 80%" @bind-Value="@context.Password" />
     </FormItem>
     <FormItem Style="margin-bottom: 8px;" WrapperCol="_formLayout.WrapperCol">
-        <Button Type="primary" OnClick="OnValidateForm">Submit</Button>
+        <Button Type="@ButtonType.Primary" OnClick="OnValidateForm">Submit</Button>
         <Button OnClick="Preview" Style="margin-left: 8px;">Previous Step</Button>
     </FormItem>
 </Form>
diff --git a/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step3/Step3.razor b/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step3/Step3.razor
index 6b77c13b..67f1246b 100644
--- a/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step3/Step3.razor
+++ b/src/AntDesign.Pro/Pages/Form/StepForm/Components/Step3/Step3.razor
@@ -1,11 +1,11 @@
 @namespace AntDesign.Pro.Template.Pages.Form
 
-<Result Status="success"
+<Result Status="@ResultStatus.Success"
         Title="@("Success!")"
         SubTitle="@("Expected to arrive within two hours")"
         Class="result">
     <Extra>
-        <Button Type="primary" OnClick="OnFinish">
+        <Button Type="@ButtonType.Primary" OnClick="OnFinish">
             Make Aanother Transaction
         </Button>
         <Button>View Bill</Button>
diff --git a/src/AntDesign.Pro/Pages/List/BasicList/BasicList.razor b/src/AntDesign.Pro/Pages/List/BasicList/BasicList.razor
index 1ac273f0..15f04f66 100644
--- a/src/AntDesign.Pro/Pages/List/BasicList/BasicList.razor
+++ b/src/AntDesign.Pro/Pages/List/BasicList/BasicList.razor
@@ -41,10 +41,10 @@
                         </div>
                     </Extra>
                     <ChildContent>
-                        <Button Type="dashed"
+                        <Button Type="@ButtonType.Dashed"
                                 Style="width: 100%; margin-bottom: 8px;"
                                 OnClick="ShowModal">
-                            <Icon Type="plus" Theme="outline" />
+                            <Icon Type="plus" Theme="@IconThemeType.Outline" />
                             Add
                         </Button>
 
diff --git a/src/AntDesign.Pro/Pages/List/CardList/CardList.razor b/src/AntDesign.Pro/Pages/List/CardList/CardList.razor
index b0155e10..22f52164 100644
--- a/src/AntDesign.Pro/Pages/List/CardList/CardList.razor
+++ b/src/AntDesign.Pro/Pages/List/CardList/CardList.razor
@@ -45,8 +45,8 @@
                      Grid="_listGridType">
                 <ListItem NoFlex>
                     @if (string.IsNullOrEmpty(context.Id)) {
-                        <Button Type="dashed" class="newButton">
-                            <Icon Type="plus" Theme="outline" /> Add Product
+                        <Button Type="@ButtonType.Dashed" class="newButton">
+                            <Icon Type="plus" Theme="@IconThemeType.Outline" /> Add Product
                         </Button>
                     }
                     else {
diff --git a/src/AntDesign.Pro/Pages/List/Search/Applications/Applications.razor b/src/AntDesign.Pro/Pages/List/Search/Applications/Applications.razor
index 2a05a631..c62e19c9 100644
--- a/src/AntDesign.Pro/Pages/List/Search/Applications/Applications.razor
+++ b/src/AntDesign.Pro/Pages/List/Search/Applications/Applications.razor
@@ -5,7 +5,7 @@
 <div class="filterCardList">
     <Card>
         <Form Model="_model"
-              Layout="inline">
+              Layout="@FormLayout.Inline">
             <StandardFormRow Title="Category" Block Style="padding-bottom: 11px">
                 <FormItem>
                     <TagSelect Expandable Value="_selectCategories">
@@ -70,7 +70,7 @@
                         @context.Title
                     </TitleTemplate>
                     <AvatarTemplate>
-                        <Avatar Size="small" Src="@context.Avatar" />
+                        <Avatar Size="@AvatarSize.Small" Src="@context.Avatar" />
                     </AvatarTemplate>
                 </CardMeta>
                 <div class="cardItemContent">
@@ -93,15 +93,15 @@
 @code
 {
     private static readonly RenderFragment Download =@<AntDesign.Tooltip Title="@("下载")">
-    <Icon Type="download" Theme="outline" />
+    <Icon Type="download" Theme="@IconThemeType.Outline" />
 </AntDesign.Tooltip>;
 
 private static readonly IList<RenderFragment> Actions = new List<RenderFragment>
 {
         Download,
-@<AntDesign.Tooltip Title="@("Edit")"><Icon Type="edit" Theme="outline" /></AntDesign.Tooltip>,
-@<AntDesign.Tooltip Title="@("Share")"><Icon Type="share-alt" Theme="outline" /></AntDesign.Tooltip>,
-@<Dropdown><Icon Type="ellipsis" Theme="outline" /></Dropdown>
+@<AntDesign.Tooltip Title="@("Edit")"><Icon Type="edit" Theme="@IconThemeType.Outline" /></AntDesign.Tooltip>,
+@<AntDesign.Tooltip Title="@("Share")"><Icon Type="share-alt" Theme="@IconThemeType.Outline" /></AntDesign.Tooltip>,
+@<Dropdown><Icon Type="ellipsis" Theme="@IconThemeType.Outline" /></Dropdown>
     };
 
         private static RenderFragment FormatWan(int val) {
diff --git a/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelect.razor b/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelect.razor
index 536648dc..6eae47f0 100644
--- a/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelect.razor
+++ b/src/AntDesign.Pro/Pages/List/Search/Applications/Components/TagSelect/TagSelect.razor
@@ -16,11 +16,11 @@
         <a class="trigger" @onclick="HandleExpand">
             @if (_expand)
             {
-                @CollapseText <Icon Type="Up" Theme="outline" />
+                @CollapseText <Icon Type="Up" Theme="@IconThemeType.Outline" />
             }
             else
             {
-                @ExpandText <Icon Type="Down" Theme="outline" />
+                @ExpandText <Icon Type="Down" Theme="@IconThemeType.Outline" />
             }
         </a>
     }
diff --git a/src/AntDesign.Pro/Pages/List/Search/Articles/Articles.razor b/src/AntDesign.Pro/Pages/List/Search/Articles/Articles.razor
index eac8eab1..c8e1f255 100644
--- a/src/AntDesign.Pro/Pages/List/Search/Articles/Articles.razor
+++ b/src/AntDesign.Pro/Pages/List/Search/Articles/Articles.razor
@@ -4,7 +4,7 @@
 
 <Card>
     <Form Model="_model"
-          Layout="inline">
+          Layout="@FormLayout.Inline">
         <StandardFormRow Title="Category" Block Style="padding-bottom: 11px;">
             <TagSelect Expandable>
                 <TagSelectOption Value="cat1">Category 1</TagSelectOption>
@@ -24,7 +24,7 @@
         <StandardFormRow Title="Author" Grid>
             <Select TItem="string"
                     TItemValue="string"
-                    Mode="multiple"
+                    Mode="SelectMode.Multiple"
                     Placeholder="Select Author"
                     DefaultValues="_defaultOwners"
                     Style="width:inherit"
@@ -74,7 +74,7 @@
 <Card Style="margin-top: 24px;"
       BodyStyle="padding: 8px 32px 32px 32px;">
     <AntList TItem="ListItemDataType"
-             Size="large"
+             Size="@ListSize.Large"
              Class="articleList"
              ItemLayout="ListItemLayout.Vertical"
              DataSource="_fakeList">
diff --git a/src/AntDesign.Pro/Pages/List/Search/Projects/Projects.razor b/src/AntDesign.Pro/Pages/List/Search/Projects/Projects.razor
index f22aae2b..7273ec51 100644
--- a/src/AntDesign.Pro/Pages/List/Search/Projects/Projects.razor
+++ b/src/AntDesign.Pro/Pages/List/Search/Projects/Projects.razor
@@ -5,7 +5,7 @@
 <div class="coverCardList">
     <Card>
         <Form Model="_model"
-              Layout="inline">
+              Layout="@FormLayout.Inline">
             <StandardFormRow Title="Category" Block Style="padding-bottom: 11px">
                 <FormItem>
                     <TagSelect Expandable>
diff --git a/src/AntDesign.Pro/Pages/List/Search/SearchList.razor b/src/AntDesign.Pro/Pages/List/Search/SearchList.razor
index bde46725..7051a301 100644
--- a/src/AntDesign.Pro/Pages/List/Search/SearchList.razor
+++ b/src/AntDesign.Pro/Pages/List/Search/SearchList.razor
@@ -16,7 +16,7 @@
         <div style="text-align: center;">
             <Search Placeholder="Please Enter"
                     EnterButton="@("Search For")"
-                    Size="large"
+                    Size="@InputSize.Large"
                     Style="max-width: 522px; width: 100%;" />
         </div>
     </Content>
diff --git a/src/AntDesign.Pro/Pages/Profile/Advanced/Advanced.razor b/src/AntDesign.Pro/Pages/Profile/Advanced/Advanced.razor
index 79ebac89..cd185a48 100644
--- a/src/AntDesign.Pro/Pages/Profile/Advanced/Advanced.razor
+++ b/src/AntDesign.Pro/Pages/Profile/Advanced/Advanced.razor
@@ -25,12 +25,12 @@
                 </Overlay>
                 <ChildContent>
                     <Button>
-                        <Icon Type="ellipsis" Theme="outline" />
+                        <Icon Type="ellipsis" Theme="@IconThemeType.Outline" />
                     </Button>
                 </ChildContent>
             </Dropdown>
         </ButtonGroup>
-        <Button Type="primary">Main Operation</Button>
+        <Button Type="@ButtonType.Primary">Main Operation</Button>
     </Extra>
     <ExtraContent>
         <div class="moreInfo">
@@ -39,7 +39,7 @@
         </div>
     </ExtraContent>
     <Content>
-        <Descriptions Class="headerList" Size="small" Column="2">
+        <Descriptions Class="headerList" Size="@DescriptionsSize.Small" Column="2">
             <DescriptionsItem Title="@("Founder")">Qu Lili</DescriptionsItem>
             <DescriptionsItem Title="@("Ordering Products")">XX Service</DescriptionsItem>
             <DescriptionsItem Title="@("Creation Time")">2017-07-07</DescriptionsItem>
@@ -54,7 +54,7 @@
         <div class="main__b__3">
             <GridContent>
                 <Card Title="@("Process Progress")" Style="margin-bottom: 24px;">
-                    <Steps Direction="horizontal"
+                    <Steps Direction="@StepsDirection.Horizontal"
                            Current="1">
                         <ChildContent>
                             <Step Title="@("Created Project")" DescriptionTemplate="@_desc1" />
@@ -84,7 +84,7 @@
                         <DescriptionsItem Title="@("Update Time")">2017-08-08</DescriptionsItem>
                     </Descriptions>
                     <h4 style="margin-bottom: 16px;">Information Group</h4>
-                    <Card Type="inner" Title="@("Multi-Level Information Group")" Bordered>
+                    <Card Type="CardType.Inner" Title="@("Multi-Level Information Group")" Bordered>
                         <Descriptions Style="margin-bottom: 16px;" Title="@("Group Name")">
                             <DescriptionsItem Title="@("Principal")">Lin Dongdong</DescriptionsItem>
                             <DescriptionsItem Title="@("Role Code")">1234567</DescriptionsItem>
@@ -153,13 +153,13 @@
 {
     private readonly RenderFragment _desc1 =
     @<div class="textSecondary stepDescription">
-        Qu Lili <Icon Type="dingding" Theme="outline" />
+        Qu Lili <Icon Type="dingding" Theme="@IconThemeType.Outline" />
     </div>
     ;
     private readonly RenderFragment _desc2 =
     @<div class="stepDescription">
         Zhou Maomao
-        <Icon Type="dingding" Theme="outline" />
+        <Icon Type="dingding" Theme="@IconThemeType.Outline" />
         <div>
             <a href="">Hurry Up</a>
         </div>
@@ -170,7 +170,7 @@
     @<span>
         Another Data
         <AntDesign.Tooltip Title="@("The Data Shows")">
-            <Icon Type="info-circle" Theme="outline" Style="color: rgba(0, 0, 0, 0.43); margin-left: 4px;" />
+            <Icon Type="info-circle" Theme="@IconThemeType.Outline" Style="color: rgba(0, 0, 0, 0.43); margin-left: 4px;" />
         </AntDesign.Tooltip>
     </span>
     ;
diff --git a/src/AntDesign.Pro/Pages/Result/Fail/Fail.razor b/src/AntDesign.Pro/Pages/Result/Fail/Fail.razor
index 60830039..db4d8462 100644
--- a/src/AntDesign.Pro/Pages/Result/Fail/Fail.razor
+++ b/src/AntDesign.Pro/Pages/Result/Fail/Fail.razor
@@ -3,27 +3,27 @@
 
 <GridContent>
     <Card>
-        <Result Status="error"
+        <Result Status="@ResultStatus.Error"
                 Title="Submission Failed"
                 SubTitle="Please check and modify the following information before resubmitting."
                 Style="margin-top: 48px; margin-bottom: 16px;">
             <Extra>
-                <Button Type="primary">Return to modify</Button>
+                <Button Type="@ButtonType.Primary">Return to modify</Button>
             </Extra>
             <ChildContent>
                 <div class="title__b__0">
                     The content you submitted has the following error:
                 </div>
                 <div style="margin-bottom: 16px;">
-                    <Icon Type="close-circle" Theme="outline" Class="error_icon" />
+                    <Icon Type="close-circle" Theme="@IconThemeType.Outline" Class="error_icon" />
                     Your account has been blocked
                     <a style="margin-left: 16px;">
                         Unblock account
-                        <Icon Type="right" Theme="outline" />
+                        <Icon Type="right" Theme="@IconThemeType.Outline" />
                     </a>
                 </div>
                 <div>
-                    <Icon Type="close-circle" Theme="outline" Class="error_icon" Style="margin-right: 8px;" />
+                    <Icon Type="close-circle" Theme="@IconThemeType.Outline" Class="error_icon" Style="margin-right: 8px;" />
                     Your account is not valid for use
                     <a style="margin-left: 16px;">
                         Upgrade account
diff --git a/src/AntDesign.Pro/Pages/Result/Success/Success.razor b/src/AntDesign.Pro/Pages/Result/Success/Success.razor
index b737e79a..d4a9428f 100644
--- a/src/AntDesign.Pro/Pages/Result/Success/Success.razor
+++ b/src/AntDesign.Pro/Pages/Result/Success/Success.razor
@@ -3,13 +3,13 @@
 
 <GridContent>
     <Card>
-        <Result Status="success"
+        <Result Status="@ResultStatus.Success"
                 Title="Submission Success"
                 SubTitle="The submission results page is used to feed back the results of a series of operational tasks. If it is a simple operation, use the Message global prompt feedback. This text area can show a simple supplementary explanation. If there is a similar requirement for displaying documents, the following gray area can present more complicated content."
                 Style="margin-bottom: 16px">
             <Extra>
                 <span>
-                    <Button Type="primary">Back List</Button>
+                    <Button Type="@ButtonType.Primary">Back List</Button>
                     <Button>View Project</Button>
                     <Button>Print</Button>
                 </span>
@@ -30,7 +30,7 @@
                             <div class="title__b__1">
                                 <div style="margin: 8px 0 4px">
                                     Qu Lili
-                                    <Icon Type="dingding" Theme="outline" Style="color: #00A0E9; margin-left: 8px;"></Icon>
+                                    <Icon Type="dingding" Theme="@IconThemeType.Outline" Style="color: #00A0E9; margin-left: 8px;"></Icon>
                                 </div>
                                 <div>2016-12-12 12:32</div>
                             </div>
@@ -45,7 +45,7 @@
                                 <div style="margin: 8px 0 4px">
                                     Zhou Maomao
                                     <a href="">
-                                        <Icon Type="dingding" Theme="outline" Style="color: #00A0E9; margin-left: 8px;"></Icon>
+                                        <Icon Type="dingding" Theme="@IconThemeType.Outline" Style="color: #00A0E9; margin-left: 8px;"></Icon>
                                         Urge
                                     </a>
                                 </div>
diff --git a/src/AntDesign.Pro/Pages/User/Login/Login.razor b/src/AntDesign.Pro/Pages/User/Login/Login.razor
index 9ac7cc2c..f2c7587c 100644
--- a/src/AntDesign.Pro/Pages/User/Login/Login.razor
+++ b/src/AntDesign.Pro/Pages/User/Login/Login.razor
@@ -8,31 +8,31 @@
             <Tabs ActiveKey="@context.LoginType">
                 <TabPane Key="1" Tab="Account Login">
                     <FormItem>
-                        <AntDesign.Input Placeholder="Username: admin or user" Size="large" @bind-Value="@context.UserName">
+                        <AntDesign.Input Placeholder="Username: admin or user" Size="@InputSize.Large" @bind-Value="@context.UserName">
                             <Prefix><Icon Type="user" /></Prefix>
                         </AntDesign.Input>
                     </FormItem>
                     <FormItem>
-                        <AntDesign.Input Placeholder="Password: ant.design" Size="large" @bind-Value="@context.Password" Type="password">
+                        <AntDesign.Input Placeholder="Password: ant.design" Size="@InputSize.Large" @bind-Value="@context.Password" Type="@InputType.Password">
                             <Prefix><Icon Type="lock" /></Prefix>
                         </AntDesign.Input>
                     </FormItem>
                 </TabPane>
                 <TabPane Key="2" Tab="Mobile Login">
                     <FormItem>
-                        <AntDesign.Input Placeholder="Phone Number" Size="large" @bind-Value="@context.Mobile">
+                        <AntDesign.Input Placeholder="Phone Number" Size="@InputSize.Large" @bind-Value="@context.Mobile">
                             <Prefix><Icon Type="mobile" /></Prefix>
                         </AntDesign.Input>
                     </FormItem>
                     <FormItem>
                         <Row Gutter="8">
                             <AntDesign.Col Span="16">
-                                <AntDesign.Input Placeholder="Verification code" Size="large" @bind-Value="@context.Captcha">
+                                <AntDesign.Input Placeholder="Verification code" Size="@InputSize.Large" @bind-Value="@context.Captcha">
                                     <Prefix><Icon Type="mail" /></Prefix>
                                 </AntDesign.Input>
                             </AntDesign.Col>
                             <AntDesign.Col Span="8">
-                                <Button Size="large" Block OnClick="GetCaptcha">Verify</Button>
+                                <Button Size="@ButtonSize.Large" Block OnClick="GetCaptcha">Verify</Button>
                             </AntDesign.Col>
                         </Row>
                     </FormItem>
@@ -46,7 +46,7 @@
                     Forgot Password
                 </a>
             </div>
-            <Button Type="primary" HtmlType="submit" Class="submit" Size="large" Block>Log in </Button>
+            <Button Type="@ButtonType.Primary" HtmlType="submit" Class="submit" Size="@ButtonSize.Large" Block>Log in </Button>
             <div class="other">
                 Other Login Methods
                 <Icon Class="icon" Type="alipay-circle" />
diff --git a/src/AntDesign.Pro/Pages/User/Register/Register.razor b/src/AntDesign.Pro/Pages/User/Register/Register.razor
index f2c712e1..506adf10 100644
--- a/src/AntDesign.Pro/Pages/User/Register/Register.razor
+++ b/src/AntDesign.Pro/Pages/User/Register/Register.razor
@@ -11,11 +11,11 @@
             </FormItem>
 
             <FormItem>
-                <Input Placeholder="At Least 6-Digit Password, Case Sensitive" @bind-Value="@context.Password" Size="@InputSize.Large" Type="password"></Input>
+                <Input Placeholder="At Least 6-Digit Password, Case Sensitive" @bind-Value="@context.Password" Size="@InputSize.Large" Type="@InputType.Password"></Input>
             </FormItem>
 
             <FormItem>
-                <Input Placeholder="Confirm Password" @bind-Value="@context.ConfirmPassword" Size="@InputSize.Large" Type="password"></Input>
+                <Input Placeholder="Confirm Password" @bind-Value="@context.ConfirmPassword" Size="@InputSize.Large" Type="@InputType.Password"></Input>
             </FormItem>
 
             <FormItem>
@@ -24,7 +24,7 @@
                             TItemValue="string"
                             DefaultValue=@("+86")
                             Style="width: 25%"
-                            Size="large">
+                            Size="@InputSize.Large">
                         <SelectOptions>
                             <SelectOption TItem="string" TItemValue="string" Value="@("+86")" Label="+86" />
                             <SelectOption TItem="string" TItemValue="string" Value="@("+87")" Label="+87" />
@@ -41,14 +41,14 @@
                             <AntDesign.Input Placeholder="Verification Code" @bind-Value="@context.Captcha" Size="@InputSize.Large"></AntDesign.Input>
                         </AntDesign.Col>
                         <AntDesign.Col Span="8">
-                            <Button Size="large" Block>Get Code</Button>
+                            <Button Size="@ButtonSize.Large" Block>Get Code</Button>
                         </AntDesign.Col>
                     </Row>
                 </FormItem>
             </FormItem>
 
             <FormItem>
-                <Button Type="primary" Size="large" OnClick="Reg" class="submit">Register</Button>
+                <Button Type="@ButtonType.Primary" Size="@ButtonSize.Large" OnClick="Reg" class="submit">Register</Button>
                 <a class="login" href="/user/login">Log in with an existing account</a>
             </FormItem>
         </Form>