innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: 优化 Exception 与 任务管理页面

This commit is contained in:
Argo Zhang 2020-02-20 13:26:11 +08:00
parent 9eff344f7e
commit 6e594b08a7
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
View File

@ -91,6 +91,12 @@ namespace Bootstrap.Admin.Pages.Components
[Parameter]
public bool ShowSearch { get; set; }
/// <summary>
/// 获得/设置 是否显示高级搜索按钮 默认显示
/// </summary>
[Parameter]
public bool ShowAdvancedSearch { get; set; } = true;
/// <summary>
/// 获得/设置 数据集合
/// </summary>

13
src/admin/Bootstrap.Admin/Pages/Shared/Table.razor
View File

@ -36,9 +36,12 @@
<button class="btn btn-secondary" type="button" title="清空过滤" @onclick="ClearSearchClick">
<i class="fa fa-trash"></i> <span>清空过滤</span>
</button>
<button class="btn btn-secondary" type="button" title="高级搜索" @onclick="AdvancedSearchClick">
<i class="fa fa-search-plus"></i><span>高级搜索</span>
</button>
@if (ShowAdvancedSearch)
{
<button class="btn btn-secondary" type="button" title="高级搜索" @onclick="AdvancedSearchClick">
<i class="fa fa-search-plus"></i><span>高级搜索</span>
</button>
}
</div>
</div>
</div>
@ -194,7 +197,7 @@
</Modal>
}
@if (OnSave != null)
@if (OnSave != null || OnAdd != null)
{
<SubmitModal @ref="EditModal" Id="@($"{Id}_edit")" TItem="TItem" Title="@SubmitModalTitle" Size="ModalSize.ExtraLarge" @bind-Model="EditModel" OnValidSubmit="Save">
<ModalBody>
@ -203,7 +206,7 @@
</SubmitModal>
}
@if (ShowSearch)
@if (ShowSearch && ShowAdvancedSearch)
{
<Modal @ref="SearchModal" Id="@($"{Id}_search")" Title="查询条件">
<ModalBody>

8
src/admin/Bootstrap.Admin/Pages/Views/Admin/Exceptions.razor
View File

@ -1,11 +1,11 @@
@inherits ExceptionsBase
@inherits ExceptionsBase
<div class="card">
<div class="card-header">
<span>查询结果</span>
</div>
<div class="card-body">
<Table Id="exception" TItem="Bootstrap.DataAccess.Exceptions" ShowToolBar="true" ShowSearch="true" ShowRefresh="true" QueryModel="QueryModel" EditModel="DataContext" OnQuery="Query" OnResetSearch="ResetSearch">
<Table Id="exception" TItem="Bootstrap.DataAccess.Exceptions" ShowToolBar="true" ShowSearch="true" ShowAdvancedSearch="false" ShowRefresh="true" QueryModel="QueryModel" EditModel="DataContext" OnQuery="Query">
<TableHeader>
<LgbTableHeader TItem="DateTime" @bind-Value="@context.LogTime" class="text-nowrap datetime"></LgbTableHeader>
<LgbTableHeader TItem="string" @bind-Value="@context.ErrorPage"></LgbTableHeader>
@ -25,8 +25,6 @@
<TableToolbarTemplate>
<TableToolbarButton class="btn btn-danger" Icon="fa fa-file-text-o" Title="服务器日志" OnClick="ShowDetail" />
</TableToolbarTemplate>
<SearchTemplate>
</SearchTemplate>
</Table>
</div>
</div>
@ -35,7 +33,7 @@
<ModalBody>
<form class="form-inline">
<div class="row">
@foreach(var item in Items)
@foreach (var item in Items)
{
<div class="form-group col-md-3 col-sm-4 col-6">
<a href="#" @onclick:preventDefault OnClick="e => ShowLog(item)">@item</a>

8
src/admin/Bootstrap.Admin/Pages/Views/Components/ExceptionsBase.cs
View File

@ -43,14 +43,6 @@ namespace Bootstrap.Admin.Pages.Views.Admin.Components
return data.ToQueryData();
}
/// <summary>
/// 重置搜索方法
/// </summary>
protected void ResetSearch()
{
}
/// <summary>
/// 获得 错误日志文件集合
/// </summary>

2
src/admin/Bootstrap.Admin/Pages/Views/Components/TasksBase.cs
View File

@ -26,7 +26,7 @@ namespace Bootstrap.Admin.Pages.Views.Admin.Components
/// <returns></returns>
protected QueryData<DefaultScheduler> Query(QueryPageOptions options)
{
var data = TaskServicesManager.ToList().OrderBy(s => s.Name).Select(s => new DefaultScheduler()
var data = (string.IsNullOrEmpty(options.SearchText) ? TaskServicesManager.ToList() : TaskServicesManager.ToList().Where(t => t.Name.Contains(options.SearchText, StringComparison.OrdinalIgnoreCase))).OrderBy(s => s.Name).Select(s => new DefaultScheduler()
{
Name = s.Name,
Status = s.Status,