diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt index 43950e5..803e58b 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt @@ -553,14 +553,23 @@ function handleSelectionChange(selection) { // 自定义排序 function sortChange(column) { - if (column.prop == null || column.order == null) { - queryParams.sort = undefined - queryParams.sortType = undefined - } else { - queryParams.sort = column.prop - queryParams.sortType = column.order - } + var sort = undefined + var sortType = undefined + if (column.prop != null && column.order != null) { + sort = column.prop + sortType = column.order + +$foreach(item in genTable.Columns) +$if(item.IsSort && item.CsharpField.ToLower() != item.ColumnName.ToLower()) + if (column.prop == '${item.CsharpFieldFl}') { + sort = '${item.ColumnName}' + } +$end +${end} + } + queryParams.sort = sort + queryParams.sortType = sortType handleQuery() } diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index 97c928c..9465a14 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -420,14 +420,23 @@ function handleSelectionChange(selection) { // 自定义排序 function sortChange(column) { - if (column.prop == null || column.order == null) { - queryParams.sort = undefined - queryParams.sortType = undefined - } else { - queryParams.sort = column.prop - queryParams.sortType = column.order - } + var sort = undefined + var sortType = undefined + if (column.prop != null && column.order != null) { + sort = column.prop + sortType = column.order + +$foreach(item in genTable.Columns) +$if(item.IsSort && item.CsharpField.ToLower() != item.ColumnName.ToLower()) + if (column.prop == '${item.CsharpFieldFl}') { + sort = '${item.ColumnName}' + } +$end +${end} + } + queryParams.sort = sort + queryParams.sortType = sortType handleQuery() }