From 6e594b08a78b680f90a942c712ea0c97f5b6e586 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Thu, 20 Feb 2020 13:26:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20Exception=20?=
 =?UTF-8?q?=E4=B8=8E=20=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bootstrap.Admin/Pages/Components/TableBase.cs   |  6 ++++++
 src/admin/Bootstrap.Admin/Pages/Shared/Table.razor  | 13 ++++++++-----
 .../Pages/Views/Admin/Exceptions.razor              |  8 +++-----
 .../Pages/Views/Components/ExceptionsBase.cs        |  8 --------
 .../Pages/Views/Components/TasksBase.cs             |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
index 457e819b..1f8110dd 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/TableBase.cs
@@ -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>
diff --git a/src/admin/Bootstrap.Admin/Pages/Shared/Table.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Table.razor
index 79117ebb..b25c9e9b 100644
--- a/src/admin/Bootstrap.Admin/Pages/Shared/Table.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Shared/Table.razor
@@ -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>
diff --git a/src/admin/Bootstrap.Admin/Pages/Views/Admin/Exceptions.razor b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Exceptions.razor
index 07c79d70..96fc33ee 100644
--- a/src/admin/Bootstrap.Admin/Pages/Views/Admin/Exceptions.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Admin/Exceptions.razor
@@ -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>
diff --git a/src/admin/Bootstrap.Admin/Pages/Views/Components/ExceptionsBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/ExceptionsBase.cs
index 32c7e24d..54f7ce7e 100644
--- a/src/admin/Bootstrap.Admin/Pages/Views/Components/ExceptionsBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/ExceptionsBase.cs
@@ -43,14 +43,6 @@ namespace Bootstrap.Admin.Pages.Views.Admin.Components
             return data.ToQueryData();
         }
 
-        /// <summary>
-        /// 重置搜索方法
-        /// </summary>
-        protected void ResetSearch()
-        {
-
-        }
-
         /// <summary>
         /// 获得 错误日志文件集合
         /// </summary>
diff --git a/src/admin/Bootstrap.Admin/Pages/Views/Components/TasksBase.cs b/src/admin/Bootstrap.Admin/Pages/Views/Components/TasksBase.cs
index 006531ee..b870164f 100644
--- a/src/admin/Bootstrap.Admin/Pages/Views/Components/TasksBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Views/Components/TasksBase.cs
@@ -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,