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

新增表格客户端分页选项

pull/72/head
RuoYi 2019-02-15 14:12:03 +08:00
parent 742846b421
commit cc67d57cef
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/run.bat Normal file
View File

@ -0,0 +1,15 @@
@echo off
echo.
echo [信息] 运行Web工程。
echo.
%~d0
cd %~dp0
cd ../ruoyi-admin/target
set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -jar %JAVA_OPTS% ruoyi-admin.jar
cd bin
pause

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

@ -14,6 +14,7 @@
init: function(options) { init: function(options) {
$.table._option = options; $.table._option = options;
$.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams; $.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams;
_sidePagination = $.common.isEmpty(options.sidePagination) ? "server" : options.pagination;
_sortOrder = $.common.isEmpty(options.sortOrder) ? "asc" : options.sortOrder; _sortOrder = $.common.isEmpty(options.sortOrder) ? "asc" : options.sortOrder;
_sortName = $.common.isEmpty(options.sortName) ? "" : options.sortName; _sortName = $.common.isEmpty(options.sortName) ? "" : options.sortName;
_pageSize = $.common.isEmpty(options.pageSize) ? 10 : options.pageSize; _pageSize = $.common.isEmpty(options.pageSize) ? 10 : options.pageSize;
@ -42,7 +43,7 @@
showFooter: _showFooter, // 是否显示表尾 showFooter: _showFooter, // 是否显示表尾
iconSize: 'outline', // 图标大小：undefined默认的按钮尺寸 xs超小按钮sm小按钮lg大按钮 iconSize: 'outline', // 图标大小：undefined默认的按钮尺寸 xs超小按钮sm小按钮lg大按钮
toolbar: '#toolbar', // 指定工作栏 toolbar: '#toolbar', // 指定工作栏
sidePagination: "server", // 启用服务端分页 sidePagination: _sidePagination, // server启用服务端分页client客户端分页
search: $.common.visible(options.search), // 是否显示搜索框功能 search: $.common.visible(options.search), // 是否显示搜索框功能
showSearch: $.common.visible(options.showSearch), // 是否显示检索信息 showSearch: $.common.visible(options.showSearch), // 是否显示检索信息
showRefresh: $.common.visible(options.showRefresh), // 是否显示刷新按钮 showRefresh: $.common.visible(options.showRefresh), // 是否显示刷新按钮
@ -73,7 +74,11 @@
// 请求获取数据后处理回调函数 // 请求获取数据后处理回调函数
responseHandler: function(res) { responseHandler: function(res) {
if (res.code == 0) { if (res.code == 0) {
return { rows: res.rows, total: res.total }; if ($.common.isNotEmpty($.table._option.sidePagination) && $.table._option.sidePagination === 'client') {
return res.rows;
} else {
return { rows: res.rows, total: res.total };
}
} else { } else {
$.modal.alertWarning(res.msg); $.modal.alertWarning(res.msg);
return { rows: [], total: 0 }; return { rows: [], total: 0 };