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

分页记住选择指定列值数据问题修正

pull/135/head
RuoYi 2019-09-29 15:53:10 +08:00
parent f600cdf527
commit 81ec67d4ea
3 changed files with 10 additions and 4 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);
} }
}); });
// 图片预览事件 // 图片预览事件
@ -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);
}, },

3
ruoyi-admin/src/main/resources/templates/demo/table/remember.html
View File

@ -81,7 +81,8 @@
// 选中数据 // 选中数据
function checkItem(){ function checkItem(){
var arrays = $.table.selectColumns("userId"); // var arrays = $.table.selectColumns("userId");
var arrays = $.table.selectColumns("userCode");
alert(arrays); alert(arrays);
} }
</script> </script>