perf: 统一pagesize

2020-12-17 11:07:57 +08:00
parent 8bbf031c73
commit 889a1a7bbb
26 changed files with 96 additions and 93 deletions
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -164,13 +164,13 @@ export default {
        errorContent:'',
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        loadingTable:false,// 表格数据加载loading
        screenPageObj:{
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        storedTableData:[],
--- a/nezha-fronted/src/components/charts/chart-table.vue
+++ b/nezha-fronted/src/components/charts/chart-table.vue
@@ -159,12 +159,12 @@
        pageSizes: [20, 50, 100],
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        screenPageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        storedTableDataOld: [],//原始信息
--- a/nezha-fronted/src/components/charts/chartPreview.vue
+++ b/nezha-fronted/src/components/charts/chartPreview.vue
@@ -149,7 +149,7 @@
            </template>
          </el-table-column>
        </el-table>
-        <Pagination :pageObj="screenPageObj" :post-page-sizes="pageSizes" @pageNo='screenPageNo' @pageSize='screenPageSize' ref="Pagination" ></Pagination>
+        <Pagination :pageObj="screenPageObj" @pageNo='screenPageNo' @pageSize='screenPageSize' ref="Pagination" ></Pagination>
        </div>
      </template>

@@ -207,10 +207,9 @@
        errorContent:'',
        serieSingleStat:'',
        seriesItemScreen:[],
-        pageSizes:[50,100,200],
        screenPageObj:{
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        unit:{},
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -283,7 +283,7 @@
        chartUnit: 5,
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -122,7 +122,7 @@
        loading: false,
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },

--- a/nezha-fronted/src/components/common/js/constants.js
+++ b/nezha-fronted/src/components/common/js/constants.js
@@ -1,5 +1,7 @@
 import i18n from "../i18n";

+export const defaultPageSize = 20;
+
 export const staticMenus = {
  settings: {
    title: i18n.t('overall.config'),
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -47,6 +47,7 @@ const cn = {
    createAsset: "新增资产",
    createAlertRule: "新增告警规则",
    createAccount: "新增用户名",
+    createRole: '新增角色',
    createPrometheusServer: "新增prometheus服务",
    createDatacenter: "新增数据中心",
    active: "活跃",
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -54,6 +54,7 @@ const en = {
    createAsset:'Create asset',
    createAlertRule:'Create alert rule',
    createAccount:'Create account',
+    createRole: 'Create role',
    createPrometheusServer:'Create prometheus server',
    createDatacenter:'Create Data Center',
    createCabinet:'Create cabinet',
--- a/nezha-fronted/src/components/common/pagination.vue
+++ b/nezha-fronted/src/components/common/pagination.vue
@@ -7,7 +7,7 @@
        @next-click="next"
        @current-change="current"
        :current-page="pageObj.pageNo"
-        :page-sizes="pageSizes?pageSizes:[50, 100, 200]"
+        :page-sizes="pageSizes?pageSizes:[20, 50, 100]"
        :page-size="Number(pageObj.pageSize)"
        layout="total, prev, pager, next, slot"
        :total="this.pageObj.total"
@@ -33,8 +33,12 @@ export default {
  },
  data() {
    return {
-      pageSize: 50,
+      pageSize: this.$CONSTANTS.defaultPageSize,
      pageSizes:[
+        {
+          label:'20'+this.$t('pageSize'),
+          value:20
+        },
        {
          label:'50'+this.$t('pageSize'),
          value:50
@@ -43,10 +47,6 @@ export default {
          label:'100'+this.$t('pageSize'),
          value:100
        },
-        {
-          label:'200'+this.$t('pageSize'),
-          value:200
-        },
      ]
    };
  },
--- a/nezha-fronted/src/components/common/project/popData/alertTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue
@@ -219,7 +219,7 @@
      return{
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/common/project/popData/assetTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue
@@ -154,7 +154,7 @@
      return{
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        mainTableHeight:'100%',
--- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue
+++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue
@@ -139,7 +139,7 @@
      return{
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        mainTableHeight:'100%',
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -225,7 +225,7 @@
        },
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/alert/list.vue
+++ b/nezha-fronted/src/components/page/alert/list.vue
@@ -160,7 +160,7 @@
        tableId: 'alertListTable', //需要分页的table的id，用于记录每页数量
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -175,7 +175,7 @@
      </el-table>
      <button :class="{'to-top-is-hover': tools.tableHover}" :style="{top: tools.toTopBtnTop}" @click="toTop(scrollbarWrap)" class="to-top" v-show="tools.showTopBtn && bottomBox.mainResizeShow"><i class="nz-icon nz-icon-top"></i></button>
      <div class="pagination-bottom" v-show="!bottomBox.showSubList">
-        <Pagination :pageObj="pageObj" :post-page-sizes="[20, 50, 100]" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
+        <Pagination :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
      </div>
    </div>
    <transition name="el-zoom-in-bottom">
@@ -383,7 +383,7 @@

        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0,
          idcId: '',
          idcIds: ''
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -199,7 +199,7 @@
        },
        pageObj: { //分页对象
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [ //原table列
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -201,7 +201,7 @@
        },
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -146,7 +146,7 @@
        },
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -153,7 +153,7 @@
        },
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/config/operationlog.vue
+++ b/nezha-fronted/src/components/page/config/operationlog.vue
@@ -101,7 +101,7 @@
        },
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -145,7 +145,7 @@
        },
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/config/roles.vue
+++ b/nezha-fronted/src/components/page/config/roles.vue
@@ -14,7 +14,7 @@
          <div class="top-tool-search">
            <search-input :searchMsg="searchMsg" @search="search" ref="searchInput" ></search-input>
          </div>
-          <button :title="$t('overall.createRoles')" @click="add" class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" v-has="'role_toAdd'"
+          <button :title="$t('overall.createRole')" @click="add" class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" v-has="'role_toAdd'"
                  id="roles-add" type="button">
            <i class="nz-icon-create-square nz-icon"></i>
          </button>
@@ -141,7 +141,7 @@
        },
        pageObj: { //分页对象
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [ //原table列
--- a/nezha-fronted/src/components/page/config/terminallog.vue
+++ b/nezha-fronted/src/components/page/config/terminallog.vue
@@ -120,7 +120,7 @@
        },
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableTitle: [
--- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
@@ -249,7 +249,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
        tableVisible: true,
        pageObj: {
          pageNo: 1,
-          pageSize: 50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },
        tableData: [],
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -341,7 +341,7 @@
        endpointTableData:[],
        endpointPageObj:{
          pageNo: 1,
-          pageSize:50,
+          pageSize: this.$CONSTANTS.defaultPageSize,
          total: 0
        },