imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgarde blazorise to 0.9.5

Browse Source
pull/10673/head
liangshiwei 4 years ago
parent ce57ce70f8
commit fa464b759e
18 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs
Unescape View File

@ -8,9 +8,7 @@ namespace Volo.Abp.AspNetCore.Components.Server.Theming.Bundling
public override void ConfigureBundle(BundleConfigurationContext context)
{
context.Files.AddIfNotContains("/_framework/blazor.server.js");
context.Files.AddIfNotContains("/_content/Blazorise/blazorise.js");
context.Files.AddIfNotContains("/_content/Blazorise.Bootstrap5/blazorise.bootstrap5.js");
context.Files.AddIfNotContains("/_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
}
}
}
}

4
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ComponentsComponentsBundleContributor.cs
Unescape View File

@ -7,8 +7,6 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
public void AddScripts(BundleContext context)
{
context.Add("_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js");
context.Add("_content/Blazorise/blazorise.js");
context.Add("_content/Blazorise.Bootstrap5/blazorise.bootstrap5.js");
context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/lang-utils.js");
}
@ -23,7 +21,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
{
Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/fontawesome/css/all.css"
});
context.Add("_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/flag-icon/css/flag-icon.css");
context.Add("_content/Blazorise/blazorise.css");
context.Add("_content/Blazorise.Bootstrap5/blazorise.bootstrap5.css");

8
framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
Unescape View File

@ -353,10 +353,12 @@ namespace Volo.Abp.BlazoriseUI
return InvokeAsync(CreateModal.Hide);
}
protected virtual void ClosingCreateModal(ModalClosingEventArgs eventArgs)
protected virtual Task ClosingCreateModal(ModalClosingEventArgs eventArgs)
{
// cancel close if clicked outside of modal area
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
return Task.CompletedTask;
}
protected virtual async Task OpenEditModalAsync(TListViewModel entity)
@ -421,10 +423,12 @@ namespace Volo.Abp.BlazoriseUI
return Task.CompletedTask;
}
protected virtual void ClosingEditModal(ModalClosingEventArgs eventArgs)
protected virtual Task ClosingEditModal(ModalClosingEventArgs eventArgs)
{
// cancel close if clicked outside of modal area
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
return Task.CompletedTask;
}
protected virtual async Task CreateEntityAsync()

4
framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor.cs
Unescape View File

@ -147,10 +147,12 @@ namespace Volo.Abp.BlazoriseUI.Components
});
}
protected virtual void OnModalClosing(ModalClosingEventArgs eventArgs)
protected virtual Task OnModalClosing(ModalClosingEventArgs eventArgs)
{
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.EscapeClosing
|| eventArgs.CloseReason == CloseReason.FocusLostClosing;
return Task.CompletedTask;
}
}
}

8
framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
Unescape View File

@ -14,10 +14,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Blazorise" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.DataGrid" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Snackbar" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Components" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise" Version="0.9.5" />
<PackageReference Include="Blazorise.DataGrid" Version="0.9.5" />
<PackageReference Include="Blazorise.Snackbar" Version="0.9.5" />
<PackageReference Include="Blazorise.Components" Version="0.9.5" />
</ItemGroup>
</Project>

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
Unescape View File

@ -24,7 +24,7 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
[Inject] protected IStringLocalizerFactory HtmlLocalizerFactory { get; set; }
[Inject] protected IOptions<AbpLocalizationOptions> LocalizationOptions { get; set; }
[Inject] private ICurrentApplicationConfigurationCacheResetService CurrentApplicationConfigurationCacheResetService { get; set; }
protected Modal Modal;
@ -198,9 +198,11 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
return HtmlLocalizerFactory.Create(resource != null ? resource.ResourceType : LocalizationOptions.Value.DefaultResourceType);
}
protected virtual void ClosingModal( ModalClosingEventArgs eventArgs )
protected virtual Task ClosingModal(ModalClosingEventArgs eventArgs)
{
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
return Task.CompletedTask;
}
}
}

3
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
Unescape View File

@ -235,9 +235,10 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
);
}
protected virtual void ClosingModal(ModalClosingEventArgs eventArgs)
protected virtual Task ClosingModal(ModalClosingEventArgs eventArgs)
{
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
return Task.CompletedTask;
}
}
}

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
Unescape View File

@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" />

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
Unescape View File

@ -13,8 +13,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
</ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
Unescape View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
</ItemGroup>

6
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css
View File

File diff suppressed because one or more lines are too long

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.js
View File

File diff suppressed because one or more lines are too long

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html
Unescape View File

@ -8,7 +8,7 @@
<base href="/" />
<!--ABP:Styles-->
<link href="global.css?_v=637720550480184672" rel="stylesheet"/>
<link href="global.css?_v=637728566120563110" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles-->
<link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@ -23,7 +23,7 @@
</div>
<!--ABP:Scripts-->
<script src="global.js?_v=637720550482804343"></script>
<script src="global.js?_v=637728566121956479"></script>
<!--/ABP:Scripts-->
</body>
</html>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
Unescape View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
</ItemGroup>

6
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/global.css
View File

File diff suppressed because one or more lines are too long

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/global.js
View File

File diff suppressed because one or more lines are too long

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/wwwroot/index.html
Unescape View File

@ -8,7 +8,7 @@
<base href="/" />
<!--ABP:Styles-->
<link href="global.css?_v=637720550515221023" rel="stylesheet"/>
<link href="global.css?_v=637728566152161888" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles-->
</head>
@ -22,7 +22,7 @@
</div>
<!--ABP:Scripts-->
<script src="global.js?_v=637720550517503330"></script>
<script src="global.js?_v=637728566153545942"></script>
<!--/ABP:Scripts-->
</body>
</html>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj
Unescape View File

@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" />
<PackageReference Include="Blazorise.Bootstrap5" Version="0.9.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />

Write Preview
Loading…
Cancel
Save