From 2da705ec224f8926eedc6ee6090ac708ac196cc1 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Mon, 20 Jan 2020 11:42:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=AF=E6=8C=81=20int=20=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=20Order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bootstrap.Admin/Components/IRules.cs      | 15 ++++++++++
 .../{LgbInputTextBase.cs => LgbInputBase.cs}  | 22 +++-----------
 .../Components/LgbInputText.cs                | 12 ++++++++
 .../Components/QueryInputTextBase.cs          | 12 --------
 .../Components/ValidateInputBase.cs           | 30 +++++++++----------
 .../Components/ValidatorComponentBase.cs      | 12 ++++----
 .../Bootstrap.Admin/Pages/Admin/Menus.razor   | 10 +++----
 .../Pages/Components/MenusBase.cs             | 22 ++++++++++++--
 .../{LgbInputText.razor => LgbInput.razor}    |  3 +-
 9 files changed, 79 insertions(+), 59 deletions(-)
 create mode 100644 src/admin/Bootstrap.Admin/Components/IRules.cs
 rename src/admin/Bootstrap.Admin/Components/{LgbInputTextBase.cs => LgbInputBase.cs} (64%)
 create mode 100644 src/admin/Bootstrap.Admin/Components/LgbInputText.cs
 delete mode 100644 src/admin/Bootstrap.Admin/Components/QueryInputTextBase.cs
 rename src/admin/Bootstrap.Admin/Shared/{LgbInputText.razor => LgbInput.razor} (92%)

diff --git a/src/admin/Bootstrap.Admin/Components/IRules.cs b/src/admin/Bootstrap.Admin/Components/IRules.cs
new file mode 100644
index 00000000..3a1e672d
--- /dev/null
+++ b/src/admin/Bootstrap.Admin/Components/IRules.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Bootstrap.Admin.Components
+{
+    /// <summary>
+    /// IRules 接口
+    /// </summary>
+    public interface IRules
+    {
+        /// <summary>
+        /// 获得 Rules 集合
+        /// </summary>
+        ICollection<ValidatorComponentBase> Rules { get; }
+    }
+}
diff --git a/src/admin/Bootstrap.Admin/Components/LgbInputTextBase.cs b/src/admin/Bootstrap.Admin/Components/LgbInputBase.cs
similarity index 64%
rename from src/admin/Bootstrap.Admin/Components/LgbInputTextBase.cs
rename to src/admin/Bootstrap.Admin/Components/LgbInputBase.cs
index da9796cf..f706352e 100644
--- a/src/admin/Bootstrap.Admin/Components/LgbInputTextBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/LgbInputBase.cs
@@ -7,36 +7,22 @@ namespace Bootstrap.Admin.Components
     /// <summary>
     /// LgbInputText 组件
     /// </summary>
-    public class LgbInputTextBase : ValidateInputBase<string>
+    public class LgbInputBase<TItem> : ValidateInputBase<TItem>
     {
         /// <summary>
-        /// 
+        /// 获得/设置 控件样式 默认为 col-sm-6
         /// </summary>
         [Parameter]
         public string ColumnClass { get; set; } = "col-sm-6";
 
         /// <summary>
-        /// 
+        /// 获得/设置 控件 type 属性 默认为 text
         /// </summary>
         [Parameter]
         public string InputType { get; set; } = "text";
 
         /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="result"></param>
-        /// <param name="validationErrorMessage"></param>
-        /// <returns></returns>
-        protected override bool TryParseValueFromString(string value, out string result, out string validationErrorMessage)
-        {
-            result = value;
-            validationErrorMessage = "";
-            return true;
-        }
-
-        /// <summary>
-        /// 
+        /// 获取 最大长度属性
         /// </summary>
         protected int? MaxLength
         {
diff --git a/src/admin/Bootstrap.Admin/Components/LgbInputText.cs b/src/admin/Bootstrap.Admin/Components/LgbInputText.cs
new file mode 100644
index 00000000..1e9890a0
--- /dev/null
+++ b/src/admin/Bootstrap.Admin/Components/LgbInputText.cs
@@ -0,0 +1,12 @@
+using Bootstrap.Admin.Shared;
+
+namespace Bootstrap.Admin.Components
+{
+    /// <summary>
+    /// LgbInputText 组件
+    /// </summary>
+    public class LgbInputText : LgbInput<string>
+    {
+
+    }
+}
diff --git a/src/admin/Bootstrap.Admin/Components/QueryInputTextBase.cs b/src/admin/Bootstrap.Admin/Components/QueryInputTextBase.cs
deleted file mode 100644
index 527e5c05..00000000
--- a/src/admin/Bootstrap.Admin/Components/QueryInputTextBase.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Components;
-
-namespace Bootstrap.Admin.Components
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public class QueryInputTextBase<TItem> : LgbInputTextBase
-    {
-
-    }
-}
diff --git a/src/admin/Bootstrap.Admin/Components/ValidateInputBase.cs b/src/admin/Bootstrap.Admin/Components/ValidateInputBase.cs
index f38b61eb..b956506d 100644
--- a/src/admin/Bootstrap.Admin/Components/ValidateInputBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/ValidateInputBase.cs
@@ -11,24 +11,24 @@ using System.Linq;
 namespace Bootstrap.Admin.Components
 {
     /// <summary>
-    /// 
+    /// 内置验证组件基类
     /// </summary>
-    public abstract class ValidateInputBase<TItem> : InputBase<TItem>, IValidateComponent
+    public abstract class ValidateInputBase<TItem> : InputBase<TItem>, IValidateComponent, IRules
     {
         /// <summary>
-        /// 
+        /// 获得 IJSRuntime 实例
         /// </summary>
         [Inject]
         protected IJSRuntime? JSRuntime { get; set; }
 
         /// <summary>
-        /// 
+        /// 获得 LgbEditFormBase 实例
         /// </summary>
         [CascadingParameter]
         public LgbEditFormBase? EditForm { get; set; }
 
         /// <summary>
-        /// 
+        /// 获得 当前组件 Id
         /// </summary>
         public string Id
         {
@@ -36,13 +36,13 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        /// 获得 子组件 RenderFragment 实例
         /// </summary>
         [Parameter]
         public RenderFragment? ChildContent { get; set; }
 
         /// <summary>
-        /// 
+        /// 获得 PlaceHolder 属性
         /// </summary>
         protected string? PlaceHolder
         {
@@ -59,22 +59,22 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        /// 获得/设置 错误描述信息
         /// </summary>
         protected string ErrorMessage { get; set; } = "";
 
         /// <summary>
-        /// 
+        /// 获得/设置 数据合规样式
         /// </summary>
         protected string ValidCss { get; set; } = "";
 
         /// <summary>
-        /// 
+        /// 获得/设置 显示名称 默认为 -
         /// </summary>
         protected string DisplayName { get; set; } = "-";
 
         /// <summary>
-        /// 
+        /// OnInitialized 方法
         /// </summary>
         protected override void OnInitialized()
         {
@@ -83,7 +83,7 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        /// OnAfterRender 方法
         /// </summary>
         /// <param name="firstRender"></param>
         protected override void OnAfterRender(bool firstRender)
@@ -96,13 +96,13 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        /// 获得 数据验证方法集合
         /// </summary>
         public ICollection<ValidatorComponentBase> Rules { get; } = new HashSet<ValidatorComponentBase>();
 
         private string _tooltipMethod = "";
         /// <summary>
-        /// 
+        /// 属性验证方法
         /// </summary>
         /// <param name="propertyValue"></param>
         /// <param name="context"></param>
@@ -142,7 +142,7 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        /// 将 字符串 Value 属性转化为 泛型 Value 方法
         /// </summary>
         /// <param name="value"></param>
         /// <param name="result"></param>
diff --git a/src/admin/Bootstrap.Admin/Components/ValidatorComponentBase.cs b/src/admin/Bootstrap.Admin/Components/ValidatorComponentBase.cs
index a1528270..f4eace28 100644
--- a/src/admin/Bootstrap.Admin/Components/ValidatorComponentBase.cs
+++ b/src/admin/Bootstrap.Admin/Components/ValidatorComponentBase.cs
@@ -6,21 +6,21 @@ using System.ComponentModel.DataAnnotations;
 namespace Bootstrap.Admin.Components
 {
     /// <summary>
-    /// 
+    /// 验证组件基类
     /// </summary>
     public abstract class ValidatorComponentBase : ComponentBase
     {
         /// <summary>
-        /// 
+        /// 获得/设置 错误描述信息
         /// </summary>
         [Parameter]
         public string ErrorMessage { get; set; } = "";
 
         /// <summary>
-        /// 
+        /// 获得/设置 IRules 实例
         /// </summary>
         [CascadingParameter]
-        public LgbInputTextBase? Input { get; set; }
+        public IRules? Input { get; set; }
 
         /// <summary>
         /// 初始化方法
@@ -30,7 +30,7 @@ namespace Bootstrap.Admin.Components
             if (Input == null)
             {
                 throw new InvalidOperationException($"{nameof(ValidatorComponentBase)} requires a cascading " +
-                    $"parameter of type {nameof(LgbInputTextBase)}. For example, you can use {nameof(ValidatorComponentBase)} " +
+                    $"parameter of type {nameof(IRules)}. For example, you can use {nameof(ValidatorComponentBase)} " +
                     $"inside an LgbInputText.");
             }
 
@@ -38,7 +38,7 @@ namespace Bootstrap.Admin.Components
         }
 
         /// <summary>
-        /// 
+        /// 验证方法
         /// </summary>
         /// <param name="propertyValue"></param>
         /// <param name="context"></param>
diff --git a/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor b/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor
index 338d63e7..a3100691 100644
--- a/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Admin/Menus.razor
@@ -40,17 +40,17 @@
                 <RequiredValidator />
                 <StringLengthValidator Length="50" />
             </LgbInputText>
-            <LgbInputText @bind-Value="@context.ParentName" placeholder="可为空，50字以内" maxlength="50" />
-            <LgbInputText @bind-Value="@context.Icon" placeholder="不可为空，50字以内" maxlength="50" />
-            <LgbInputText @bind-Value="@context.Icon" placeholder="不可为空，50字以内" maxlength="50" />
-            <LgbInputText @bind-Value="@context.Url" placeholder="不可为空，50字以内" maxlength="2000" ColumnClass="col-12" class="flex-sm-fill">
+            <LgbInputText @bind-Value="@context.ParentName" placeholder="请选择...(可为空)，50字以内" maxlength="50" />
+            <LgbInput TItem="int" @bind-Value="@context.Order" placeholder="可为空，默认为10" InputType="number" maxlength="6" />
+            <LgbInputText @bind-Value="@context.Icon" placeholder="请选择...(可为空)，50字以内" maxlength="50" />
+            <LgbInputText @bind-Value="@context.Url" placeholder="不可为空，2000字以内" maxlength="2000" ColumnClass="col-12" class="flex-sm-fill">
                 <RequiredValidator />
                 <StringLengthValidator Length="2000" />
             </LgbInputText>
             <Select Items="DefineResource" TItem="int" @bind-Value="@context.IsResource"></Select>
             <Select Items="DefineTarget" TItem="string" @bind-Value="@context.Target"></Select>
             <Select Items="DefineApp" TItem="string" @bind-Value="@context.Application"></Select>
-            <Select Items="DefineCategory" TItem="string" @bind-Value="@context.Category"></Select>
+            <Select Items="DefineCategory" TItem="string" @bind-Value="@context.Category" Disabled="true"></Select>
         </div>
     </EditTemplate>
 </EditPage>
diff --git a/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs b/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
index f5b834ef..56701589 100644
--- a/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
+++ b/src/admin/Bootstrap.Admin/Pages/Components/MenusBase.cs
@@ -24,7 +24,7 @@ namespace Bootstrap.Pages.Admin.Components
         /// 获得/设置 菜单类别
         /// </summary>
         protected List<SelectedItem> QueryCategory { get; set; } = new List<SelectedItem>(new SelectedItem[] {
-            new SelectedItem() { Text = "全部", Value = "-1", Active = true },
+            new SelectedItem() { Text = "全部", Value = "", Active = true },
             new SelectedItem() { Text = "系统菜单", Value = "0" },
             new SelectedItem() { Text = "外部菜单", Value = "1" }
         });
@@ -43,7 +43,7 @@ namespace Bootstrap.Pages.Admin.Components
         /// 获得/设置 所属应用
         /// </summary>
         protected List<SelectedItem> QueryApp { get; set; } = new List<SelectedItem>(new SelectedItem[] {
-            new SelectedItem() { Text = "全部", Value = "-1", Active = true }
+            new SelectedItem() { Text = "全部", Value = "", Active = true }
         });
 
 
@@ -103,6 +103,8 @@ namespace Bootstrap.Pages.Admin.Components
         /// <returns></returns>
         protected override void OnParametersSet()
         {
+            QueryModel.Category = "";
+            QueryModel.IsResource = -1;
             QueryApp.AddRange(DictHelper.RetrieveApps().Select(app => new SelectedItem() { Text = app.Value, Value = app.Key }));
             DefineApp.AddRange(DictHelper.RetrieveApps().Select(app => new SelectedItem() { Text = app.Value, Value = app.Key }));
         }
@@ -125,6 +127,22 @@ namespace Bootstrap.Pages.Admin.Components
             return new QueryData<BootstrapMenu>() { Items = items, TotalCount = totalCount, PageIndex = pageIndex, PageItems = pageItems };
         }
 
+        /// <summary>
+        /// 新建方法
+        /// </summary>
+        protected override BootstrapMenu Add()
+        {
+            return new BootstrapMenu()
+            {
+                Order = 10,
+                Icon = "fa fa-fa",
+                Target = "_self",
+                Category = "0",
+                IsResource = 0,
+                Application = DefineApp.First().Value
+            };
+        }
+
         /// <summary>
         /// 保存方法
         /// </summary>
diff --git a/src/admin/Bootstrap.Admin/Shared/LgbInputText.razor b/src/admin/Bootstrap.Admin/Shared/LgbInput.razor
similarity index 92%
rename from src/admin/Bootstrap.Admin/Shared/LgbInputText.razor
rename to src/admin/Bootstrap.Admin/Shared/LgbInput.razor
index 61d08f6c..f9845852 100644
--- a/src/admin/Bootstrap.Admin/Shared/LgbInputText.razor
+++ b/src/admin/Bootstrap.Admin/Shared/LgbInput.razor
@@ -1,4 +1,5 @@
-@inherits LgbInputTextBase
+@typeparam TItem
+@inherits LgbInputBase<TItem>
 
 <div class="@($"form-group {ColumnClass}")">
     <label class="control-label" for="@Id">@DisplayName</label>