Browse Source

树表查询无数据时清除分页信息(I7OB0S)

RuoYi 2 years ago
parent
commit
c2deb14284

+ 5 - 0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js

@@ -217,6 +217,8 @@
             if (!data || data.length <= 0) {
                 var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">没有找到匹配的记录</div></td></tr>'
                 $tbody.html(_empty);
+                options.pageNumber = 1;
+                initPagination(0, 0);
                 return;
             }
             // 缓存并格式化数据
@@ -272,6 +274,9 @@
             if (pageTo > target.totalRows) {
                 pageTo = target.totalRows;
             }
+            if (pageFrom > pageTo) {
+                pageFrom = pageTo;
+            }
             html.push('<div class="pull-left pagination-detail">');
             html.push('<span class="pagination-info">' + formatShowingRows(pageFrom, pageTo, target.totalRows) + '</span>');
             var pageList = false;

File diff suppressed because it is too large
+ 1 - 1
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js