Merge remote-tracking branch 'origin/v5.1.0dev' into v5.1.0dev

template/admin/src/pages/system/file/index.vue

@@ -2,7 +2,7 @@
   <div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <div class="box" ref="picBox">
-        <upload-file v-if="uploadShow" :isShow="0" :pageLimit="pageLimit"></upload-file>
+        <upload-file v-if="uploadShow" :isPage="true" :isShow="0" :pageLimit="pageLimit"></upload-file>
       </div>
     </Card>
   </div>
@@ -14,7 +14,7 @@ export default {
   name: 'system_file',
   data() {
     return {
-      pageLimit: 30,
+      pageLimit: 12,
       uploadShow: false,
     };
   },
@@ -23,20 +23,20 @@ export default {
       let winWidth = this.$refs.picBox.clientWidth;
       let winHeight = document.body.clientHeight - 170;
       if (winWidth < 1018) {
-        this.pageLimit = 18;
-        this.pageLimit = winHeight > 790 ? 24 : 18;
+        this.pageLimit = 12;
+        this.pageLimit = winHeight > 790 ? 12 : 16;
       } else if (winWidth < 1185) {
-        this.pageLimit = winHeight > 790 ? 30 : 18;
+        this.pageLimit = winHeight > 790 ? 15 : 24;
       } else if (winWidth < 1222) {
-        this.pageLimit = 30;
+        this.pageLimit = 15;
       } else if (winWidth < 1327) {
-        this.pageLimit = 32;
+        this.pageLimit = 18;
       } else if (winWidth < 1750) {
-        this.pageLimit = 40;
+        this.pageLimit = 21;
       } else if (winWidth < 2100) {
-        this.pageLimit = winHeight > 790 ? 60 : 48;
+        this.pageLimit = winHeight > 790 ? 30 : 26;
       } else if (winWidth > 2100) {
-        this.pageLimit = winHeight > 790 ? 75 : 60;
+        this.pageLimit = winHeight > 790 ? 36 : 26;
       }
       this.uploadShow = true;
     });

template/admin/src/styles/style.css

@@ -727,3 +727,7 @@ body {
 .pl10 {
   padding-left: 10px;
 }
+.df-jcsb {
+  display: flex;
+  justify-content: space-between;
+}

template/admin/src/theme/variables.scss

@@ -56,7 +56,7 @@
 .el-button--primary.is-disabled:active,
 .el-button--primary.is-disabled:focus,
 .el-button--primary.is-disabled:hover {
-  color: var(--prev-color-primary) !important;
+  color: #fff !important;
   background: var(--prev-color-primary-light-7) !important;
   border-color: var(--prev-color-primary-light-7) !important;
 }
@@ -767,7 +767,7 @@ $positions: 'top', 'right', 'bottom', 'left';
 }
 .el-dropdown-menu {
   background-color: var(--prev-bg-white);
-  border-color: #EBEEF5;
+  border-color: #ebeef5;
 }
 .el-dropdown-menu__item {
   color: var(--prev-color-text-regular);