浏览代码

refs #4094: improve pagination option

zhixin 7 年之前
父节点
当前提交
c65f61fcc1

+ 1 - 1
.eslintrc.js

@@ -63,7 +63,7 @@ module.exports = {
     'arrow-spacing': ['error', { 'before': true, 'after': true }],
     'arrow-spacing': ['error', { 'before': true, 'after': true }],
     'no-useless-constructor': 'warn',
     'no-useless-constructor': 'warn',
     'comma-dangle': ['error', 'never'],
     'comma-dangle': ['error', 'never'],
-    'no-param-reassign': 'warn',
+    'no-param-reassign': 'off',
     "space-before-function-paren": ["error", "always"]
     "space-before-function-paren": ["error", "always"]
   },
   },
   'globals': {
   'globals': {

+ 3 - 3
docs/_i18n/en/documentation/table-options.md

@@ -534,15 +534,15 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
       <td>paginationSuccessivelySize</td>
       <td>paginationSuccessivelySize</td>
       <td>data-pagination-successively-size</td>
       <td>data-pagination-successively-size</td>
       <td>Number</td>
       <td>Number</td>
-      <td>3</td>
-      <td>Maximum successively number of pages in a row.</td>
+      <td>5</td>
+      <td>Maximum successive number of pages in a row.</td>
   </tr>
   </tr>
   <tr>
   <tr>
       <td>paginationPagesBySide</td>
       <td>paginationPagesBySide</td>
       <td>data-pagination-pages-by-side</td>
       <td>data-pagination-pages-by-side</td>
       <td>Number</td>
       <td>Number</td>
       <td>1</td>
       <td>1</td>
-      <td>Number of pages on each side (right, left) of the current page.</td>
+      <td>The number of pages on each side (right, left) of the current page.</td>
   </tr>
   </tr>
    <tr>
    <tr>
       <td>paginationUseIntermediate</td>
       <td>paginationUseIntermediate</td>

+ 1 - 1
docs/_i18n/es/documentation/table-options.md

@@ -453,7 +453,7 @@ Las opciones de la tabla están definidas en `jQuery.fn.bootstrapTable.defaults`
       <td>paginationSuccessivelySize</td>
       <td>paginationSuccessivelySize</td>
       <td>data-pagination-successively-size</td>
       <td>data-pagination-successively-size</td>
       <td>Number</td>
       <td>Number</td>
-      <td>3</td>
+      <td>5</td>
       <td>Número máximo sucesivo de páginas en una fila.</td>
       <td>Número máximo sucesivo de páginas en una fila.</td>
   </tr>
   </tr>
   <tr>
   <tr>

+ 4 - 4
docs/_i18n/zh-cn/documentation/table-options.md

@@ -480,22 +480,22 @@
       <td>paginationSuccessivelySize</td>
       <td>paginationSuccessivelySize</td>
       <td>data-pagination-successively-size</td>
       <td>data-pagination-successively-size</td>
       <td>Number</td>
       <td>Number</td>
-      <td>3</td>
-      <td>Maximum successively number of pages in a row.</td>
+      <td>5</td>
+      <td>连续的最大连续页数。</td>
   </tr>
   </tr>
   <tr>
   <tr>
       <td>paginationPagesBySide</td>
       <td>paginationPagesBySide</td>
       <td>data-pagination-pages-by-side</td>
       <td>data-pagination-pages-by-side</td>
       <td>Number</td>
       <td>Number</td>
       <td>1</td>
       <td>1</td>
-      <td>Number of pages on each side (right, left) of the current page.</td>
+      <td>当前页面每侧(右侧,左侧)的页数。</td>
   </tr>
   </tr>
    <tr>
    <tr>
       <td>paginationUseIntermediate</td>
       <td>paginationUseIntermediate</td>
       <td>data-pagination-use-intermediate</td>
       <td>data-pagination-use-intermediate</td>
       <td>Boolean</td>
       <td>Boolean</td>
       <td>false</td>
       <td>false</td>
-      <td>Calculate and show intermediate pages for quick access</td>
+      <td>计算并显示中间页面以便快速访问。</td>
   </tr>
   </tr>
   <tr>
   <tr>
     <td>clickToSelect</td>
     <td>clickToSelect</td>

+ 1 - 1
package.json

@@ -19,7 +19,7 @@
   },
   },
   "scripts": {
   "scripts": {
     "postinstall": "opencollective postinstall || exit 0",
     "postinstall": "opencollective postinstall || exit 0",
-    "lint": "eslint src/bootstrap-table.js src/locale src/extensions/export src/extensions/editable src/extensions/toolbar src/extension/filter-control",
+    "lint": "eslint src/bootstrap-table.js src/locale src/extensions/export src/extensions/editable src/extensions/toolbar src/extension/filter-control src/extensions/cookie",
     "js:build:min": "NODE_ENV=production babel src -d dist -q && find dist -name '*.js' | sed -e 'p;s/.js/.min.js/' | xargs -n2 mv",
     "js:build:min": "NODE_ENV=production babel src -d dist -q && find dist -name '*.js' | sed -e 'p;s/.js/.min.js/' | xargs -n2 mv",
     "js:build:base": "babel src -d dist -q",
     "js:build:base": "babel src -d dist -q",
     "js:build:concat": "babel src/locale -o dist/bootstrap-table-locale-all.js && NODE_ENV=production babel src/locale -o dist/bootstrap-table-locale-all.min.js",
     "js:build:concat": "babel src/locale -o dist/bootstrap-table-locale-all.js && NODE_ENV=production babel src/locale -o dist/bootstrap-table-locale-all.min.js",

+ 2 - 2
src/bootstrap-table.js

@@ -307,7 +307,7 @@
     paginationDetailHAlign: 'left', // right, left
     paginationDetailHAlign: 'left', // right, left
     paginationPreText: '&lsaquo;',
     paginationPreText: '&lsaquo;',
     paginationNextText: '&rsaquo;',
     paginationNextText: '&rsaquo;',
-    paginationSuccessivelySize: 3, // Maximum successively number of pages in a row
+    paginationSuccessivelySize: 5, // Maximum successively number of pages in a row
     paginationPagesBySide: 1, // Number of pages on each side (right, left) of the current page.
     paginationPagesBySide: 1, // Number of pages on each side (right, left) of the current page.
     paginationUseIntermediate: false, // Calculate intermediate pages for quick access
     paginationUseIntermediate: false, // Calculate intermediate pages for quick access
     search: false,
     search: false,
@@ -1451,7 +1451,7 @@
           to = from + (this.options.paginationPagesBySide * 2)
           to = from + (this.options.paginationPagesBySide * 2)
         }
         }
 
 
-        if (this.options.pageNumber < (this.options.paginationSuccessivelySize - 2)) {
+        if (this.options.pageNumber < (this.options.paginationSuccessivelySize - 1)) {
           to = this.options.paginationSuccessivelySize
           to = this.options.paginationSuccessivelySize
         }
         }