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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions BootstrapBlazor.Extensions.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ VisualStudioVersion = 17.11.35303.130
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{FF1089BE-C704-4374-B629-C57C08E1798F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.BaiduMap", "src\components\BootstrapBlazor.BaiduMap\BootstrapBlazor.BaiduMap.csproj", "{22C6D47A-F770-4813-B363-F2C90455E870}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.BarcodeGenerator", "src\components\BootstrapBlazor.BarcodeGenerator\BootstrapBlazor.BarcodeGenerator.csproj", "{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazor.FileSystem", "src\components\BootstrapBlazor.FileSystem\BootstrapBlazor.FileSystem.csproj", "{203B9DE4-201C-4223-AD0E-4823777AB9A7}"
Expand Down Expand Up @@ -150,8 +148,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{FF8B3A19
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Middleware", "src\middleware\BootstrapBlazor.Middleware\BootstrapBlazor.Middleware.csproj", "{2D783293-CEBD-4365-B8A1-0F9E76D73295}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.WebSerialPort", "src\components\BootstrapBlazor.WebSerialPort\BootstrapBlazor.WebSerialPort.csproj", "{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Html2Pdf.Select", "src\components\BootstrapBlazor.Html2Pdf.Select\BootstrapBlazor.Html2Pdf.Select.csproj", "{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.SvgEditor", "src\components\BootstrapBlazor.SVGEditor\BootstrapBlazor.SvgEditor.csproj", "{29E47F4A-CE03-42B5-BDAA-FB4B40D4C897}"
Expand Down Expand Up @@ -192,8 +188,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.PdfViewer",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Vditor", "src\components\BootstrapBlazor.Vditor\BootstrapBlazor.Vditor.csproj", "{D417E1B9-D146-4983-81D0-79F3193B322B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.TouchSocket", "src\extensions\BootstrapBlazor.TouchSocket\BootstrapBlazor.TouchSocket.csproj", "{FD23CEA1-78EB-85D7-8EDF-047657355B52}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.OfficeViewer", "src\components\BootstrapBlazor.OfficeViewer\BootstrapBlazor.OfficeViewer.csproj", "{2436940C-5920-D801-8A81-721F4C20A355}"
EndProject
Global
Expand All @@ -202,10 +196,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{22C6D47A-F770-4813-B363-F2C90455E870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{22C6D47A-F770-4813-B363-F2C90455E870}.Debug|Any CPU.Build.0 = Debug|Any CPU
{22C6D47A-F770-4813-B363-F2C90455E870}.Release|Any CPU.ActiveCfg = Release|Any CPU
{22C6D47A-F770-4813-B363-F2C90455E870}.Release|Any CPU.Build.0 = Release|Any CPU
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -442,10 +432,6 @@ Global
{2D783293-CEBD-4365-B8A1-0F9E76D73295}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D783293-CEBD-4365-B8A1-0F9E76D73295}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D783293-CEBD-4365-B8A1-0F9E76D73295}.Release|Any CPU.Build.0 = Release|Any CPU
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E}.Release|Any CPU.Build.0 = Release|Any CPU
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -526,10 +512,6 @@ Global
{D417E1B9-D146-4983-81D0-79F3193B322B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D417E1B9-D146-4983-81D0-79F3193B322B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D417E1B9-D146-4983-81D0-79F3193B322B}.Release|Any CPU.Build.0 = Release|Any CPU
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD23CEA1-78EB-85D7-8EDF-047657355B52}.Release|Any CPU.Build.0 = Release|Any CPU
{2436940C-5920-D801-8A81-721F4C20A355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2436940C-5920-D801-8A81-721F4C20A355}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2436940C-5920-D801-8A81-721F4C20A355}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -540,7 +522,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{FF1089BE-C704-4374-B629-C57C08E1798F} = {A48E5EAB-6EFB-4A78-810E-A3E79CF749F5}
{22C6D47A-F770-4813-B363-F2C90455E870} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{0E6F09A3-61C4-4945-9DC8-5E00CE547DBD} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{203B9DE4-201C-4223-AD0E-4823777AB9A7} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{3EBD90E6-5237-4BB0-9C14-CC1FC5956A1B} = {FF1089BE-C704-4374-B629-C57C08E1798F}
Expand Down Expand Up @@ -603,7 +584,6 @@ Global
{22594AD2-3E36-4984-949C-8B578B402EDE} = {B6A98ADE-D26A-4D0B-8978-AB7AC915F5AE}
{FF8B3A19-60DC-4802-9FA0-9FE670C7D565} = {A48E5EAB-6EFB-4A78-810E-A3E79CF749F5}
{2D783293-CEBD-4365-B8A1-0F9E76D73295} = {BB06AD5B-3F2B-4B59-A135-36AF999A614F}
{76ACED46-6DA0-44C7-B5F5-05A6BB4CDB1E} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{11FD9DF2-3F3F-4AF1-8C85-446190F7D887} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{29E47F4A-CE03-42B5-BDAA-FB4B40D4C897} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{DA2198E1-2CA9-EE53-926B-7950AB4B5EBF} = {FF1089BE-C704-4374-B629-C57C08E1798F}
Expand All @@ -624,7 +604,6 @@ Global
{08458CA3-BF81-48E8-870D-9389DC037808} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{4757B038-70E4-40B0-9B73-700EE5632B07} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{D417E1B9-D146-4983-81D0-79F3193B322B} = {FF1089BE-C704-4374-B629-C57C08E1798F}
{FD23CEA1-78EB-85D7-8EDF-047657355B52} = {7B29E81D-92DE-46C8-8EDC-1B48C8F12BC2}
{2436940C-5920-D801-8A81-721F4C20A355} = {FF1089BE-C704-4374-B629-C57C08E1798F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>9.0.0</Version>
<Version>9.0.1</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public Task EditAsync(object model)
if (existingEntity != null)
{
_db.Entry(existingEntity).State = EntityState.Detached;
}
}
}
return Task.CompletedTask;
}
Expand Down Expand Up @@ -134,7 +134,7 @@ public override Task<QueryData<TModel>> QueryAsync(QueryPageOptions option)
var ret = new QueryData<TModel>()
{
TotalCount = count,
Items = items,
Items = items.ToList(),
IsSorted = option.SortOrder != SortOrder.Unset,
IsFiltered = option.Filters.Count > 0,
IsAdvanceSearch = option.AdvanceSearches.Count > 0,
Expand Down