Browse Source

Fixed Blazor rendering errors

pull/8074/head
Mladen Macanovic 6 years ago
parent
commit
d18ece1b8b
  1. 2
      framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Themes/Basic/LoginDisplay.razor.cs
  2. 2
      framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.WebAssembly/Themes/Basic/LoginDisplay.razor.cs
  3. 2
      framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor.cs
  4. 2
      framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme/Themes/Basic/MainLayout.razor.cs
  5. 2
      framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor.cs
  6. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor.cs
  7. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
  8. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor.cs
  9. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor.cs
  10. 23
      framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
  11. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor.cs
  12. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs
  13. 7
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
  14. 10
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
  15. 7
      modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

23
framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

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

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

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

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

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

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

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

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

@ -96,13 +96,13 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
} }
_selectedTabName = GetNormalizedGroupName(_groups.First().Name); _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() private async Task SaveAsync()
@ -117,7 +117,7 @@ namespace Volo.Abp.PermissionManagement.Blazor.Components
await PermissionAppService.UpdateAsync(_providerName, _providerKey, updateDto); await PermissionAppService.UpdateAsync(_providerName, _providerKey, updateDto);
_modal.Hide(); await InvokeAsync(_modal.Hide);
} }
private string GetNormalizedGroupName(string name) private string GetNormalizedGroupName(string name)

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

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

Loading…
Cancel
Save