Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Conflicts: pom.xml ruoyi-admin/pom.xml ruoyi-admin/src/main/resources/application.yml ruoyi-common/pom.xml ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java ruoyi-framework/pom.xml ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java ruoyi-generator/pom.xml ruoyi-generator/src/main/resources/vm/java/mapper.java.vm ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-quartz/pom.xml ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java ruoyi-system/pom.xml ruoyi-ui/package.json ruoyi-ui/public/index.html ruoyi-ui/src/views/index.vue ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/logininfor/index.vue ruoyi-ui/src/views/monitor/operlog/index.vue ruoyi-ui/src/views/system/config/index.vue ruoyi-ui/src/views/system/dict/data.vue ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/notice/index.vue ruoyi-ui/src/views/system/post/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue
2025-09-24 07:19:46 +08:00 · 2021-05-25 10:00:36 +08:00
parent caa81d1f4d 5e64a93d11
commit 6c195af2a3
27 changed files with 560 additions and 439 deletions
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@ -88,6 +88,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:config:export']"
        >导出</el-button>
@ -188,6 +189,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -344,10 +347,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportConfig(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    },
    /** 清理缓存按钮操作 */
@ -358,4 +363,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@ -75,6 +75,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
@ -169,6 +170,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -343,10 +346,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportData(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@ -94,6 +94,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
@ -196,6 +197,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -348,10 +351,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportType(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    },
    /** 清理缓存按钮操作 */
@ -362,4 +367,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@ -176,7 +176,7 @@
 </template>

 <script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
+import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
 import Editor from '@/components/Editor';

 export default {
@ -340,4 +340,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@ -74,6 +74,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:post:export']"
        >导出</el-button>
@ -112,7 +113,7 @@
        </template>
      </el-table-column>
    </el-table>
-    
+
    <pagination
      v-show="total>0"
      :total="total"
@ -163,6 +164,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -315,12 +318,14 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportPost(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@ -94,6 +94,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:role:export']"
        >导出</el-button>
@ -258,6 +259,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -599,10 +602,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportRole(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@ -131,6 +131,7 @@
              plain
              icon="el-icon-download"
              size="mini"
+              :loading="exportLoading"
              @click="handleExport"
              v-hasPermi="['system:user:export']"
            >导出</el-button>
@ -356,6 +357,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -637,10 +640,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportUser(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    },
    /** 导入按钮操作 */