github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(table): 修复排序且重载后 `table.cache` 数据中的 `LAY_INDEX` 丢失的问题 (#2340)

pull/2348/head
贤心 2024-11-21 10:40:53 +08:00 committed by GitHub
parent 3645282c22
commit d0dc609cf9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/table.js
View File

@ -20,7 +20,8 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
var table = { var table = {
config: { // 全局配置项 config: { // 全局配置项
checkName: 'LAY_CHECKED', // 是否选中状态的特定字段名 checkName: 'LAY_CHECKED', // 是否选中状态的特定字段名
indexName: 'LAY_INDEX', // 初始下标索引名，用于恢复当前页表格排序 indexName: 'LAY_INDEX', // 下标索引
initIndexName: 'LAY_INDEX_INIT', // 初始下标索引名，仅用于内部恢复当前页表格排序
numbersName: 'LAY_NUM', // 序号 numbersName: 'LAY_NUM', // 序号
disabledName: 'LAY_DISABLED' // 禁用状态的特定字段名 disabledName: 'LAY_DISABLED' // 禁用状态的特定字段名
}, },
@ -1312,8 +1313,9 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
// 加入序号保留字段 // 加入序号保留字段
item1[table.config.numbersName] = numbers; item1[table.config.numbersName] = numbers;
// 记录下标索引，用于恢复排序 // 记录下标，
if(!sort) item1[table.config.indexName] = i1; item1[table.config.indexName] = i1;
if(!sort) item1[table.config.initIndexName] = i1; // 记录初始状态下标，仅用于内部恢复当前页表格排序
// 遍历表头 // 遍历表头
that.eachCols(function(i3, item3){ that.eachCols(function(i3, item3){
@ -1460,6 +1462,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
reloadType: opts.type reloadType: opts.type
}); });
} }
that.getTrHtml(data, sort, curr, { that.getTrHtml(data, sort, curr, {
trs: trs, trs: trs,
trs_fixed: trs_fixed, trs_fixed: trs_fixed,
@ -1894,7 +1897,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
} else if(opts.type === 'desc'){ //降序 } else if(opts.type === 'desc'){ //降序
thisData = layui.sort(data, field, true, true); thisData = layui.sort(data, field, true, true);
} else { // 清除排序 } else { // 清除排序
thisData = layui.sort(data, table.config.indexName, null, true); thisData = layui.sort(data, table.config.initIndexName, null, true);
delete that.sortKey; delete that.sortKey;
delete options.initSort; delete options.initSort;
} }
@ -3300,6 +3303,7 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
data = $.extend({}, data); data = $.extend({}, data);
delete data[table.config.checkName]; delete data[table.config.checkName];
delete data[table.config.indexName]; delete data[table.config.indexName];
delete data[table.config.initIndexName];
delete data[table.config.numbersName]; delete data[table.config.numbersName];
delete data[table.config.disabledName]; delete data[table.config.disabledName];
return data; return data;