diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index 0c245f5..02b1258 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -28,7 +28,7 @@ $end - + ${VueViewListContent} @@ -92,6 +92,8 @@ export default { queryParams: { pageNum: 1, pageSize: 20, + sort: undefined, + sortType: undefined, $foreach(item in genTable.Columns) $if(item.IsQuery == true) ${item.CsharpFieldFl}: undefined, @@ -199,7 +201,7 @@ $end }; this.resetForm("form"); }, - /** 重置查询操作 */ + // 重置查询操作 resetQuery() { this.timeRange = []; $foreach(item in genTable.Columns) @@ -216,6 +218,18 @@ $end this.ids = selection.map((item) => item.${replaceDto.FistLowerPk}); this.single = selection.length != 1 this.multiple = !selection.length; + }, + // 自定义排序 + sortChange(column) { + if (column.prop == null || column.order == null) { + this.queryParams.sort = undefined; + this.queryParams.sortType = undefined; + } else { + this.queryParams.sort = column.prop; + this.queryParams.sortType = column.order; + } + + this.handleQuery(); }, /** 搜索按钮操作 */ handleQuery() { diff --git a/ZR.Model/PagedInfo.cs b/ZR.Model/PagedInfo.cs index 10b224f..ee2ea0e 100644 --- a/ZR.Model/PagedInfo.cs +++ b/ZR.Model/PagedInfo.cs @@ -18,14 +18,6 @@ namespace ZR.Model /// public int PageIndex { get; set; } = 1; /// - /// 排序列 - /// - public string Sort { get; set; } - /// - /// 排序类型 - /// - public string SortType { get; set; } - /// /// 总记录数 /// public int TotalNum { get; set; } @@ -50,7 +42,7 @@ namespace ZR.Model public List Result { get; set; } public PagedInfo() - { + { } } } diff --git a/ZR.Model/PagerInfo.cs b/ZR.Model/PagerInfo.cs index caefd5b..721ca55 100644 --- a/ZR.Model/PagerInfo.cs +++ b/ZR.Model/PagerInfo.cs @@ -10,7 +10,7 @@ namespace ZR.Model /// 当前页码 /// public int PageNum { get; set; } - private int pageSize; + public int PageSize { get; set; } /// /// 总记录数 /// @@ -27,11 +27,16 @@ namespace ZR.Model { return TotalNum > 0 ? TotalNum % PageSize == 0 ? TotalNum / PageSize : TotalNum / PageSize + 1 : 0; } - set { } } - public int PageSize { get => pageSize; set => pageSize = value; } - public string Sort { get; set; } - public string OrderBy { get; set; } + + /// + /// 排序字段 + /// + public string Sort { get; set; } = string.Empty; + /// + /// 排序类型,前端传入的是"ascending","descending" + /// + public string SortType { get; set; } = string.Empty; public PagerInfo() { PageNum = 1; diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 484b060..0124843 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/ZR.Repository/BaseRepository.cs @@ -418,7 +418,7 @@ namespace ZR.Repository page.PageSize = parm.PageSize; page.PageIndex = parm.PageNum; - page.Result = source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.OrderBy} {(parm.Sort == "desc" ? "desc" : "asc")}") + page.Result = source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.Sort} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") .ToPageList(parm.PageNum, parm.PageSize, ref total); page.TotalNum = total; return page;