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

Fixed Blazor rendering errors

Browse Source
pull/8074/head
Mladen Macanovic 5 years ago
parent 767af368ec
commit d18ece1b8b
15 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Themes/Basic/LoginDisplay.razor.cs
Unescape View File

@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Components.UI.BasicTheme.Themes.Basic
protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
StateHasChanged();
InvokeAsync(StateHasChanged);
}
public void Dispose()

2
framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.WebAssembly/Themes/Basic/LoginDisplay.razor.cs
Unescape View File

@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Components.UI.BasicTheme.Themes.Basic
protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
StateHasChanged();
InvokeAsync(StateHasChanged);
}
public void Dispose()

2
framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor.cs
Unescape View File

@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Components.UI.BasicTheme.Themes.Basic
private void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
IsSubMenuOpen = false;
StateHasChanged();
InvokeAsync(StateHasChanged);
}
}
}

2
framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme/Themes/Basic/MainLayout.razor.cs
Unescape View File

@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Components.UI.BasicTheme.Themes.Basic
private void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
IsCollapseShown = false;
StateHasChanged();
InvokeAsync(StateHasChanged);
}
}
}

2
framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor.cs
Unescape View File

@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Components.UI.BasicTheme.Themes.Basic
private void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
IsSubMenuOpen = false;
StateHasChanged();
InvokeAsync(StateHasChanged);
}
}
}

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor.cs
Unescape View File

@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
private void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
IsSubMenuOpen = false;
StateHasChanged();
InvokeAsync(StateHasChanged);
}
}
}

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
Unescape View File

@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
StateHasChanged();
InvokeAsync(StateHasChanged);
}
public void Dispose()

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor.cs
Unescape View File

@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
private void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
IsCollapseShown = false;
StateHasChanged();
InvokeAsync(StateHasChanged);
}
}
}

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor.cs
Unescape View File

@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
private void OnLocationChanged(object sender, LocationChangedEventArgs e)
{
IsSubMenuOpen = false;
StateHasChanged();
InvokeAsync(StateHasChanged);
}
}
}

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

@ -295,15 +295,17 @@ namespace Volo.Abp.BlazoriseUI
// Mapper will not notify Blazor that binded values are changed
// so we need to notify it manually by calling StateHasChanged
await InvokeAsync(StateHasChanged);
await InvokeAsync(() =>
{
StateHasChanged();
CreateModal.Show();
CreateModal?.Show();
});
}
protected virtual Task CloseCreateModalAsync()
{
CreateModal.Hide();
return Task.CompletedTask;
return InvokeAsync(CreateModal.Hide);
}
protected virtual async Task OpenEditModalAsync(TListViewModel entity)
@ -317,9 +319,12 @@ namespace Volo.Abp.BlazoriseUI
EditingEntityId = entity.Id;
EditingEntity = MapToEditingEntity(entityDto);
await InvokeAsync(StateHasChanged);
await InvokeAsync(() =>
{
StateHasChanged();
EditModal.Show();
EditModal?.Show();
});
}
protected virtual TUpdateViewModel MapToEditingEntity(TGetOutputDto entityDto)
@ -349,7 +354,7 @@ namespace Volo.Abp.BlazoriseUI
protected virtual Task CloseEditModalAsync()
{
EditModal.Hide();
InvokeAsync(EditModal.Hide);
return Task.CompletedTask;
}
@ -376,7 +381,7 @@ namespace Volo.Abp.BlazoriseUI
{
await GetEntitiesAsync();
CreateModal.Hide();
await InvokeAsync(CreateModal.Hide);
}
protected virtual async Task UpdateEntityAsync()
@ -402,7 +407,7 @@ namespace Volo.Abp.BlazoriseUI
{
await GetEntitiesAsync();
EditModal.Hide();
await InvokeAsync(EditModal.Hide);
}
protected virtual async Task DeleteEntityAsync(TListViewModel entity)

2
framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor.cs
Unescape View File

@ -36,7 +36,7 @@ namespace Volo.Abp.BlazoriseUI.Components
{
EntityActionsColumn.Displayable = Actions.Any(t => t.IsVisible);
}
StateHasChanged();
InvokeAsync(StateHasChanged);
}
protected override void OnInitialized()

2
framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs
Unescape View File

@ -52,7 +52,7 @@ namespace Volo.Abp.BlazoriseUI.Components
});
}
}
StateHasChanged();
InvokeAsync(StateHasChanged);
}
protected virtual Color GetAlertColor(AlertType alertType)

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

@ -64,13 +64,12 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
}
}
Modal.Show();
await InvokeAsync(Modal.Show);
}
public virtual Task CloseModal()
{
Modal.Hide();
return Task.CompletedTask;
return InvokeAsync(Modal.Hide);
}
protected virtual async Task SaveAsync()
@ -87,7 +86,7 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
await FeatureAppService.UpdateAsync(ProviderName, ProviderKey, features);
Modal.Hide();
await InvokeAsync(Modal.Hide);
}
protected virtual string GetNormalizedGroupName(string name)

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

@ -96,13 +96,13 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
}
_selectedTabName = GetNormalizedGroupName(_groups.First().Name);
_modal.Show();
await InvokeAsync(_modal.Show);
}
private void CloseModal()
private Task CloseModal()
{
_modal.Hide();
return InvokeAsync(_modal.Hide);
}
private async Task SaveAsync()
@ -117,7 +117,7 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
await PermissionAppService.UpdateAsync(_providerName, _providerKey, updateDto);
_modal.Hide();
await InvokeAsync(_modal.Hide);
}
private string GetNormalizedGroupName(string name)

7
modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
Unescape View File

@ -60,13 +60,12 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
UseSharedDatabase = tenantConnectionString.IsNullOrWhiteSpace()
};
ManageConnectionStringModal.Show();
await InvokeAsync(ManageConnectionStringModal.Show);
}
protected virtual Task CloseEditConnectionStringModal()
{
ManageConnectionStringModal.Hide();
return Task.CompletedTask;
return InvokeAsync(ManageConnectionStringModal.Hide);
}
protected virtual async Task UpdateConnectionStringAsync()
@ -84,7 +83,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
await AppService.UpdateDefaultConnectionStringAsync(TenantInfo.Id, TenantInfo.DefaultConnectionString);
}
ManageConnectionStringModal.Hide();
await InvokeAsync(ManageConnectionStringModal.Hide);
}
}

Write Preview
Loading…
Cancel
Save