视图和权限管理查询、新增和修改新增排序支持

build/pkg.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>3.0.6</Version>
+    <Version>3.0.7</Version>
 	<TargetFramework>net7.0</TargetFramework>
 	<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>

src/platform/ZhonTai.Admin/Domain/Permission/PermissionEntity.cs

@@ -61,11 +61,6 @@ public partial class PermissionEntity : EntityBase
     /// </summary>
 	public bool Hidden { get; set; } = false;
 
-    /// <summary>
-    /// 启用
-    /// </summary>
-	public bool Enabled { get; set; } = true;
-
     /// <summary>
     /// 可关闭
     /// </summary>
@@ -89,7 +84,7 @@ public partial class PermissionEntity : EntityBase
     /// <summary>
     /// 排序
     /// </summary>
-    public int? Sort { get; set; } = 0;
+    public int Sort { get; set; }
 
     /// <summary>
     /// 描述
@@ -97,6 +92,11 @@ public partial class PermissionEntity : EntityBase
     [Column(StringLength = 100)]
     public string Description { get; set; }
 
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enabled { get; set; } = true;
+
     [Navigate(ManyToMany = typeof(PermissionApiEntity))]
     public ICollection<ApiEntity> Apis { get; set; }
 

src/platform/ZhonTai.Admin/Domain/View/ViewEntity.cs

@@ -41,11 +41,6 @@ public partial class ViewEntity : EntityBase
     [Column(StringLength = 500)]
     public string Description { get; set; }
 
-    /// <summary>
-    /// 启用
-    /// </summary>
-    public bool Enabled { get; set; } = true;
-
     /// <summary>
     /// 缓存
     /// </summary>
@@ -56,6 +51,11 @@ public partial class ViewEntity : EntityBase
     /// </summary>
     public int Sort { get; set; }
 
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enabled { get; set; } = true;
+
     [Navigate(nameof(ParentId))]
     public List<ViewEntity> Childs { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddApiInput.cs

@@ -39,13 +39,18 @@ public class PermissionAddApiInput
     /// </summary>
 	public bool Hidden { get; set; }
 
-    ///// <summary>
-    ///// 启用
-    ///// </summary>
-    //public bool Enabled { get; set; }
-
     /// <summary>
     /// 图标
     /// </summary>
     public string Icon { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddDotInput.cs

@@ -38,4 +38,14 @@ public class PermissionAddDotInput
     /// 图标
     /// </summary>
     public string Icon { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddGroupInput.cs

@@ -29,11 +29,6 @@ public class PermissionAddGroupInput
     /// </summary>
 	public bool Hidden { get; set; }
 
-    ///// <summary>
-    ///// 启用
-    ///// </summary>
-    //public bool Enabled { get; set; }
-
     /// <summary>
     /// 图标
     /// </summary>
@@ -43,4 +38,14 @@ public class PermissionAddGroupInput
     /// 打开
     /// </summary>
     public bool? Opened { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddMenuInput.cs

@@ -39,11 +39,6 @@ public class PermissionAddMenuInput
     /// </summary>
 	public bool Hidden { get; set; }
 
-    ///// <summary>
-    ///// 启用
-    ///// </summary>
-    //public bool Enabled { get; set; }
-
     /// <summary>
     /// 图标
     /// </summary>
@@ -63,4 +58,14 @@ public class PermissionAddMenuInput
     /// 链接外显
     /// </summary>
     public bool? External { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
+    /// <summary>
+    /// 启用
+    /// </summary>
+    public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionListOutput.cs

@@ -34,25 +34,20 @@ public class PermissionListOutput
     /// </summary>
     public string ApiPaths { get; set; }
 
-    /// <summary>
-    /// 描述
-    /// </summary>
-    public string Description { get; set; }
-
     /// <summary>
     /// 图标
     /// </summary>
     public string Icon { get; set; }
 
     /// <summary>
-    /// 组打开
+    /// 排序
     /// </summary>
-    public bool? Opened { get; set; }
+    public int? Sort { get; set; }
 
     /// <summary>
-    /// 隐藏
+    /// 描述
     /// </summary>
-	public bool Hidden { get; set; }
+    public string Description { get; set; }
 
     /// <summary>
     /// 启用

src/platform/ZhonTai.Admin/Services/View/Dto/ViewAddInput.cs

@@ -30,6 +30,16 @@ public class ViewAddInput
     /// </summary>
     public string Description { get; set; }
 
+    /// <summary>
+    /// 缓存
+    /// </summary>
+    public bool Cache { get; set; } = true;
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
     /// <summary>
     /// 启用
     /// </summary>

src/platform/ZhonTai.Admin/Services/View/Dto/ViewListOutput.cs

@@ -27,6 +27,16 @@ public class ViewListOutput
     /// </summary>
     public string Path { get; set; }
 
+    /// <summary>
+    /// 缓存
+    /// </summary>
+    public bool Cache { get; set; } = true;
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int Sort { get; set; }
+
     /// <summary>
     /// 启用
     /// </summary>

src/platform/ZhonTai.Admin/Services/View/ViewService.cs

@@ -59,6 +59,11 @@ public class ViewService : BaseService, IViewService, IDynamicApi
     public async Task<long> AddAsync(ViewAddInput input)
     {
         var entity = Mapper.Map<ViewEntity>(input);
+        if (entity.Sort == 0)
+        {
+            var sort = await _viewRepository.Select.Where(a => a.ParentId == input.ParentId).MaxAsync(a => a.Sort);
+            entity.Sort = sort + 1;
+        }
         await _viewRepository.InsertAsync(entity);
 
         return entity.Id;

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -2113,7 +2113,7 @@
         </member>
         <member name="T:ZhonTai.Admin.Domain.LoginLog.LoginLogEntity">
             <summary>
-            操作日志
+            登录日志
             </summary>
         </member>
         <member name="T:ZhonTai.Admin.Domain.OprationLog.OprationLogEntity">
@@ -2283,11 +2283,6 @@
             隐藏
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Permission.PermissionEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.Permission.PermissionEntity.Closable">
             <summary>
             可关闭
@@ -2318,6 +2313,11 @@
             描述
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.Permission.PermissionEntity.Enabled">
+            <summary>
+            启用
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Domain.Permission.PermissionType">
             <summary>
             权限类型
@@ -3046,11 +3046,6 @@
             说明
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.View.ViewEntity.Enabled">
-            <summary>
-            启用
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.View.ViewEntity.Cache">
             <summary>
             缓存
@@ -3061,6 +3056,11 @@
             排序
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Domain.View.ViewEntity.Enabled">
+            <summary>
+            启用
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Domain.Task.Dto.TaskGetPageDto.Topic">
             <summary>
             任务名称名称
@@ -4773,24 +4773,19 @@
             接口路径
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Icon">
             <summary>
             图标
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Opened">
+        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Sort">
             <summary>
-            组打开
+            排序
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Hidden">
+        <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Description">
             <summary>
-            隐藏
+            描述
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.Permission.Dto.PermissionListOutput.Enabled">
@@ -6052,6 +6047,16 @@
             说明
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.View.Dto.ViewAddInput.Cache">
+            <summary>
+            缓存
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.View.Dto.ViewAddInput.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.View.Dto.ViewAddInput.Enabled">
             <summary>
             启用
@@ -6082,6 +6087,16 @@
             视图路径
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.View.Dto.ViewListOutput.Cache">
+            <summary>
+            缓存
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.View.Dto.ViewListOutput.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.View.Dto.ViewListOutput.Enabled">
             <summary>
             启用