code tpl

Author: aishang2015

src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Setting/Pages/Codes/CodeGenerator.razor

@@ -87,14 +87,13 @@
                 var commentAttribute = p.GetCustomAttribute(typeof(CommentAttribute)) as CommentAttribute;
                 var title = commentAttribute?.Comment ?? p.Name;
                 return
-                $"    <div style=\"width:140px\" class=\"mr-2\">\n" +
-                $"        <MudTextField T=\"string\" @bind-Value=\"searchObject.Search{p.Name}\" \n" +
-                $"            Margin=\"Margin.Dense\"  Label=\"{title}\" Variant=\"Variant.Outlined\" \n" +
-                $"            Clearable  Class=\"search-com\"></MudTextField>\n" +
-                $"    </div>";
+                $"            <MudTextField T=\"string\" @bind-Value=\"searchObject.Search{p.Name}\" \n" +
+                $"                  Margin=\"Margin.Dense\"  Label=\"{title}\" Variant=\"Variant.Outlined\" \n" +
+                $"                  Clearable  Class=\"mt-2\"></MudTextField>\n";
             }));
 
         var searchProperties = string.Join("\n", properties
+            .Where(p => p.PropertyType == typeof(string))
             .Select(p =>
             {
                 var typeName = GetCSharpTypeName(p.PropertyType);
@@ -126,8 +125,8 @@
                 var commentAttribute = p.GetCustomAttribute(typeof(CommentAttribute)) as CommentAttribute;
                 var title = commentAttribute?.Comment ?? p.Name;
                 return
-                $"                <MudTextField T=\"{GetCSharpTypeName(p.PropertyType)}\" @bind-Value=\"editModel.{p.Name}\"\n " +
-                $"                      Label=\"{title}\" Variant=\"Variant.Outlined\" For=\"()=>editModel.{p.Name}\"/>";
+                $"                <MudTextField T=\"{GetCSharpTypeName(p.PropertyType)}\" @bind-Value=\"editModel.{p.Name}\" Class=\"mb-2\"\n " +
+                $"                      Label=\"{title}\" Variant=\"Variant.Outlined\" For=\"()=>editModel.{p.Name}\" Margin=\"Margin.Dense\"  Clearable/>";
             }));
 
         var setEditModelProperties = string.Join(",\n", properties
@@ -148,17 +147,32 @@
 @using BlazorAdmin.Data.Entities
 @using static BlazorAdmin.Component.Pages.PagePagination
 @using BlazorAdmin.Component.Dialogs
+@using BlazorAdmin.Core.Helper
 
 @using {selectedEntity.Namespace}
 
 <PageHeader Title=""{entityName}管理"">
-{searchFields}
-    <MudIconButton Size=""MudBlazor.Size.Medium""
-                   Icon=""@Icons.Material.Filled.Search"" Color=""Color.Primary"" Class=""mr-2""
-                   OnClick=""()=> dataGrid.ReloadServerData()"" Variant=""Variant.Outlined""/>
+    @if (_notEmptyCount > 0)
+    {{
+        <MudBadge Content=""@_notEmptyCount"" Overlap=""true"" Color=""Color.Primary"" Bordered=""true"" Class=""mr-3"">
+            <MudIconButton Size=""MudBlazor.Size.Medium"" Icon=""@Icons.Material.Filled.Search""
+                           OnClick=""ShowSearchDialog""
+                           Variant=""Variant.Outlined"" Color=""Color.Primary"" Class=""""></MudIconButton >
+        </MudBadge>
+    }}
+    else
+    {{
+        <MudIconButton Size=""MudBlazor.Size.Medium"" Icon =""@Icons.Material.Filled.Search""
+                       OnClick=""ShowSearchDialog""
+                       Variant=""Variant.Outlined"" Color=""Color.Primary"" Class=""mr-3"" ></MudIconButton >
+    }}
+    <MudTooltip Text=""刷新"" Color=""Color.Primary"" >
+        <MudIconButton Size=""MudBlazor.Size.Medium"" Icon = ""@Icons.Material.Filled.Refresh"" OnClick=""Refresh""
+                       Variant=""Variant.Outlined"" Color=""Color.Primary"" Class=""mr-3""></MudIconButton >
+    </MudTooltip>
     <MudTooltip Text=""重置搜索"" Color = ""Color.Primary"" >
-        <MudIconButton Size=""MudBlazor.Size.Medium"" Icon = ""@Icons.Material.Filled.SearchOff"" Class=""mr-2""
-            OnClick=""SearchReset"" Variant = ""Variant.Outlined"" Color = ""Color.Primary"" ></MudIconButton >
+        <MudIconButton Size=""MudBlazor.Size.Medium"" Icon=""@Icons.Material.Filled.SearchOff""
+            OnClick=""SearchReset"" Variant=""Variant.Outlined"" Color=""Color.Primary"" Class=""mr-3""></MudIconButton >
     </MudTooltip>
     <MudIconButton Size=""MudBlazor.Size.Medium"" Icon =""@Icons.Material.Filled.Add"" OnClick=""AddClick""
             Variant=""Variant.Outlined"" Color=""Color.Primary"" >
@@ -219,6 +233,18 @@
     </DialogContent>
 </MudDialog>
 
+<MudDialog @bind-Visible=""_searchDialogVisible"" Options=""_searchDialogOptions"" >
+    <DialogContent>
+        <div style=""width:400px;overflow:hidden;"">
+            <MudText Typo=""Typo.h6"" Class=""my-4"">搜索</MudText>
+{searchFields}
+        </div>
+    </DialogContent>
+    <DialogActions>
+        <MudButton Variant=""Variant.Filled"" Color=""Color.Primary"" OnClick=""Search"">搜索</MudButton>
+    </DialogActions>
+</MudDialog>
+
 @code {{
 
     private MudDataGrid<TableModel> dataGrid = null!;
@@ -228,6 +254,14 @@
     private bool _dialogVisible = false;
     private EditViewModel editModel {{ get; set; }} = new();
 
+    private bool _searchDialogVisible = false;
+    private int _notEmptyCount = 0;
+    private DialogOptions _searchDialogOptions = new()
+    {{
+        MaxWidth = MaxWidth.Large,
+        NoHeader = true,
+    }};
+
     protected override async Task OnInitializedAsync()
     {{
         await base.OnInitializedAsync();
@@ -270,9 +304,28 @@
             Items = TableData
         }};
     }}
+    
+    private void ShowSearchDialog()
+    {{
+        _searchDialogVisible = true;
+        StateHasChanged();
+    }}
+
+    private async Task Search()
+    {{
+        _searchDialogVisible = false;
+        _notEmptyCount = ReflectionHelper.GetNonNullPropertyCount(searchObject);
+        await dataGrid.ReloadServerData();
+    }}
+    
+    private void Refresh()
+    {{
+        dataGrid.ReloadServerData();
+    }}
 
     private void SearchReset()
     {{
+        _notEmptyCount = 0;
         searchObject = new();
         searchObject.Page = 1;
         dataGrid.ReloadServerData();