diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Dict.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Dict.cs index e0b59366..701c7685 100644 --- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Dict.cs +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Dict.cs @@ -30,6 +30,6 @@ namespace BootstrapAdmin.DataAccess.Models /// /// 获得/设置 字典定义值 0 表示系统使用,1 表示用户自定义 默认为 1 /// - public int Define { get; set; } = 1; + public EnumDictDefine Define { get; set; } = EnumDictDefine.Client; } } diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/EnumDictDefine.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/EnumDictDefine.cs new file mode 100644 index 00000000..fd40823a --- /dev/null +++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/EnumDictDefine.cs @@ -0,0 +1,22 @@ +using System.ComponentModel; + +namespace BootstrapAdmin.DataAccess.Models +{ + /// + /// 字典定义值 0 表示系统使用,1 表示用户自定义 默认为 1 + /// + public enum EnumDictDefine + { + /// + /// 系统使用 + /// + [Description("系统使用")] + System, + + /// + /// 用户自定义 + /// + [Description("自定义")] + Client + } +} diff --git a/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs b/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs index b31f9306..f3501140 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Models/DictsSearchModel.cs @@ -15,7 +15,7 @@ namespace BootstrapAdmin.Web.Models /// /// /// - public int? Define { get; set; } + public EnumDictDefine? Define { get; set; } /// /// @@ -42,7 +42,7 @@ namespace BootstrapAdmin.Web.Models if (Define.HasValue) { - ret.Add(new SearchFilterAction(nameof(Dict.Define), Define, FilterAction.Equal)); + ret.Add(new SearchFilterAction(nameof(Dict.Define), Define.Value.ToString(), FilterAction.Equal)); } return ret; diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor index be17127b..ece5bbaa 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor @@ -5,13 +5,7 @@ - - -
- -
-
-
+ @if (context is DictsSearchModel searchModel) diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor.cs index 084e4efe..3ef64fa1 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Dicts.razor.cs @@ -1,4 +1,5 @@ -using BootstrapAdmin.Web.Models; +using BootstrapAdmin.DataAccess.Models; +using BootstrapAdmin.Web.Models; namespace BootstrapAdmin.Web.Pages.Admin { @@ -20,12 +21,7 @@ namespace BootstrapAdmin.Web.Pages.Admin { base.OnInitialized(); - EditDefines = new List() - { - new SelectedItem("0","系统使用"), - new SelectedItem("1","自定义"), - }; - + EditDefines = typeof(EnumDictDefine).ToSelectList(); LookUp = EditDefines; } }