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

疯狂的狮子li

2022-02-18 f6edb48df9887020f2d757fdfd3e35dd01cfaee2

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


 Conflicts:

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

	ruoyi-ui/src/components/Pagination/index.vue

 ruoyi-ui/src/components/Pagination/index.vue

@@ -1,6 +1,7 @@
<template>
  <div :class="{'hidden':hidden}" class="pagination-container">
    <el-pagination
      v-if="pageShow"
      :background="background"
      :current-page.sync="currentPage"
      :page-size.sync="pageSize"
@@ -61,6 +62,11 @@
      default: false
    }
  },
  data() {
    return {
      pageShow: true
    };
  },
  computed: {
    currentPage: {
      get() {
@@ -81,6 +87,12 @@
  },
  methods: {
    handleSizeChange(val) {
      if (this.currentPage * val > this.total) {
        this.pageShow = false;
        this.$nextTick(() => {
          this.pageShow = true
        })
      }
      this.$emit('pagination', { page: this.currentPage, limit: val })
      if (this.autoScroll) {
        scrollTo(0, 800)