更新1.3.2

zhontai · zhontai · commit 818731063b0d · 2020-05-31T23:12:23.000+08:00
新增 查询组件my-search
新增 用户管理使用查询组件查询
新增 高级查询日期数据类型增加时间段
新增 全局混入mixin，混入权限检查方法
新增 界面所有操作受权限控制
新增 权限管理权限点，用于字段粒度控制
优化 高级查询支持字段和操作符默认值，日期时间段查询处理
修复 部分环境npm run serve提示安装分页错误
diff --git a/Admin.Core.Common/Admin.Core.Common.csproj b/Admin.Core.Common/Admin.Core.Common.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端通用库</Description>
diff --git a/Admin.Core.Model/Admin.Core.Model.csproj b/Admin.Core.Model/Admin.Core.Model.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端实体库</Description>
diff --git a/Admin.Core.Model/Admin/PermissionType.cs b/Admin.Core.Model/Admin/PermissionType.cs
@@ -17,6 +17,10 @@ public enum PermissionType
         /// <summary>
         /// 接口
         /// </summary>
-        Api = 3
+        Api = 3,
+        /// <summary>
+        /// 权限点
+        /// </summary>
+        Dot = 4
     }
 }
diff --git a/Admin.Core.Repository/Admin.Core.Repository.csproj b/Admin.Core.Repository/Admin.Core.Repository.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端仓储库</Description>
diff --git a/Admin.Core.Services/Admin.Core.Service.csproj b/Admin.Core.Services/Admin.Core.Service.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端服务库</Description>
diff --git a/Admin.Core.Services/Admin/Auth/AuthService.cs b/Admin.Core.Services/Admin/Auth/AuthService.cs
@@ -116,14 +116,15 @@ public async Task<IResponseOutput> GetUserInfoAsync()
                 return ResponseOutput.NotOk("未登录！");
             }
 
+            //用户信息
             var user = await _userRepository.Select.WhereDynamic(_user.Id)
                 .ToOneAsync(m => new {
                     m.NickName,
                     m.UserName,
                     m.Avatar
                 });
 
-            //获取菜单
+            //用户菜单
             var menus = await _permissionRepository.Select
                 .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type))
                 .Where(a =>
@@ -150,8 +151,9 @@ public async Task<IResponseOutput> GetUserInfoAsync()
                     a.External
                 });
 
+            //用户权限点
             var permissions = await _permissionRepository.Select
-                .Where(a => a.Type == PermissionType.Api)
+                .Where(a => new[] { PermissionType.Api, PermissionType.Dot }.Contains(a.Type))
                 .Where(a =>
                     _permissionRepository.Orm.Select<RolePermissionEntity>()
                     .InnerJoin<UserRoleEntity>((b, c) => b.RoleId == c.RoleId && c.UserId == _user.Id)
diff --git a/Admin.Core.Services/Admin/Permission/IPermissionService.cs b/Admin.Core.Services/Admin/Permission/IPermissionService.cs
@@ -16,6 +16,8 @@ public partial interface IPermissionService
 
         Task<IResponseOutput> GetApiAsync(long id);
 
+        Task<IResponseOutput> GetDotAsync(long id);
+
         Task<IResponseOutput> GetPermissionList();
 
         Task<IResponseOutput> GetRolePermissionList(long roleId = 0);
@@ -28,12 +30,16 @@ public partial interface IPermissionService
 
         Task<IResponseOutput> AddApiAsync(PermissionAddApiInput input);
 
+        Task<IResponseOutput> AddDotAsync(PermissionAddDotInput input);
+
         Task<IResponseOutput> UpdateGroupAsync(PermissionUpdateGroupInput input);
 
         Task<IResponseOutput> UpdateMenuAsync(PermissionUpdateMenuInput input);
 
         Task<IResponseOutput> UpdateApiAsync(PermissionUpdateApiInput input);
 
+        Task<IResponseOutput> UpdateDotAsync(PermissionUpdateDotInput input);
+
         Task<IResponseOutput> DeleteAsync(long id);
 
         Task<IResponseOutput> SoftDeleteAsync(long id);
diff --git a/Admin.Core.Services/Admin/Permission/Input/PermissionAddDotInput.cs b/Admin.Core.Services/Admin/Permission/Input/PermissionAddDotInput.cs
@@ -0,0 +1,37 @@
+using Admin.Core.Model.Admin;
+
+namespace Admin.Core.Service.Admin.Permission.Input
+{
+    public class PermissionAddDotInput
+    {
+        /// <summary>
+        /// Ȩ������
+        /// </summary>
+        public PermissionType Type { get; set; } = PermissionType.Dot;
+
+        /// <summary>
+        /// �����ڵ�
+        /// </summary>
+        public int ParentId { get; set; }
+
+        /// <summary>
+        /// Ȩ������
+        /// </summary>
+        public string Label { get; set; }
+
+        /// <summary>
+        /// Ȩ�ޱ���
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// ˵��
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// ͼ��
+        /// </summary>
+        public string Icon { get; set; }
+    }
+}
diff --git a/Admin.Core.Services/Admin/Permission/Input/PermissionUpdateDotInput.cs b/Admin.Core.Services/Admin/Permission/Input/PermissionUpdateDotInput.cs
@@ -0,0 +1,15 @@
+namespace Admin.Core.Service.Admin.Permission.Input
+{
+    public class PermissionUpdateDotInput : PermissionAddDotInput
+    {
+        /// <summary>
+        /// Ȩ��Id
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// �汾
+        /// </summary>
+        public long Version { get; set; }
+    }
+}
diff --git a/Admin.Core.Services/Admin/Permission/Output/PermissionGetDotOutput.cs b/Admin.Core.Services/Admin/Permission/Output/PermissionGetDotOutput.cs
@@ -0,0 +1,9 @@
+using Admin.Core.Service.Admin.Permission.Input;
+
+namespace Admin.Core.Service.Admin.Permission.Output
+{
+    public class PermissionGetDotOutput : PermissionUpdateDotInput
+    {
+
+    }
+}
diff --git a/Admin.Core.Services/Admin/Permission/PermissionService.cs b/Admin.Core.Services/Admin/Permission/PermissionService.cs
@@ -59,6 +59,12 @@ public async Task<IResponseOutput> GetApiAsync(long id)
             return ResponseOutput.Ok(result);
         }
 
+        public async Task<IResponseOutput> GetDotAsync(long id)
+        {
+            var result = await _permissionRepository.GetAsync<PermissionGetDotOutput>(id);
+            return ResponseOutput.Ok(result);
+        }
+
         public async Task<IResponseOutput> ListAsync(string key, DateTime? start, DateTime? end)
         {
             if (end.HasValue)
@@ -100,6 +106,14 @@ public async Task<IResponseOutput> AddApiAsync(PermissionAddApiInput input)
             return ResponseOutput.Ok(id > 0);
         }
 
+        public async Task<IResponseOutput> AddDotAsync(PermissionAddDotInput input)
+        {
+            var entity = _mapper.Map<PermissionEntity>(input);
+            var id = (await _permissionRepository.InsertAsync(entity)).Id;
+
+            return ResponseOutput.Ok(id > 0);
+        }
+
         public async Task<IResponseOutput> UpdateGroupAsync(PermissionUpdateGroupInput input)
         {
             var result = false;
@@ -139,6 +153,19 @@ public async Task<IResponseOutput> UpdateApiAsync(PermissionUpdateApiInput input
             return ResponseOutput.Result(result);
         }
 
+        public async Task<IResponseOutput> UpdateDotAsync(PermissionUpdateDotInput input)
+        {
+            var result = false;
+            if (input != null && input.Id > 0)
+            {
+                var entity = await _permissionRepository.GetAsync(input.Id);
+                entity = _mapper.Map(input, entity);
+                result = (await _permissionRepository.UpdateAsync(entity)) > 0;
+            }
+
+            return ResponseOutput.Result(result);
+        }
+
         public async Task<IResponseOutput> DeleteAsync(long id)
         {
             var result = false;
diff --git a/Admin.Core.Services/Admin/Permission/_MapConfig.cs b/Admin.Core.Services/Admin/Permission/_MapConfig.cs
@@ -14,10 +14,12 @@ public MapConfig()
             CreateMap<PermissionAddGroupInput, PermissionEntity>();
             CreateMap<PermissionAddMenuInput, PermissionEntity>();
             CreateMap<PermissionAddApiInput, PermissionEntity>();
+            CreateMap<PermissionAddDotInput, PermissionEntity>();
 
             CreateMap<PermissionUpdateGroupInput, PermissionEntity>();
             CreateMap<PermissionUpdateMenuInput, PermissionEntity>();
             CreateMap<PermissionUpdateApiInput, PermissionEntity>();
+            CreateMap<PermissionUpdateDotInput, PermissionEntity>();
         }
     }
 }
diff --git a/Admin.Core.Services/Admin/User/UserService.cs b/Admin.Core.Services/Admin/User/UserService.cs
@@ -92,10 +92,7 @@ public async Task<IList<string>> GetPermissionsAsync()
 
         public async Task<IResponseOutput> PageAsync(PageInput<UserEntity> input)
         {
-            var key = input.Filter?.UserName;
-
             var list = await _userRepository.Select
-            .WhereIf(key.NotNull(), a => a.Status >= 0 && (a.UserName.Contains(key) || a.NickName.Contains(key)))
             .WhereDynamicFilter(input.DynamicFilter)
             .Count(out var total)
             .OrderByDescending(true, a => a.Id)
diff --git a/Admin.Core/Admin.Core.Model.xml b/Admin.Core/Admin.Core.Model.xml
diff --git a/Admin.Core/Admin.Core.Service.xml b/Admin.Core/Admin.Core.Service.xml
diff --git a/Admin.Core/Admin.Core.csproj b/Admin.Core/Admin.Core.csproj
@@ -5,7 +5,7 @@
     <!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
diff --git a/Admin.Core/Admin.Core.xml b/Admin.Core/Admin.Core.xml
diff --git a/Admin.Core/Controllers/Admin/PermissionController.cs b/Admin.Core/Controllers/Admin/PermissionController.cs
diff --git a/Admin.Core/Db/Data/data.json b/Admin.Core/Db/Data/data.json
diff --git a/Admin.Core/configs/appconfig.json b/Admin.Core/configs/appconfig.json

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@ public enum PermissionType`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// 接口`
`19`	`19`	`/// </summary>`
`20`		`- Api = 3`
	`20`	`+ Api = 3,`
	`21`	`+ /// <summary>`
	`22`	`+ /// 权限点`
	`23`	`+ /// </summary>`
	`24`	`+ Dot = 4`
`21`	`25`	`}`
`22`	`26`	`}`