Browse Source

fixed several build errors

feat/mudblazor-mix
İsmail ÇAĞDAŞ 3 months ago
parent
commit
b54a5b6aba
  1. 1
      framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs
  2. 1
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Components/PageHeader.razor
  3. 30
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor
  4. 33
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor.cs
  5. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/App.razor
  6. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/AppWithoutAuth.razor
  7. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NullLayout.razor
  8. 11
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor
  9. 2
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
  10. 7
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
  11. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/SettingManagement.razor
  12. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor

1
framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs

@ -2,6 +2,7 @@ using Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor.Bundling;
using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.Modularity;
using Volo.Abp.AspNetCore.Mvc.UI.Packages;
namespace Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor;

1
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Components/PageHeader.razor

@ -1,6 +1,7 @@
@using Microsoft.AspNetCore.Components.Web
@using Volo.Abp.Ui.Branding
@inject IBrandingProvider BrandingProvider
@using global::MudBlazor
<MudGrid Class="entry-row">
@if (PageLayout.Title.IsNullOrEmpty())

30
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor

@ -1,9 +1,9 @@
@using MudBlazor
@using global::MudBlazor
<MudButton Variant="Variant.Filled"
Color="Color.Primary"
<MudButton Variant="@Variant.Filled"
Color="@Color.Primary"
Disabled="Disabled"
OnClick="@OnClickAsync">
OnClick="@OnClickCallback">
@if (Icon is string iconString && !string.IsNullOrWhiteSpace(iconString))
{
<MudIcon Icon="@iconString" Class="me-1" />
@ -11,25 +11,3 @@
@Text
</MudButton>
@code {
[Parameter]
public string Text { get; set; } = string.Empty;
[Parameter]
public bool Disabled { get; set; }
[Parameter]
public object? Icon { get; set; }
[Parameter]
public Func<Task>? Clicked { get; set; }
private async Task OnClickAsync()
{
if (Clicked != null && !Disabled)
{
await Clicked.Invoke();
}
}
}

33
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor.cs

@ -0,0 +1,33 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using global::MudBlazor;
namespace Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.PageToolbars;
public partial class MudPageToolbarButton : ComponentBase
{
[Parameter]
public string Text { get; set; } = string.Empty;
[Parameter]
public bool Disabled { get; set; }
[Parameter]
public object? Icon { get; set; }
[Parameter]
public Func<Task>? Clicked { get; set; }
private EventCallback<MouseEventArgs> OnClickCallback => EventCallback.Factory.Create<MouseEventArgs>(this, OnClickAsync);
private async Task OnClickAsync(MouseEventArgs args)
{
if (Clicked != null && !Disabled)
{
await Clicked.Invoke();
}
await Task.CompletedTask;
}
}

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/App.razor

@ -1,6 +1,6 @@
@using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing
@using MudBlazor
@using global::MudBlazor
@inject IOptions<AbpRouterOptions> RouterOptions
<CascadingAuthenticationState>
<Router AppAssembly="RouterOptions.Value.AppAssembly"

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/AppWithoutAuth.razor

@ -1,6 +1,6 @@
@using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing
@using MudBlazor
@using global::MudBlazor
@inject IOptions<AbpRouterOptions> RouterOptions
<Router AppAssembly="RouterOptions.Value.AppAssembly"
AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NullLayout.razor

@ -1,8 +1,8 @@
@using Volo.Abp.Ui.LayoutHooks
@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Components.LayoutHooks
@using Volo.Abp.AspNetCore.Components.Web.Theming.Layout
@using MudBlazor
@inherits LayoutComponentBase
@using global::MudBlazor
<MudThemeProvider />
<MudPopoverProvider />

11
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor

@ -18,7 +18,8 @@
Immediate="true" />
</MudItem>
<MudItem xs="12" sm="4" Class="d-flex align-items-center">
<MudCheckBox Disabled="@_selectAllDisabled"
<MudCheckBox T="bool"
Disabled="@_selectAllDisabled"
Checked="@GrantAll"
Indeterminate="@GrantAny"
CheckedChanged="@GrantAllAsync"
@ -40,7 +41,9 @@
{
<MudTabPanel Text="@($"{group.DisplayName} ({group.Permissions.Count(x => x.IsGranted)})")">
<div style="height: 500px; overflow-y: auto; padding: 8px;">
<MudCheckBox Disabled="@(IsPermissionGroupDisabled(group))"
<MudCheckBox
TValue="bool"
Disabled="@(IsPermissionGroupDisabled(group))"
Checked="@(group.Permissions.All(x => x.IsGranted))"
CheckedChanged="@(b => GroupGrantAllChanged(b, group))"
Label="@L["SelectAllInThisTab"]" />
@ -50,7 +53,9 @@
{
var depth = GetPermissionDepthOrDefault(permission.Name);
<div style="margin-left: @(depth * 20)px;">
<MudCheckBox Disabled="@(IsDisabledPermission(permission))"
<MudCheckBox
TValue="bool"
Disabled="@(IsDisabledPermission(permission))"
Checked="@permission.IsGranted"
CheckedChanged="@(async (b) => await PermissionChanged(b, group, permission))"
Label="@GetShownName(permission)" />

2
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor

@ -90,7 +90,7 @@
<DialogContent>
<MudForm @ref="@_createFormRef" Model="@CreateEntity">
<MudText Typo="Typo.subtitle1" Class="mb-2">@L["ResourcePermissionTarget"]</MudText>
<MudRadioGroup SelectedOption="@CurrentLookupService" SelectedOptionChanged="@OnLookupServiceCheckedValueChanged">
<MudRadioGroup T="string" SelectedOption="@CurrentLookupService" SelectedOptionChanged="@OnLookupServiceCheckedValueChanged">
@foreach (var keyLookupService in ResourceProviderKeyLookupServices)
{
<MudRadio Option="@keyLookupService.Name">@keyLookupService.DisplayName</MudRadio>

7
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor

@ -1,6 +1,7 @@
@using Volo.Abp.SettingManagement.Localization
@using MudBlazor
@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
@using global::MudBlazor
@if (EmailSettings != null)
{
@ -27,16 +28,16 @@
Variant="Variant.Outlined" />
</MudItem>
<MudItem xs="12">
<MudNumericField<int> @bind-Value="@EmailSettings.SmtpPort"
<MudNumericField @bind-Value="@EmailSettings.SmtpPort"
Label="@L["SmtpPort"]"
Variant="Variant.Outlined" />
</MudItem>
<MudItem xs="12">
<MudCheckBox @bind-Checked="@EmailSettings.SmtpEnableSsl"
<MudCheckBox T="bool" @bind-Checked="@EmailSettings.SmtpEnableSsl"
Label="@L["SmtpEnableSsl"]" />
</MudItem>
<MudItem xs="12">
<MudCheckBox @bind-Checked="@EmailSettings.SmtpUseDefaultCredentials"
<MudCheckBox T="bool" @bind-Checked="@EmailSettings.SmtpUseDefaultCredentials"
Label="@L["SmtpUseDefaultCredentials"]" />
</MudItem>
@if (!EmailSettings.SmtpUseDefaultCredentials)

1
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/SettingManagement.razor

@ -7,6 +7,7 @@
@using Microsoft.Extensions.Localization
@using Volo.Abp.UI.Navigation.Localization.Resource
@inject IStringLocalizer<AbpUiNavigationResource> LUiNavigation
@using global::MudBlazor
@* ************************* PAGE HEADER ************************* *@
<PageHeader Title="@L["Settings"]" BreadcrumbItems="@BreadcrumbItems" />

1
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor

@ -1,6 +1,7 @@
@using Volo.Abp.SettingManagement.Localization
@using MudBlazor
@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
@using global::MudBlazor
@if (TimezoneSettings != null)
{

Loading…
Cancel
Save