防止表格最后页最后项删除变成暂无数据

3 years ago · a15bfdfb46
parent ee823b8326
commit a15bfdfb46
13 changed files with 5 additions and 13 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@ -22,7 +22,7 @@ public class PageDomain
    private String isAsc = "asc";

    /** 分页参数合理化 */
-    private Boolean reasonable = false;
+    private Boolean reasonable = true;

    public String getOrderBy()
    {
@ -87,6 +87,10 @@ public class PageDomain

    public Boolean getReasonable()
    {
+        if (StringUtils.isNull(reasonable))
+        {
+            return Boolean.TRUE;
+        }
        return reasonable;
    }

--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@ -320,7 +320,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        jobName: undefined,
        jobGroup: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@ -220,7 +220,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        jobName: undefined,
        jobGroup: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@ -153,7 +153,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        ipaddr: undefined,
        userName: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@ -219,7 +219,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        configName: undefined,
        configKey: undefined,
        configType: undefined
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@ -247,7 +247,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        dictName: undefined,
        dictType: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@ -227,7 +227,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        dictName: undefined,
        dictType: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@ -204,7 +204,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        noticeTitle: undefined,
        createBy: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@ -192,7 +192,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        postCode: undefined,
        postName: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/system/role/authUser.vue
+++ b/ruoyi-ui/src/views/system/role/authUser.vue
@ -128,7 +128,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        roleId: undefined,
        userName: undefined,
        phonenumber: undefined
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@ -328,7 +328,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        roleName: undefined,
        roleKey: undefined,
        status: undefined
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@ -418,7 +418,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        userName: undefined,
        phonenumber: undefined,
        status: undefined,
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@ -219,7 +219,6 @@ export default {
      queryParams: {
        pageNum: 1,
        pageSize: 10,
-        reasonable: true,
        tableName: undefined,
        tableComment: undefined
      },