From 0bf1717b65fbcde4b617d1b0f3357bb16f1548ae Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 10 Apr 2019 15:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DrememberSelected=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=E8=AE=BE=E7=BD=AE=E4=B8=BAtrue=E6=97=B6=E4=BF=9D?=
=?UTF-8?q?=E7=95=99=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 6 ++++++
.../resources/templates/monitor/logininfor/logininfor.html | 1 +
.../main/resources/templates/monitor/operlog/operlog.html | 1 +
.../main/resources/templates/system/role/selectUser.html | 1 +
4 files changed, 9 insertions(+)
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 3860a565..def8ab03 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -98,6 +98,12 @@
if ($.common.isNotEmpty($.table._option.sidePagination) && $.table._option.sidePagination == 'client') {
return res.rows;
} else {
+ if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) {
+ var column = $.common.isEmpty($.table._option.uniqueId) ? $.table._option.columns[1].field : $.table._option.uniqueId;
+ $.each(res.rows, function(i, row) {
+ row.state = $.inArray(row[column], selectionIds) !== -1;
+ })
+ }
return { rows: res.rows, total: res.total };
}
} else {
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
index a887f6d1..8c1106ff 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -73,6 +73,7 @@
showPageGo: true,
rememberSelected: true,
columns: [{
+ field: 'state',
checkbox: true
},
{
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
index 8c2a9a3d..55c3fd4d 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
@@ -81,6 +81,7 @@
showPageGo: true,
rememberSelected: true,
columns: [{
+ field: 'state',
checkbox: true
},
{
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html b/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
index 92cdd8de..f26cea0a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
@@ -57,6 +57,7 @@
clickToSelect: true,
rememberSelected: true,
columns: [{
+ field: 'state',
checkbox: true
},
{