diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs index 1cd51c3..53c9d73 100644 --- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs @@ -101,7 +101,7 @@ namespace ZR.Admin.WebApi.Controllers { var tableColumns = GenTableColumnService.GenTableColumns(tableId); var tableInfo = GenTableService.GetGenTableInfo(tableId); - return SUCCESS(new { result = tableColumns, info = tableInfo }); + return SUCCESS(new { cloumns = tableColumns, info = tableInfo }); } /// @@ -188,7 +188,12 @@ namespace ZR.Admin.WebApi.Controllers if (genTableDto == null) throw new CustomException("请求参数错误"); var genTable = genTableDto.Adapt().ToUpdate(HttpContext); - genTable.Options = JsonConvert.SerializeObject(new { parentMenuId = genTableDto.ParentMenuId }); + genTable.Options = JsonConvert.SerializeObject(new + { + parentMenuId = genTableDto.ParentMenuId, + sortField = genTableDto.SortField, + sortType = genTable.SortType + }); int rows = GenTableService.UpdateGenTable(genTable); if (rows > 0) { diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt index 3c2519d..612e051 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt @@ -7,19 +7,19 @@ SELECT @menuId := LAST_INSERT_ID(); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) -VALUES ('${genTable.functionName}查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:query', '', sysdate()); +VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:query', '', sysdate()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) -VALUES ('${genTable.functionName}新增', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:add', '', sysdate()); +VALUES ('新增', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:add', '', sysdate()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) -VALUES ('${genTable.functionName}删除', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:delete', '', sysdate()); +VALUES ('删除', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:delete', '', sysdate()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) -VALUES ('${genTable.functionName}修改', @menuId, 4, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:update', '', sysdate()); +VALUES ('修改', @menuId, 4, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:update', '', sysdate()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) -VALUES ('${genTable.functionName}导出', @menuId, 5, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:export', '', sysdate()); +VALUES ('导出', @menuId, 5, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:export', '', sysdate()); SELECT * FROM sys_menu WHERE parentId = @menuId; SELECT * FROM sys_menu WHERE menuId = @menuId; \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt index 1ea135d..c061fc2 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt @@ -7,19 +7,19 @@ declare @menuId int = @@identity INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) -VALUES ('${genTable.functionName}查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:query', '', '', GETDATE()); +VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:query', '', '', GETDATE()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) -VALUES ('${genTable.functionName}新增', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:add', '', '', GETDATE()); +VALUES ('新增', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:add', '', '', GETDATE()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) -VALUES ('${genTable.functionName}删除', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:delete', '', '', GETDATE()); +VALUES ('删除', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:delete', '', '', GETDATE()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) -VALUES ('${genTable.functionName}修改', @menuId, 4, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:update', '', '', GETDATE()); +VALUES ('修改', @menuId, 4, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:update', '', '', GETDATE()); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) -VALUES ('${genTable.functionName}导出', @menuId, 5, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:export', '', '', GETDATE()); +VALUES ('导出', @menuId, 5, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:export', '', '', GETDATE()); SELECT * FROM sys_menu WHERE parentId = @menuId; SELECT * FROM sys_menu WHERE menuId = @menuId; \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index 58e9925..2ea1d4d 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -50,11 +50,14 @@ namespace ${options.ApiControllerNamespace}.Controllers //开始拼装查询条件 var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>(); - //TODO 自己实现搜索条件查询语法参考Sqlsugar，默认查询所有 + //搜索条件查询语法参考Sqlsugar //predicate = predicate.And(m => m.Name.Contains(parm.Name)); ${QueryCondition} +$if(genTable.SortField != "") + var response = _${replaceDto.ModelTypeName}Service.GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}"); +$else var response = _${replaceDto.ModelTypeName}Service.GetPages(predicate.ToExpression(), parm); - +$end return SUCCESS(response); } diff --git a/ZR.Model/System/Dto/GenTableDto.cs b/ZR.Model/System/Dto/GenTableDto.cs index df35f76..e534095 100644 --- a/ZR.Model/System/Dto/GenTableDto.cs +++ b/ZR.Model/System/Dto/GenTableDto.cs @@ -25,6 +25,8 @@ namespace ZR.Model.System.Dto /// 上级菜单id /// public int? ParentMenuId { get; set; } + public string SortField { get; set; } + public string SortType { get; set; } public List Columns { get; set; } } diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs index 32a567c..6bbdd16 100644 --- a/ZR.Model/System/Generate/GenTable.cs +++ b/ZR.Model/System/Generate/GenTable.cs @@ -9,7 +9,7 @@ namespace ZR.Model.System.Generate /// [SqlSugar.SugarTable("gen_table")] [SqlSugar.Tenant("0")] - public class GenTable: SysBase + public class GenTable : SysBase { /// /// 表id @@ -73,8 +73,14 @@ namespace ZR.Model.System.Generate /** 表列信息 */ [SqlSugar.SugarColumn(IsIgnore = true)] public List Columns { get; set; } + + //以下 Options扩展字段 [SqlSugar.SugarColumn(IsIgnore = true)] - public string ParentMenuId { get; set; } + public object ParentMenuId { get; set; } + [SqlSugar.SugarColumn(IsIgnore = true)] + public object SortType { get; set; } = "asc"; + [SqlSugar.SugarColumn(IsIgnore = true)] + public object SortField { get; set; } = ""; #endregion } } diff --git a/ZR.Service/BaseService.cs b/ZR.Service/BaseService.cs index e4ec4dd..0b68a66 100644 --- a/ZR.Service/BaseService.cs +++ b/ZR.Service/BaseService.cs @@ -43,7 +43,7 @@ namespace ZR.Service { return baseRepository.Add(t); } - public IInsertable Insertable(T t) + public IInsertable Insertable(T t) { return baseRepository.Insertable(t); } @@ -179,7 +179,7 @@ namespace ZR.Service public DbResult UseTran(Action action) { - var result = baseRepository.UseTran(action) ; + var result = baseRepository.UseTran(action); return result; } @@ -330,6 +330,10 @@ namespace ZR.Service { return baseRepository.GetPages(where, parm, order, orderEnum); } + public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderByType) + { + return baseRepository.GetPages(where, parm, order, orderByType == "desc" ? OrderByType.Desc : OrderByType.Asc); + } /// /// 查询所有数据(无分页,请慎用) /// diff --git a/ZR.Service/IBaseService.cs b/ZR.Service/IBaseService.cs index 2a009e0..a4354f0 100644 --- a/ZR.Service/IBaseService.cs +++ b/ZR.Service/IBaseService.cs @@ -99,7 +99,7 @@ namespace ZR.Service PagedInfo GetPages(Expression> where, PagerInfo parm); PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, OrderByType orderEnum = OrderByType.Asc); - + PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderType); bool Any(Expression> expression); ISugarQueryable Queryable(); diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs index 8526be5..5d8b85d 100644 --- a/ZR.Service/System/GenTableService.cs +++ b/ZR.Service/System/GenTableService.cs @@ -70,7 +70,9 @@ namespace ZR.Service.System if (!string.IsNullOrEmpty(genTable?.Options)) { Dictionary options = JsonConvert.DeserializeObject>(genTable.Options); - genTable.ParentMenuId = Convert.ToString(options.GetValueOrDefault("parentMenuId")); + genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null; + genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc"; + genTable.SortField = options.GetValueOrDefault("sortField") ?? null; } } diff --git a/ZR.Service/System/IService/ISysTasksLogService.cs b/ZR.Service/System/IService/ISysTasksLogService.cs index cf0f16e..fe0815d 100644 --- a/ZR.Service/System/IService/ISysTasksLogService.cs +++ b/ZR.Service/System/IService/ISysTasksLogService.cs @@ -10,6 +10,6 @@ namespace ZR.Service.System.IService /// /// //public int AddTaskLog(string jobId); - public SysTasksLog AddTaskLog(string jobId, SysTasksLog tasksLog); + SysTasksLog AddTaskLog(string jobId, SysTasksLog tasksLog); } } diff --git a/ZR.Service/System/SysTasksLogService.cs b/ZR.Service/System/SysTasksLogService.cs index fdebc8d..f2a2ace 100644 --- a/ZR.Service/System/SysTasksLogService.cs +++ b/ZR.Service/System/SysTasksLogService.cs @@ -1,5 +1,7 @@ using Infrastructure.Attribute; using System; +using System.Linq.Expressions; +using ZR.Model; using ZR.Model.System; using ZR.Repository; using ZR.Service.System.IService; @@ -34,5 +36,10 @@ namespace ZR.Service.System Add(logModel); return logModel; } + + public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderType) + { + throw new NotImplementedException(); + } } } diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue index 354ede3..52fda30 100644 --- a/ZR.Vue/src/views/index.vue +++ b/ZR.Vue/src/views/index.vue @@ -62,7 +62,7 @@
  • Quartz.Net
  • MySql
  • Mapster
    • -
  • Epplus
    • +
  • Epplus
  • ...
    • @@ -109,27 +109,25 @@ 更新日志 - +
      +
    1. 代码生成新增加排序字段
    2. 新增加登录验证码开关
      3. -
    3. 替换代码生成器模板引擎
      4. -
    4. 富文本组件Editor改用全局注册
      5. -
    5. 新增加上传文件到阿里云
      6. -
    6. fix gen_table_column表表名字段长度不够
      7. -
    7. 其他功能优化
      8. -
    -     - -
      +
    1. 替换代码生成器模板引擎
      2. +
    2. 富文本组件Editor改用全局注册
      3. +
    3. 新增加上传文件到阿里云
      4. +
    4. fix gen_table_column表表名字段长度不够
      5. +
    5. 代码生成新增排序字段
    6. fix 代码生成编辑表信息选择上级菜单bug
    7. 新增下拉框组件代码生成查询模块
      8. -
    8. 优化代码生成模板
      9. -
    9. 优化后端分页统一返回json
      10. -
    10. 修改代码生成form表单显示
      11. -
    11. 新增代码生成单选按钮动态绑定数据
      12. -
    12. 代码生成查询新增一键生成、可支持input、select、时间
      13. -
    13. 修改代码生成数据库连接字符串
      14. -
    14. 优化数据仓储
      15. +
    15. 优化代码生成模板
      16. +
    16. 优化后端分页统一返回json
      17. +
    17. 修改代码生成form表单显示
      18. +
    18. 新增代码生成单选按钮动态绑定数据
      19. +
    19. 代码生成查询新增一键生成、可支持input、select、时间
      20. +
    20. 修改代码生成数据库连接字符串
      21. +
    21. 优化数据仓储
      22. +
    22. 其他功能优化
     @@ -178,7 +176,7 @@