From 4e8a7b2cddc29097055003c4977c1b92fb82b88b Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sun, 12 Dec 2021 15:11:00 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E8=A1=A8=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/DictSearch.razor                | 14 ++++++--------
 .../Models/DictsSearchModel.cs                 | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor b/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor
index 4c5399d7..9e5cf0d2 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor
+++ b/src/blazor/admin/BootstrapAdmin.Web/Components/DictSearch.razor
@@ -1,4 +1,4 @@
-<div class="row g-3">
+<div class="row g-3 form-inline">
     <div class="col-sm-6 col-md-6">
         <BootstrapInput @bind-Value="Value.Name" ShowLabel="true" DisplayText="字典名称" />
     </div>
@@ -6,17 +6,15 @@
         <BootstrapInput @bind-Value="Value.Category" ShowLabel="true" DisplayText="字典标签" />
     </div>
     <div class="col-sm-6 col-md-6">
-        <Select Items="@Items" @bind-Value="Value.Define" ShowLabel="true" DisplayText="字典类型"></Select>
+        <BootstrapInput @bind-Value="Value.Code" ShowLabel="true" DisplayText="字典代码" />
+    </div>
+    <div class="col-sm-6 col-md-6">
+        <Select Items="@Items" @bind-Value="Value.Define" ShowLabel="true" DisplayText="字典类型" />
     </div>
 </div>
 
 @code {
-    private IEnumerable<SelectedItem>? Items { get; set; } = new List<SelectedItem>()
-    {
-       new SelectedItem("","全部"),
-       new SelectedItem("0","系统使用"),
-       new SelectedItem("1","自定义"),
-    };
+    private IEnumerable<SelectedItem>? Items { get; set; } = typeof(EnumDictDefine).ToSelectList(new SelectedItem("", "全部"));
 
     [Parameter]
     [NotNull]
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs b/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs
index f3501140..542e4dab 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs
@@ -3,25 +3,30 @@
 namespace BootstrapAdmin.Web.Models
 {
     /// <summary>
-    /// 
+    /// 字典维护自定义高级搜索模型
     /// </summary>
     public class DictsSearchModel : ITableSearchModel
     {
         /// <summary>
-        /// 
+        /// 获得/设置 字典标签
         /// </summary>
         public string? Category { get; set; }
 
         /// <summary>
-        /// 
+        /// 获得/设置 字典类型
         /// </summary>
         public EnumDictDefine? Define { get; set; }
 
         /// <summary>
-        /// 
+        /// 获得/设置 字典名称
         /// </summary>
         public string? Name { get; set; }
 
+        /// <summary>
+        /// 获得/设置 字典代码
+        /// </summary>
+        public string? Code { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
@@ -35,6 +40,11 @@ namespace BootstrapAdmin.Web.Models
                 ret.Add(new SearchFilterAction(nameof(Dict.Name), Name));
             }
 
+            if (!string.IsNullOrEmpty(Code))
+            {
+                ret.Add(new SearchFilterAction(nameof(Dict.Code), Code));
+            }
+
             if (!string.IsNullOrEmpty(Category))
             {
                 ret.Add(new SearchFilterAction(nameof(Dict.Category), Category));