Skip to content

Commit e10afe9

Browse files
ElderJamesElderJames
committed
update pro layout with AntDesign 0.8.1
1 parent 969930b commit e10afe9

File tree

24 files changed

+63
-66
lines changed

24 files changed

+63
-66
lines changed

β€Ž.github/deploy/gh-pages/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="icon" href="favicon.ico" type="image/x-icon" />
1313
<base href="/" />
1414
<link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet" />
15-
<link href="_content/AntDesign.Pro.Layout/css/ant-design-pro-layout-blazor.css" rel="stylesheet" />
15+
<link href="_content/AntDesign.ProLayout/css/ant-design-pro-layout-blazor.css" rel="stylesheet" />
1616
<link href="./css/site.css" rel="stylesheet" />
1717
</head>
1818

β€Ž.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"type": "generated",
5050
"generator": "constant",
5151
"parameters": {
52-
"value": "AntDesign.Pro.Layout"
52+
"value": "AntDesign.ProLayout"
5353
},
5454
"replaces": "{pro-layout}"
5555
}

β€Ž.template.config/templates/hosted/src/Client/AntDesign.Pro.Template.Client.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AntDesign.Charts" Version="0.2.0-*" />
9-
<PackageReference Include="AntDesign.Pro.Layout" Version="0.1.0-*" />
8+
<PackageReference Include="AntDesign.Charts" Version="0.2.1" />
9+
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0-nightly-210513142421" />
1010
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
1111
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
1212
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />

β€Ž.template.config/templates/hosted/src/Client/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Net.Http;
33
using System.Threading.Tasks;
4-
using AntDesign.Pro.Layout;
4+
using AntDesign.ProLayout;
55
//#if (full)
66
using AntDesign.Pro.Template.Services;
77
//#endif
@@ -20,13 +20,13 @@ public static async Task Main(string[] args)
2020
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
2121
builder.Services.AddAntDesign();
2222
builder.Services.Configure<ProSettings>(builder.Configuration.GetSection("ProSettings"));
23-
//#if (full)
23+
//#if (full)
2424
builder.Services.AddScoped<IChartService, ChartService>();
2525
builder.Services.AddScoped<IProjectService, ProjectService>();
2626
builder.Services.AddScoped<IUserService, UserService>();
2727
builder.Services.AddScoped<IAccountService, AccountService>();
2828
builder.Services.AddScoped<IProfileService, ProfileService>();
29-
//#endif
29+
//#endif
3030

3131
await builder.Build().RunAsync();
3232
}

β€Ž.template.config/templates/server/AntDesign.Pro.Template.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AntDesign.Charts" Version="0.2.0-*" />
9-
<PackageReference Include="AntDesign.Pro.Layout" Version="0.1.0-*" />
8+
<PackageReference Include="AntDesign.Charts" Version="0.2.1" />
9+
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0-nightly-210513142421" />
1010
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
1111
</ItemGroup>
1212

β€Ž.template.config/templates/server/Layouts/BasicLayout.razor

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@namespace AntDesign.Pro.Template
22
@inherits LayoutComponentBase
33

4-
<AntDesign.Pro.Layout.BasicLayout
4+
<AntDesign.ProLayout.BasicLayout
55
Logo="@("https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg")"
66
MenuData="_menuData">
77
<RightContentRender>
@@ -10,13 +10,13 @@
1010
<ChildContent>
1111
@Body
1212
</ChildContent>
13-
</AntDesign.Pro.Layout.BasicLayout>
13+
</AntDesign.ProLayout.BasicLayout>
1414
<SettingDrawer />
1515

1616
@code
1717
{
18-
//#if (full)
19-
private MenuDataItem[] _menuData = {};
18+
//#if (full)
19+
private MenuDataItem[] _menuData = { };
2020

2121
[Inject] public HttpClient HttpClient { get; set; }
2222

@@ -25,16 +25,16 @@
2525
await base.OnInitializedAsync();
2626
_menuData = await HttpClient.GetFromJsonAsync<MenuDataItem[]>("data/menu.json");
2727
}
28-
//#else
29-
private readonly MenuDataItem[] _menuData =
28+
//#else
29+
private readonly MenuDataItem[] _menuData =
3030
{
31-
new MenuDataItem
32-
{
33-
Path = "/",
34-
Name = "welcome",
35-
Key = "welcome",
36-
Icon = "smile",
37-
}
31+
new MenuDataItem
32+
{
33+
Path = "/",
34+
Name = "welcome",
35+
Key = "welcome",
36+
Icon = "smile",
37+
}
3838
};
39-
//#endif
39+
//#endif
4040
}

β€Ž.template.config/templates/server/Pages/_Host.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<title>AntDesign.Pro.Template</title>
1414
<base href="~/" />
1515
<link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet" />
16-
<link href="_content/AntDesign.Pro.Layout/css/ant-design-pro-layout-blazor.css" rel="stylesheet" />
16+
<link href="_content/AntDesign.ProLayout/css/ant-design-pro-layout-blazor.css" rel="stylesheet" />
1717
<link href="./css/site.css" rel="stylesheet" />
1818
</head>
1919
<body>

β€Ž.template.config/templates/server/Startup.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Microsoft.Extensions.Configuration;
1111
using Microsoft.Extensions.DependencyInjection;
1212
using Microsoft.Extensions.Hosting;
13-
using AntDesign.Pro.Layout;
13+
using AntDesign.ProLayout;
1414
//#if (full)
1515
using AntDesign.Pro.Template.Services;
1616
//#endif
@@ -33,18 +33,18 @@ public void ConfigureServices(IServiceCollection services)
3333
services.AddRazorPages();
3434
services.AddServerSideBlazor();
3535
services.AddAntDesign();
36-
services.AddScoped(sp => new HttpClient
36+
services.AddScoped(sp => new HttpClient
3737
{
3838
BaseAddress = new Uri(sp.GetService<NavigationManager>().BaseUri)
3939
});
4040
services.Configure<ProSettings>(Configuration.GetSection("ProSettings"));
41-
//#if (full)
41+
//#if (full)
4242
services.AddScoped<IChartService, ChartService>();
4343
services.AddScoped<IProjectService, ProjectService>();
4444
services.AddScoped<IUserService, UserService>();
4545
services.AddScoped<IAccountService, AccountService>();
4646
services.AddScoped<IProfileService, ProfileService>();
47-
//#endif
47+
//#endif
4848
}
4949

5050
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

β€Ž.template.config/templates/server/_Imports.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@using AntDesign
22
@using AntDesign.Charts
3-
@using AntDesign.Pro.Layout
3+
@using AntDesign.ProLayout
44
@using System.Net.Http
55
@using System.Net.Http.Json
66
@using Microsoft.AspNetCore.Components.Forms

β€Ž.template.config/templates/wasm/AntDesign.Pro.Template.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="AntDesign.Charts" Version="0.2.0-*" />
10-
<PackageReference Include="AntDesign.Pro.Layout" Version="0.1.0-*" />
9+
<PackageReference Include="AntDesign.Charts" Version="0.2.1" />
10+
<PackageReference Include="AntDesign.ProLayout" Version="0.1.0-nightly-210513142421" />
1111
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
1212
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
1313
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />

0 commit comments

Comments
Β (0)