kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #1305 - tabpanel loses focus

Browse Source
This commit is contained in:
Shaun Walker 2021-05-03 08:19:25 -04:00
parent 42c4b351f3
commit e836e27a5a
4 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -5,7 +5,7 @@
@inject IThemeService ThemeService @inject IThemeService ThemeService
@inject IStringLocalizer<Add> Localizer @inject IStringLocalizer<Add> Localizer
<TabStrip> <TabStrip Refresh="@_refresh">
<TabPanel Name="Settings" ResourceKey="Settings"> <TabPanel Name="Settings" ResourceKey="Settings">
@if (_themeList != null) @if (_themeList != null)
{ {
@ -190,6 +190,7 @@
private Type _themeSettingsType; private Type _themeSettingsType;
private object _themeSettings; private object _themeSettings;
private RenderFragment ThemeSettingsComponent { get; set; } private RenderFragment ThemeSettingsComponent { get; set; }
private bool _refresh = false;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
@ -280,6 +281,7 @@
builder.CloseComponent(); builder.CloseComponent();
}; };
} }
_refresh = true;
} }
} }

4
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -6,7 +6,7 @@
@inject IThemeService ThemeService @inject IThemeService ThemeService
@inject IStringLocalizer<Edit> Localizer @inject IStringLocalizer<Edit> Localizer
<TabStrip> <TabStrip Refresh="@_refresh">
<TabPanel Name="Settings" ResourceKey="Settings"> <TabPanel Name="Settings" ResourceKey="Settings">
@if (_themeList != null) @if (_themeList != null)
{ {
@ -211,6 +211,7 @@
private Type _themeSettingsType; private Type _themeSettingsType;
private object _themeSettings; private object _themeSettings;
private RenderFragment ThemeSettingsComponent { get; set; } private RenderFragment ThemeSettingsComponent { get; set; }
private bool _refresh = false;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
@ -354,6 +355,7 @@
builder.CloseComponent(); builder.CloseComponent();
}; };
} }
_refresh = true;
} }
} }

8
Oqtane.Client/Modules/Admin/Roles/Index.razor
View File

@ -33,9 +33,17 @@ else
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
_roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
_roles = _roles.Where(item => item.Name != RoleNames.Everyone).ToList();
}
else
{ {
_roles = await RoleService.GetRolesAsync(PageState.Site.SiteId); _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
} }
}
private async Task DeleteRole(Role role) private async Task DeleteRole(Role role)
{ {

15
Oqtane.Client/Modules/Controls/TabStrip.razor
View File

@ -6,8 +6,6 @@
<div class="form-group"> <div class="form-group">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
@foreach (TabPanel tabPanel in _tabPanels) @foreach (TabPanel tabPanel in _tabPanels)
{
@if (IsAuthorized(tabPanel))
{ {
<li class="nav-item" @key="tabPanel.Name"> <li class="nav-item" @key="tabPanel.Name">
@if (tabPanel.Name == ActiveTab) @if (tabPanel.Name == ActiveTab)
@ -24,7 +22,6 @@
} }
</li> </li>
} }
}
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<br /> <br />
@ -43,6 +40,9 @@
[Parameter] [Parameter]
public string ActiveTab { get; set; } // optional - defaults to first TabPanel if not specified. Can also be set using a "tab=" querystring parameter. public string ActiveTab { get; set; } // optional - defaults to first TabPanel if not specified. Can also be set using a "tab=" querystring parameter.
[Parameter]
public bool Refresh { get; set; } // optional - used in scenarios where TabPanels are added/removed dynamically within a parent form. ActiveTab may need to be reset as well when this property is used.
protected override void OnInitialized() protected override void OnInitialized()
{ {
if (PageState.QueryString.ContainsKey("tab")) if (PageState.QueryString.ContainsKey("tab"))
@ -52,21 +52,24 @@
} }
protected override void OnParametersSet() protected override void OnParametersSet()
{
if (_tabPanels == null || Refresh)
{ {
_tabPanels = new List<TabPanel>(); _tabPanels = new List<TabPanel>();
} }
}
internal void AddTabPanel(TabPanel tabPanel) internal void AddTabPanel(TabPanel tabPanel)
{ {
if (!_tabPanels.Exists(item => item.Name == tabPanel.Name)) if (!_tabPanels.Exists(item => item.Name == tabPanel.Name) && IsAuthorized(tabPanel))
{ {
_tabPanels.Add(tabPanel); _tabPanels.Add(tabPanel);
StateHasChanged();
}
if (string.IsNullOrEmpty(ActiveTab)) if (string.IsNullOrEmpty(ActiveTab))
{ {
ActiveTab = tabPanel.Name; ActiveTab = tabPanel.Name;
} }
StateHasChanged();
}
} }
private bool IsAuthorized(TabPanel tabPanel) private bool IsAuthorized(TabPanel tabPanel)