Skip to content

Commit 568b607

Browse files
authored
Update AntDesign 1.1.0 (#114)
* Update AntDesign 1.1.0 * ignore css
1 parent 4561eb8 commit 568b607

36 files changed

+37
-52
lines changed

src/layout/example/AntDesign.ProLayout.Wasm/Components/GlobalHeaders/RightContent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<SpaceItem>
1313
<Tooltip Title="@("Help")" Placement="@Placement.Bottom">
1414
<span class="action">
15-
<Icon Type="question-circle" Theme="outline" />
15+
<Icon Type="question-circle" Theme="@IconThemeType.Outline" />
1616
</span>
1717
</Tooltip>
1818
</SpaceItem>

src/layout/example/AntDesign.ProLayout.Wasm/Pages/Admin.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<Card>
66
<Alert
77
Message="umi ui 现已发布,欢迎使用 npm run ui 启动体验。"
8-
Type="success"
8+
Type="@AlertType.Success"
99
ShowIcon="true"
1010
Banner
1111
Style="margin: -12px; margin-bottom: 48px;"/>
1212
<Title Level="2" Style="text-align: center;">
13-
<Icon Type="smile" Theme="twotone" /> Ant Design Pro <Icon Type="heart" Theme="twotone" TwotoneColor="#eb2f96" /> You
13+
<Icon Type="smile" Theme="@IconThemeType.TwoTone" /> Ant Design Pro <Icon Type="heart" Theme="@IconThemeType.TwoTone" TwotoneColor="#eb2f96" /> You
1414
</Title>
1515
</Card>
1616
<p style="text-align: center; margin-top: 24px;">

src/layout/example/AntDesign.ProLayout.Wasm/Pages/Welcome.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Card>
66
<Alert
77
Message="umi ui 现已发布,点击右下角 umi 图标即可使用"
8-
Type="success"
8+
Type="AlertType.Success"
99
ShowIcon="true"
1010
Banner
1111
Style="margin: -12px; margin-bottom: 24px"/>

src/layout/example/AntDesign.ProLayout.Wasm/Shared/ProLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
TItem="string"
2323
TItemValue="string"
2424
DefaultValue="@("product")"
25-
Size="small"
25+
Size="@InputSize.Small"
2626
Style="width: 100%;">
2727
<SelectOptions>
2828
<SelectOption TItem="string" TItemValue="string" Value="@("product")" Label="Product" />

src/layout/example/AntDesign.ProLayout.Wasm/wwwroot/css/app.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/layout/src/AntDesign.ProLayout.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="AntDesign" Version="1.0.1" />
29+
<PackageReference Include="AntDesign" Version="1.1.0" />
3030
</ItemGroup>
3131

3232
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' And '$(SolutionDir)'==''">

src/layout/src/Core/AntProComponentBase.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.AspNetCore.Components;
1+
using System.Collections.Generic;
2+
using Microsoft.AspNetCore.Components;
23
using Microsoft.Extensions.Options;
34

45
namespace AntDesign.ProLayout
@@ -17,7 +18,7 @@ public MenuTheme NavTheme
1718
_ => MenuTheme.Dark
1819
};
1920
}
20-
set => SettingState.Value.NavTheme = value.Name;
21+
set => SettingState.Value.NavTheme = value.ToString().ToLowerInvariant();
2122
}
2223

2324
[Parameter]

src/layout/src/GlobalHeader/GlobalHeader.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ else
3535
@onclick="@(async () => { await OnCollapse.InvokeAsync(!Collapsed);})">
3636
@if (Collapsed)
3737
{
38-
<Icon Type="menu-unfold" Theme="outline" />
38+
<Icon Type="menu-unfold" Theme="@IconThemeType.Outline" />
3939
}
4040
else
4141
{
42-
<Icon Type="menu-fold" Theme="outline" />
42+
<Icon Type="menu-fold" Theme="@IconThemeType.Outline" />
4343
}
4444
</span>
4545
}

src/layout/src/HeaderSearch/HeaderSearch.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@inherits AntDomComponentBase
33

44
<div class="@ClassMapper.Class" @onclick="@(async args => await SetSearchMode(true))">
5-
<Icon Type="search" Theme="outline" Style="cursor: pointer;" />
5+
<Icon Type="search" Theme="@IconThemeType.Outline" Style="cursor: pointer;" />
66
<!--todo: auto complete not working-->
77
@* <AutoComplete Class="@AutoCompleteClassMapper.Class" *@
88
@* Options="@Options"> *@

src/layout/src/NoticeIcon/NoticeIcon.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Unbound>
1818
<span @ref="@context.Current" class="@ClassMapper.Class">
1919
<Badge Count="Count" Style="box-shadow: none;" Class="badge">
20-
<Icon Type="bell" Theme="outline" />
20+
<Icon Type="bell" Theme="@IconThemeType.Outline" />
2121
</Badge>
2222
</span>
2323
</Unbound>

0 commit comments

Comments
 (0)