Skip to content

Commit

Permalink
update AntDesign to 0.9.0 (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ElderJames
ElderJames authored Jul 27, 2021
1 parent 92c9637 commit 6321849
Show file tree
Hide file tree
Showing 11 changed files with 142 additions and 160 deletions.
2 changes: 1 addition & 1 deletion .template.config/templates/assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"antd": "^4.6.0"
"antd": "^4.16.0"
},
"devDependencies": {
"gulp": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion .template.config/templates/hosted/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"antd": "^4.6.0"
"antd": "^4.16.0"
},
"devDependencies": {
"gulp": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion .template.config/templates/hosted/src/Client/AntDesign.Pro.Template.Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="AntDesign.Charts" Version="0.2.1" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0-nightly-210714165658" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion .template.config/templates/server/AntDesign.Pro.Template.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="AntDesign.Charts" Version="0.2.1" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0-nightly-210714165658" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0" />
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion .template.config/templates/wasm/AntDesign.Pro.Template.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="AntDesign.Charts" Version="0.2.1" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0-nightly-210714165658" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "ant-design-blazor",
"license": "Apache-2.0",
"dependencies": {
"antd": "^4.6.0"
"antd": "^4.16.0"
},
"devDependencies": {
"gulp": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/AntDesign.Pro/AntDesign.Pro.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="AntDesign.Charts" Version="0.2.1" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0-nightly-210714165658" />
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
Expand Down
6 changes: 3 additions & 3 deletions src/AntDesign.Pro/Pages/Account/Center/Index.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@
<CardTabs>
<Tabs DefaultActiveKey="1">
<TabPane Key="1">
<Tab>Articles (@_fakeList.Count)</Tab>
<TabTemplate>Articles (@_fakeList.Count)</TabTemplate>
<ChildContent>
<Articles List="_fakeList" />
</ChildContent>
</TabPane>
<TabPane Key="2">
<Tab>Applications (@_fakeList.Count)</Tab>
<TabTemplate>Applications (@_fakeList.Count)</TabTemplate>
<ChildContent>
<Applications List="_fakeList" />
</ChildContent>
</TabPane>
<TabPane Key="3">
<Tab>Projects (@_fakeList.Count)</Tab>
<TabTemplate>Projects (@_fakeList.Count)</TabTemplate>
<ChildContent>
<Projects List="_fakeList" />
</ChildContent>
Expand Down
122 changes: 58 additions & 64 deletions src/AntDesign.Pro/Pages/Dashboard/Analysis/Components/SalesCard.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,71 +5,65 @@
<CardTabs>
<div class="salesCard">
<Tabs ActiveKeyChanged="OnTabChanged" TabBarStyle="margin-bottom: 24px;">
<TabPane Key="1">
<Tab>Sales</Tab>
<ChildContent>
<Row>
<AntDesign.Col Xl="16" Lg="12" Md="12" Sm="24" Xs="24">
<AntDesign.Charts.Column @ref="_saleChart" TItem="ChartDataItem" Config="_saleChartConfig"/>
</AntDesign.Col>
<AntDesign.Col Xl="8" Lg="12" Md="12" Sm="24" Xs="24">
<div class="salesRank">
<h1 class="rankingTitle">
Sales Ranking
</h1>
<ul class="rankingList">
@foreach (var item in Items)
{
<li key="@item.Title">
<span class="rankingItemNumber @(item.Id <= 3 ? "active" : "")">
@item.Id
</span>
<span class="rankingItemTitle" title="@item.Title">
@item.Title
</span>
<span class="rankingItemValue">
@item.Total
</span>
</li>
}
</ul>
</div>
</AntDesign.Col>
</Row>
</ChildContent>
<TabPane Key="1" Tab="Sales">
<Row>
<AntDesign.Col Xl="16" Lg="12" Md="12" Sm="24" Xs="24">
<AntDesign.Charts.Column @ref="_saleChart" TItem="ChartDataItem" Config="_saleChartConfig" />
</AntDesign.Col>
<AntDesign.Col Xl="8" Lg="12" Md="12" Sm="24" Xs="24">
<div class="salesRank">
<h1 class="rankingTitle">
Sales Ranking
</h1>
<ul class="rankingList">
@foreach (var item in Items)
{
<li key="@item.Title">
<span class="rankingItemNumber @(item.Id <= 3 ? "active" : "")">
@item.Id
</span>
<span class="rankingItemTitle" title="@item.Title">
@item.Title
</span>
<span class="rankingItemValue">
@item.Total
</span>
</li>
}
</ul>
</div>
</AntDesign.Col>
</Row>
</TabPane>
<TabPane Key="2">
<Tab>Visits</Tab>
<ChildContent>
<Row>
<AntDesign.Col Xl="16" Lg="12" Md="12" Sm="24" Xs="24">
<AntDesign.Charts.Column @ref="_visitChart" TItem="ChartDataItem" Config="_visitChartConfig"/>
</AntDesign.Col>
<AntDesign.Col Xl="8" Lg="12" Md="12" Sm="24" Xs="24">
<div class="salesRank">
<h1 class="rankingTitle">
Visits Ranking
</h1>
<ul class="rankingList">
@foreach (var item in Items)
{
<li key="@item.Title">
<span class="rankingItemNumber @(item.Id <= 3 ? "active" : "")">
@item.Id
</span>
<span class="rankingItemTitle" title="@item.Title">
@item.Title
</span>
<span class="rankingItemValue">
@item.Total
</span>
</li>
}
</ul>
</div>
</AntDesign.Col>
</Row>
</ChildContent>
<TabPane Key="2" Tab="Visits">
<Row>
<AntDesign.Col Xl="16" Lg="12" Md="12" Sm="24" Xs="24">
<AntDesign.Charts.Column @ref="_visitChart" TItem="ChartDataItem" Config="_visitChartConfig" />
</AntDesign.Col>
<AntDesign.Col Xl="8" Lg="12" Md="12" Sm="24" Xs="24">
<div class="salesRank">
<h1 class="rankingTitle">
Visits Ranking
</h1>
<ul class="rankingList">
@foreach (var item in Items)
{
<li key="@item.Title">
<span class="rankingItemNumber @(item.Id <= 3 ? "active" : "")">
@item.Id
</span>
<span class="rankingItemTitle" title="@item.Title">
@item.Title
</span>
<span class="rankingItemValue">
@item.Total
</span>
</li>
}
</ul>
</div>
</AntDesign.Col>
</Row>
</TabPane>
</Tabs>
</div>
Expand Down
96 changes: 45 additions & 51 deletions src/AntDesign.Pro/Pages/Profile/Advanced/Advanced.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,44 +115,32 @@

<Card Class="tabsCard">
<Tabs DefaultActiveKey="tab1">
<TabPane Key="tab1">
<Tab>Operation Log 1</Tab>
<ChildContent>
<Table DataSource="@_data.AdvancedOperation1"
HidePagination>
<AntDesign.Column Title="Operating Type" @bind-Field="@context.Type" />
<AntDesign.Column Title="Operator" @bind-Field="@context.Name" />
<AntDesign.Column Title="Results" @bind-Field="@context.Status" />
<AntDesign.Column Title="Operating time" @bind-Field="@context.UpdatedAt" />
<AntDesign.Column Title="Remarks" @bind-Field="@context.Memo" />
</Table>
</ChildContent>
<TabPane Key="tab1" Tab="Operation Log 1">
<Table DataSource="@_data.AdvancedOperation1" HidePagination>
<AntDesign.Column Title="Operating Type" @bind-Field="@context.Type" />
<AntDesign.Column Title="Operator" @bind-Field="@context.Name" />
<AntDesign.Column Title="Results" @bind-Field="@context.Status" />
<AntDesign.Column Title="Operating time" @bind-Field="@context.UpdatedAt" />
<AntDesign.Column Title="Remarks" @bind-Field="@context.Memo" />
</Table>
</TabPane>
<TabPane Key="tab2">
<Tab>Operation Log 2</Tab>
<ChildContent>
<Table DataSource="@_data.AdvancedOperation2"
HidePagination>
<AntDesign.Column Title="Operation Type" @bind-Field="@context.Type" />
<AntDesign.Column Title="Operator" @bind-Field="@context.Name" />
<AntDesign.Column Title="Results" @bind-Field="@context.Status" />
<AntDesign.Column Title="Operating time" @bind-Field="@context.UpdatedAt" />
<AntDesign.Column Title="Remarks" @bind-Field="@context.Memo" />
</Table>
</ChildContent>
<TabPane Key="tab2" Tab="Operation Log 2">
<Table DataSource="@_data.AdvancedOperation2" HidePagination>
<AntDesign.Column Title="Operation Type" @bind-Field="@context.Type" />
<AntDesign.Column Title="Operator" @bind-Field="@context.Name" />
<AntDesign.Column Title="Results" @bind-Field="@context.Status" />
<AntDesign.Column Title="Operating time" @bind-Field="@context.UpdatedAt" />
<AntDesign.Column Title="Remarks" @bind-Field="@context.Memo" />
</Table>
</TabPane>
<TabPane Key="tab3">
<Tab>Operation Log 3</Tab>
<ChildContent>
<Table DataSource="@_data.AdvancedOperation3"
HidePagination>
<AntDesign.Column Title="Operation Type" @bind-Field="@context.Type" />
<AntDesign.Column Title="Operator" @bind-Field="@context.Name" />
<AntDesign.Column Title="Results" @bind-Field="@context.Status" />
<AntDesign.Column Title="Operating Time" @bind-Field="@context.UpdatedAt" />
<AntDesign.Column Title="Remarks" @bind-Field="@context.Memo" />
</Table>
</ChildContent>
<TabPane Key="tab3" Tab="Operation Log 3">
<Table DataSource="@_data.AdvancedOperation3" HidePagination>
<AntDesign.Column Title="Operation Type" @bind-Field="@context.Type" />
<AntDesign.Column Title="Operator" @bind-Field="@context.Name" />
<AntDesign.Column Title="Results" @bind-Field="@context.Status" />
<AntDesign.Column Title="Operating Time" @bind-Field="@context.UpdatedAt" />
<AntDesign.Column Title="Remarks" @bind-Field="@context.Memo" />
</Table>
</TabPane>
</Tabs>
</Card>
Expand All @@ -163,21 +151,27 @@

@code
{
private readonly RenderFragment _desc1 = @<div class="textSecondary stepDescription">
Qu Lili <Icon Type="dingding" Theme="outline" />
</div>;
private readonly RenderFragment _desc2 = @<div class="stepDescription">
Zhou Maomao
<Icon Type="dingding" Theme="outline" />
<div>
<a href="">Hurry Up</a>
private readonly RenderFragment _desc1 =
@<div class="textSecondary stepDescription">
Qu Lili <Icon Type="dingding" Theme="outline" />
</div>
</div>;
;
private readonly RenderFragment _desc2 =
@<div class="stepDescription">
Zhou Maomao
<Icon Type="dingding" Theme="outline" />
<div>
<a href="">Hurry Up</a>
</div>
</div>
;

private readonly RenderFragment _title = @<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;" />
</AntDesign.Tooltip>
</span>;
private readonly RenderFragment _title =
@<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;" />
</AntDesign.Tooltip>
</span>
;
}
Loading

0 comments on commit 6321849

Please sign in to comment.