Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 7 additions & 11 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,17 @@ jobs:
mkdir -p $HOME/.local-nuget
dotnet nuget add source $HOME/.local-nuget --name local

- name: Pack BlazorTemplate.Constraints
run: |
dotnet build src/Shared/BlazorTemplates/BlazorTemplate.Constraints/BlazorTemplate.Constraints.csproj -c Release
dotnet pack --no-build -c Release src/Shared/BlazorTemplates/BlazorTemplate.Constraints/BlazorTemplate.Constraints.csproj -o $HOME/.local-nuget

- name: Pack BlazorTemplate.UI.Shared
- name: Pack BlazorTemplate.ClientCore
run: |
dotnet build src/Shared/BlazorTemplates/SvgContentClassGenerator/SvgContentClassGenerator.csproj -c Release
dotnet build src/Shared/BlazorTemplates/BlazorTemplate.UI.Shared/BlazorTemplate.UI.Shared.csproj -c Release
dotnet pack --no-build -c Release src/Shared/BlazorTemplates/BlazorTemplate.UI.Shared/BlazorTemplate.UI.Shared.csproj -o $HOME/.local-nuget
dotnet build src/Shared/BlazorTemplates/EnumDisplayProviderGenerator/EnumDisplayProviderGenerator.csproj -c Release
dotnet build src/Shared/BlazorTemplates/BlazorTemplate.ClientCore/BlazorTemplate.ClientCore.csproj -c Release
dotnet pack --no-build -c Release src/Shared/BlazorTemplates/BlazorTemplate.ClientCore/BlazorTemplate.ClientCore.csproj -o $HOME/.local-nuget

- name: Pack BlazorTemplate.AppCore
- name: Pack BlazorTemplate.AppServer
run: |
dotnet build src/Shared/BlazorTemplates/BlazorTemplate.AppCore/BlazorTemplate.AppCore.csproj -c Release
dotnet pack --no-build -c Release src/Shared/BlazorTemplates/BlazorTemplate.AppCore/BlazorTemplate.AppCore.csproj -o $HOME/.local-nuget
dotnet build src/Shared/BlazorTemplates/BlazorTemplate.AppServer/BlazorTemplate.AppServer.csproj -c Release
dotnet pack --no-build -c Release src/Shared/BlazorTemplates/BlazorTemplate.AppServer/BlazorTemplate.AppServer.csproj -o $HOME/.local-nuget

- name: Pack BlazorTemplate.UI.AntBlazor
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
using AutoInjectGenerator;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Authorization;
using BlazorTemplate.Constraints;
using BlazorTemplate.Constraints.Models;
using BlazorTemplate.Constraints.Services;
using BlazorTemplate.Constraints.Store;
using BlazorTemplate.Constraints.Utils;
using BlazorTemplate.ClientCore;
using BlazorTemplate.ClientCore.Models;
using BlazorTemplate.ClientCore.Services;
using BlazorTemplate.ClientCore.Store;
using BlazorTemplate.ClientCore.Utils;

namespace BlazorAdmin.Client.Auth;

Expand Down
4 changes: 2 additions & 2 deletions src/BlazorAdmin.Client/BlazorAdmin.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<!--#if(AlwaysFalse)-->
<ItemGroup>
<ProjectReference Include="..\Shared\BlazorTemplates\BlazorTemplate.UI.AntBlazor\BlazorTemplate.UI.AntBlazor.csproj" />
<ProjectReference Include="..\Shared\BlazorTemplates\BlazorTemplate.UI.Shared\BlazorTemplate.UI.Shared.csproj" />
<ProjectReference Include="..\Shared\BlazorTemplates\BlazorTemplate.ClientCore\BlazorTemplate.ClientCore.csproj" />
</ItemGroup>
<!--#endif-->
<ItemGroup Condition="'$(CurrentMode)'== 'Package'">
<PackageReference Include="BlazorTemplate.UI.AntBlazor" Version="$(AntUIVersion)" />
<PackageReference Include="BlazorTemplate.UI.Shared" Version="$(SharedProjectVersion)" />
<PackageReference Include="BlazorTemplate.ClientCore" Version="$(ClientCoreVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/BlazorAdmin.Client/FreeRoutes.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using BlazorTemplate.UI.Shared.Layouts
@using BlazorTemplate.ClientCore.Layouts
@using System.Reflection
@attribute [Obsolete]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

using AutoInjectGenerator;
using AutoWasmApiGenerator;
using BlazorTemplate.Constraints.UI;
using BlazorTemplate.Constraints.UI.Extensions;
using BlazorTemplate.ClientCore.UI;
using BlazorTemplate.ClientCore.UI.Extensions;

namespace BlazorAdmin.Client.HttpClientHandlers;

Expand Down
5 changes: 2 additions & 3 deletions src/BlazorAdmin.Client/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
using AutoWasmApiGenerator;
using BlazorAdmin.Client;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using BlazorTemplate.Constraints;
using BlazorTemplate.Constraints.Services;
using BlazorTemplate.UI.Shared;
using BlazorTemplate.ClientCore;
using BlazorTemplate.ClientCore.Services;

//[assembly: GenerateApiInvoker]
var builder = WebAssemblyHostBuilder.CreateDefault(args);
Expand Down
4 changes: 2 additions & 2 deletions src/BlazorAdmin.Client/Routes.razor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@using BlazorTemplate.UI.Shared.Layouts
@using BlazorTemplate.ClientCore.Layouts
@using System.Reflection

<AppRoot DefaultLayout="@typeof(MainLayout)">
<BlazorTemplate.UI.Shared.Components.ClientHub></BlazorTemplate.UI.Shared.Components.ClientHub>
<BlazorTemplate.ClientCore.Components.ClientHub></BlazorTemplate.ClientCore.Components.ClientHub>
</AppRoot>
4 changes: 2 additions & 2 deletions src/BlazorAdmin.Client/TestPages/AdditionalTest.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using AutoInjectGenerator;
using BlazorTemplate.Constraints.Services;
using BlazorTemplate.Constraints.Store.Models;
using BlazorTemplate.ClientCore.Services;
using BlazorTemplate.ClientCore.Store.Models;

namespace BlazorAdmin.Client.TestPages;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using BlazorTemplate.Constraints.UI.Flyout
@using BlazorTemplate.ClientCore.UI.Flyout
@inherits DialogTemplate<int>

<h1>Close Test</h1>
Expand Down
4 changes: 2 additions & 2 deletions src/BlazorAdmin.Client/TestPages/Components/RouteParam.razor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@page "/param/{Id}"
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.Constraints.PageHelper
@using BlazorTemplate.ClientCore.Common.Attributes
@using BlazorTemplate.ClientCore.PageHelper
@implements IRouteTagPage
@implements IDisposable
@* @attribute [TagTitle("路由参数")] *@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@page "/param/query"
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.Constraints.PageHelper
@using BlazorTemplate.ClientCore.Common.Attributes
@using BlazorTemplate.ClientCore.PageHelper
@implements IRouteTagPage
@implements IDisposable
@* @attribute [TagTitle("路由参数")] *@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using System.Diagnostics.CodeAnalysis
@using BlazorTemplate.Constraints.UI
@using BlazorTemplate.Constraints.UI.Extensions
@using BlazorTemplate.Constraints.UI.Table
@using BlazorTemplate.ClientCore.UI
@using BlazorTemplate.ClientCore.UI.Extensions
@using BlazorTemplate.ClientCore.UI.Table

@(UI.BuildSelect<string, string>(this, items).Multiple().LabelExpression(t => t).ValueExpression(t => t).Binds(() => selected, UpdateValue).Render())

Expand Down
2 changes: 1 addition & 1 deletion src/BlazorAdmin.Client/TestPages/FormBuilderTest.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using BlazorTemplate.Constraints.Page
@using BlazorTemplate.ClientCore.Page
@inherits AppComponentBase

@(UI.BuildForm(model)
Expand Down
4 changes: 2 additions & 2 deletions src/BlazorAdmin.Client/TestPages/FormBuilderTest.razor.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Components;
using BlazorTemplate.Constraints.Common.Attributes;
using BlazorTemplate.Constraints.Page;
using BlazorTemplate.ClientCore.Common.Attributes;
using BlazorTemplate.ClientCore.Page;

namespace BlazorAdmin.Client.TestPages;
#if DEBUG
Expand Down
6 changes: 3 additions & 3 deletions src/BlazorAdmin.Client/TestPages/LocatorTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components;
using BlazorTemplate.Constraints.Common.Attributes;
using BlazorTemplate.Constraints.Page;
using BlazorTemplate.Constraints.Services;
using BlazorTemplate.ClientCore.Common.Attributes;
using BlazorTemplate.ClientCore.Page;
using BlazorTemplate.ClientCore.Services;

namespace BlazorAdmin.Client.TestPages;
#if DEBUG
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorAdmin.Client/TestPages/Tasks/TaskInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MT.LightTask;
using BlazorTemplate.Constraints.Common.Attributes;
using BlazorTemplate.ClientCore.Common.Attributes;

namespace BlazorAdmin.Client.TestPages.Tasks;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Components;
using MT.LightTask;
using BlazorTemplate.Constraints.Common.Attributes;
using BlazorTemplate.Constraints.UI;
using BlazorTemplate.ClientCore.Common.Attributes;
using BlazorTemplate.ClientCore.UI;
using System.Diagnostics.CodeAnalysis;

namespace BlazorAdmin.Client.TestPages.Tasks;
Expand Down
10 changes: 5 additions & 5 deletions src/BlazorAdmin.Client/TestPages/Tasks/TestTaskList.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Microsoft.AspNetCore.Components;
using MT.LightTask;
using BlazorTemplate.Constraints.Common.Attributes;
using BlazorTemplate.Constraints.Models;
using BlazorTemplate.Constraints.Models.Request;
using BlazorTemplate.Constraints.UI.Table;
using BlazorTemplate.UI.Shared.Basic;
using BlazorTemplate.ClientCore.Common.Attributes;
using BlazorTemplate.ClientCore.Models;
using BlazorTemplate.ClientCore.Models.Request;
using BlazorTemplate.ClientCore.UI.Table;
using BlazorTemplate.ClientCore.Basic;
using System.Diagnostics.CodeAnalysis;

namespace BlazorAdmin.Client.TestPages.Tasks;
Expand Down
4 changes: 2 additions & 2 deletions src/BlazorAdmin.Client/TestPages/TestBodyEvent.razor
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@page "/testbodyevent"
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.ClientCore.Common.Attributes
@using System.Diagnostics.CodeAnalysis
@using BlazorTemplate.Constraints.UI
@using BlazorTemplate.ClientCore.UI
@attribute [PageInfo(Title = "BodyEvent测试", Icon = "fa fa-question-circle-o", GroupId = "test")]
@implements IAsyncDisposable
<div style="display:flex;flex-direction:column;gap:5px;">
Expand Down
8 changes: 4 additions & 4 deletions src/BlazorAdmin.Client/TestPages/TestCamera.razor
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.ClientCore.Common.Attributes
@page "/testcamera"
@attribute [PageInfo(Title = "Camera测试", Icon = "fa fa-question-circle-o", GroupId = "test")]
@layout BlazorTemplate.UI.Shared.Layouts.BlankLayout
<BlazorTemplate.UI.Shared.Components.CameraTest>
@layout BlazorTemplate.ClientCore.Layouts.BlankLayout
<BlazorTemplate.ClientCore.Components.CameraTest>

</BlazorTemplate.UI.Shared.Components.CameraTest>
</BlazorTemplate.ClientCore.Components.CameraTest>
8 changes: 4 additions & 4 deletions src/BlazorAdmin.Client/TestPages/TestDashboard.razor
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using BlazorTemplate.Constraints.Page
@using BlazorTemplate.Constraints.PageHelper
@using BlazorTemplate.UI.Shared.ComponentHelper
@using BlazorTemplate.UI.Shared.Components
@using BlazorTemplate.ClientCore.Page
@using BlazorTemplate.ClientCore.PageHelper
@using BlazorTemplate.ClientCore.ComponentHelper
@using BlazorTemplate.ClientCore.Components
@inherits AppComponentBase
@implements IRouteTagPage
<JsTimer Interval="1000" Callback="Update"></JsTimer>
Expand Down
12 changes: 6 additions & 6 deletions src/BlazorAdmin.Client/TestPages/TestException.razor
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@page "/testexception"
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.ClientCore.Common.Attributes
@using System.Diagnostics.CodeAnalysis
@using BlazorTemplate.Constraints.Page
@using BlazorTemplate.Constraints.Store.Models
@using BlazorTemplate.Constraints.UI
@using BlazorTemplate.UI.Shared.Routers
@using BlazorTemplate.UI.Shared.ComponentHelper
@using BlazorTemplate.ClientCore.Page
@using BlazorTemplate.ClientCore.Store.Models
@using BlazorTemplate.ClientCore.UI
@using BlazorTemplate.ClientCore.Routers
@using BlazorTemplate.ClientCore.ComponentHelper
@inherits AppComponentBase
@inject ILogger<TestException> Logger
@attribute [PageInfo(Title = "Exception测试", Icon = "fa fa-question-circle-o", GroupId = "test")]
Expand Down
16 changes: 8 additions & 8 deletions src/BlazorAdmin.Client/TestPages/TestGrid.razor
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@using BlazorAdmin.Client.TestPages.Components
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.Constraints.Models.Permissions
@using BlazorTemplate.Constraints.Page
@using BlazorTemplate.Constraints.Services
@using BlazorTemplate.UI.Shared
@using BlazorTemplate.UI.Shared.ComponentHelper
@using BlazorTemplate.UI.Shared.Components
@using BlazorTemplate.UI.Shared.Utils
@using BlazorTemplate.ClientCore.Common.Attributes
@using BlazorTemplate.ClientCore.Models.Permissions
@using BlazorTemplate.ClientCore.Page
@using BlazorTemplate.ClientCore.Services
@using BlazorTemplate.ClientCore
@using BlazorTemplate.ClientCore.ComponentHelper
@using BlazorTemplate.ClientCore.Components
@using BlazorTemplate.ClientCore.Utils
@using System.Diagnostics.CodeAnalysis
@inherits JsComponentBase
@page "/test"
Expand Down
6 changes: 3 additions & 3 deletions src/BlazorAdmin.Client/TestPages/TestIcon.razor
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.UI.Shared.Components
@using BlazorTemplate.ClientCore.Common.Attributes
@using BlazorTemplate.ClientCore.Components
@page "/testicon"
@attribute [PageInfo(Title = "Icon测试", Icon = "fa fa-question-circle-o", GroupId = "test")]

<BlazorTemplate.UI.Shared.Components.IconSelector @bind-Value="@selectedIcon"></BlazorTemplate.UI.Shared.Components.IconSelector>
<BlazorTemplate.ClientCore.Components.IconSelector @bind-Value="@selectedIcon"></BlazorTemplate.ClientCore.Components.IconSelector>
<MIcon IconName="@selectedIcon"></MIcon>
<UploadButton Text="上传"></UploadButton>
@code {
Expand Down
8 changes: 4 additions & 4 deletions src/BlazorAdmin.Client/TestPages/TestPageAction.razor
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@page "/testpageaction"
@using BlazorTemplate.Constraints.Common.Attributes
@using BlazorTemplate.ClientCore.Common.Attributes
@using System.Diagnostics.CodeAnalysis
@using BlazorTemplate.Constraints.Page
@using BlazorTemplate.Constraints.PageHelper
@using BlazorTemplate.Constraints.UI
@using BlazorTemplate.ClientCore.Page
@using BlazorTemplate.ClientCore.PageHelper
@using BlazorTemplate.ClientCore.UI
@inherits AppComponentBase
@attribute [PageInfo(Title = "PageAction测试", Icon = "fa fa-question-circle-o", GroupId = "test")]
<div style="display:flex;flex-direction:column;gap:5px;">
Expand Down
Loading
Loading