github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

解决翻页记住选择时获取指定列值的问题

pull/137/MERGE
cain 2019-09-26 11:49:31 +08:00
parent cf211fa19c
commit af6a313d06
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -155,6 +155,7 @@
if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) { if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) {
func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference'; func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference';
selectionIds = _[func](selectionIds, rowIds); selectionIds = _[func](selectionIds, rowIds);
selectionRows = _[func](selectionRows, rows,"row");
} }
}); });
// 图片预览事件 // 图片预览事件
@ -365,7 +366,9 @@
return row[column]; return row[column];
}); });
if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) { if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) {
rows = rows.concat(selectionIds); rows = $.map(selectionRows, function (row) {
return row[column];
});
} }
return $.common.uniqueFn(rows); return $.common.uniqueFn(rows);
}, },
@ -388,7 +391,9 @@
return row[$.table._option.columns[1].field]; return row[$.table._option.columns[1].field];
}); });
if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) { if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) {
rows = rows.concat(selectionIds); rows = $.map(selectionRows, function (row) {
return row[$.table._option.columns[1].field];
});
} }
return $.common.uniqueFn(rows); return $.common.uniqueFn(rows);
}, },