Merge pull request #4137 from wenzhixin/feature/rewrite-extensions

Rewrite accent-neutralise extension to ES6

CHANGELOG.md

@@ -2,9 +2,12 @@ ChangeLog
 ---------
 
 ### 1.13.3
-- **New(js):** Added `pageNumber` parameter to the server side pagination.
+
+- **New(accent-neutralise extension):** Rewrited accent-neutralise extension to ES6.
+- **New(addrbar extension):** Rewrited addrbar extension to ES6 and supported attribute option.
 - **New(group-by-v2 extension):** New `groupByFormatter` option.
 - **New(pipeline extension):** New pipeline extension `bootstrap-table-pipeline`.
+- **Update(cookie extension):** Improved cookie extension code.
 
 ### 1.13.2
 

site/docs/extensions/accent-neutralise.md

@@ -17,6 +17,10 @@ toc: true
 <script src="extensions/accent-neutralise/bootstrap-table-accent-neutralise.js"></script>
 {% endhighlight %}
 
+## Example
+
+[Accent Neutralise](https://examples.bootstrap-table.com/#extensions/accent-neutralise.html)
+
 ## Options
 
 ### searchAccentNeutralise

site/docs/extensions/addrbar.md

@@ -14,6 +14,10 @@ Every time when changing page, sorting and searching operation, it will change t
 <script src="extensions/addrbar/bootstrap-table-addrbar.js"></script>
 {% endhighlight %}
 
+## Example
+
+[Addrbar](https://examples.bootstrap-table.com/#extensions/addrbar.html)
+
 ## Options
 
 ### addrbar

src/bootstrap-table.js

@@ -1481,13 +1481,11 @@
         }
 
         const middleSize = Math.round(this.options.paginationPagesBySide / 2)
-        const pageItem = (i, classes = '') => {
-          return `
-            <li class="page-item${classes}${i === this.options.pageNumber ? ' active' : ''}">
-              <a class="page-link" href="#">${i}</a>
-            </li>
-          `
-        }
+        const pageItem = (i, classes = '') => `
+          <li class="page-item${classes}${i === this.options.pageNumber ? ' active' : ''}">
+            <a class="page-link" href="#">${i}</a>
+          </li>
+        `
 
         if (from > 1) {
           let max = this.options.paginationPagesBySide
@@ -1522,7 +1520,7 @@
         }
 
         if (this.totalPages > to) {
-          var min = this.totalPages - (this.options.paginationPagesBySide - 1)
+          let min = this.totalPages - (this.options.paginationPagesBySide - 1)
           if (to >= min) min = to + 1
           if ((to + 1) === min - 1) {
             i = to + 1
@@ -2022,8 +2020,7 @@
       let params = {
         searchText: this.searchText,
         sortName: this.options.sortName,
-        sortOrder: this.options.sortOrder,
-        pageNumber: this.options.pageNumber
+        sortOrder: this.options.sortOrder
       }
 
       if (this.header.sortNames[index]) {
@@ -2044,8 +2041,7 @@
         params = {
           search: params.searchText,
           sort: params.sortName,
-          order: params.sortOrder,
-          pageNumber: params.pageNumber
+          order: params.sortOrder
         }
 
         if (this.options.pagination && this.options.sidePagination === 'server') {

src/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js

@@ -4,179 +4,167 @@
  * @version: v1.0.0
  */
 
-!function ($) {
+!($ => {
+  const diacriticsMap = {}
+  const defaultAccentsDiacritics = [
+    {base: 'A', letters: '\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F'},
+    {base: 'AA',letters: '\uA732'},
+    {base: 'AE',letters: '\u00C6\u01FC\u01E2'},
+    {base: 'AO',letters: '\uA734'},
+    {base: 'AU',letters: '\uA736'},
+    {base: 'AV',letters: '\uA738\uA73A'},
+    {base: 'AY',letters: '\uA73C'},
+    {base: 'B', letters: '\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181'},
+    {base: 'C', letters: '\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E'},
+    {base: 'D', letters: '\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779'},
+    {base: 'DZ',letters: '\u01F1\u01C4'},
+    {base: 'Dz',letters: '\u01F2\u01C5'},
+    {base: 'E', letters: '\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E'},
+    {base: 'F', letters: '\u0046\u24BB\uFF26\u1E1E\u0191\uA77B'},
+    {base: 'G', letters: '\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E'},
+    {base: 'H', letters: '\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D'},
+    {base: 'I', letters: '\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197'},
+    {base: 'J', letters: '\u004A\u24BF\uFF2A\u0134\u0248'},
+    {base: 'K', letters: '\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2'},
+    {base: 'L', letters: '\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780'},
+    {base: 'LJ',letters: '\u01C7'},
+    {base: 'Lj',letters: '\u01C8'},
+    {base: 'M', letters: '\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C'},
+    {base: 'N', letters: '\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4'},
+    {base: 'NJ',letters: '\u01CA'},
+    {base: 'Nj',letters: '\u01CB'},
+    {base: 'O', letters: '\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C'},
+    {base: 'OI',letters: '\u01A2'},
+    {base: 'OO',letters: '\uA74E'},
+    {base: 'OU',letters: '\u0222'},
+    {base: 'OE',letters: '\u008C\u0152'},
+    {base: 'oe',letters: '\u009C\u0153'},
+    {base: 'P', letters: '\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754'},
+    {base: 'Q', letters: '\u0051\u24C6\uFF31\uA756\uA758\u024A'},
+    {base: 'R', letters: '\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782'},
+    {base: 'S', letters: '\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784'},
+    {base: 'T', letters: '\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786'},
+    {base: 'TZ',letters: '\uA728'},
+    {base: 'U', letters: '\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244'},
+    {base: 'V', letters: '\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245'},
+    {base: 'VY',letters: '\uA760'},
+    {base: 'W', letters: '\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72'},
+    {base: 'X', letters: '\u0058\u24CD\uFF38\u1E8A\u1E8C'},
+    {base: 'Y', letters: '\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE'},
+    {base: 'Z', letters: '\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762'},
+    {base: 'a', letters: '\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250'},
+    {base: 'aa',letters: '\uA733'},
+    {base: 'ae',letters: '\u00E6\u01FD\u01E3'},
+    {base: 'ao',letters: '\uA735'},
+    {base: 'au',letters: '\uA737'},
+    {base: 'av',letters: '\uA739\uA73B'},
+    {base: 'ay',letters: '\uA73D'},
+    {base: 'b', letters: '\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253'},
+    {base: 'c', letters: '\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184'},
+    {base: 'd', letters: '\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A'},
+    {base: 'dz',letters: '\u01F3\u01C6'},
+    {base: 'e', letters: '\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD'},
+    {base: 'f', letters: '\u0066\u24D5\uFF46\u1E1F\u0192\uA77C'},
+    {base: 'g', letters: '\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F'},
+    {base: 'h', letters: '\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265'},
+    {base: 'hv',letters: '\u0195'},
+    {base: 'i', letters: '\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131'},
+    {base: 'j', letters: '\u006A\u24D9\uFF4A\u0135\u01F0\u0249'},
+    {base: 'k', letters: '\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3'},
+    {base: 'l', letters: '\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747'},
+    {base: 'lj',letters: '\u01C9'},
+    {base: 'm', letters: '\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F'},
+    {base: 'n', letters: '\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5'},
+    {base: 'nj',letters: '\u01CC'},
+    {base: 'o', letters: '\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275'},
+    {base: 'oi',letters: '\u01A3'},
+    {base: 'ou',letters: '\u0223'},
+    {base: 'oo',letters: '\uA74F'},
+    {base: 'p',letters: '\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755'},
+    {base: 'q',letters: '\u0071\u24E0\uFF51\u024B\uA757\uA759'},
+    {base: 'r',letters: '\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783'},
+    {base: 's',letters: '\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B'},
+    {base: 't',letters: '\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787'},
+    {base: 'tz',letters: '\uA729'},
+    {base: 'u',letters: '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289'},
+    {base: 'v',letters: '\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C'},
+    {base: 'vy',letters: '\uA761'},
+    {base: 'w',letters: '\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73'},
+    {base: 'x',letters: '\u0078\u24E7\uFF58\u1E8B\u1E8D'},
+    {base: 'y',letters: '\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF'},
+    {base: 'z',letters: '\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763'}
+  ]
 
-    'use strict';
+  const initNeutraliser = () => {
+    for (const diacritic of defaultAccentsDiacritics) {
+      const letters = diacritic.letters
+      for (let i = 0; i < letters.length; i++) {
+        diacriticsMap[letters[i]] = diacritic.base
+      }
+    }
+  }
 
-    var diacriticsMap = {};
-    var defaultAccentsDiacritics = [
-        {'base':'A', 'letters':'\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F'},
-        {'base':'AA','letters':'\uA732'},
-        {'base':'AE','letters':'\u00C6\u01FC\u01E2'},
-        {'base':'AO','letters':'\uA734'},
-        {'base':'AU','letters':'\uA736'},
-        {'base':'AV','letters':'\uA738\uA73A'},
-        {'base':'AY','letters':'\uA73C'},
-        {'base':'B', 'letters':'\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181'},
-        {'base':'C', 'letters':'\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E'},
-        {'base':'D', 'letters':'\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779'},
-        {'base':'DZ','letters':'\u01F1\u01C4'},
-        {'base':'Dz','letters':'\u01F2\u01C5'},
-        {'base':'E', 'letters':'\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E'},
-        {'base':'F', 'letters':'\u0046\u24BB\uFF26\u1E1E\u0191\uA77B'},
-        {'base':'G', 'letters':'\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E'},
-        {'base':'H', 'letters':'\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D'},
-        {'base':'I', 'letters':'\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197'},
-        {'base':'J', 'letters':'\u004A\u24BF\uFF2A\u0134\u0248'},
-        {'base':'K', 'letters':'\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2'},
-        {'base':'L', 'letters':'\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780'},
-        {'base':'LJ','letters':'\u01C7'},
-        {'base':'Lj','letters':'\u01C8'},
-        {'base':'M', 'letters':'\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C'},
-        {'base':'N', 'letters':'\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4'},
-        {'base':'NJ','letters':'\u01CA'},
-        {'base':'Nj','letters':'\u01CB'},
-        {'base':'O', 'letters':'\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C'},
-        {'base':'OI','letters':'\u01A2'},
-        {'base':'OO','letters':'\uA74E'},
-        {'base':'OU','letters':'\u0222'},
-        {'base':'OE','letters':'\u008C\u0152'},
-        {'base':'oe','letters':'\u009C\u0153'},
-        {'base':'P', 'letters':'\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754'},
-        {'base':'Q', 'letters':'\u0051\u24C6\uFF31\uA756\uA758\u024A'},
-        {'base':'R', 'letters':'\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782'},
-        {'base':'S', 'letters':'\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784'},
-        {'base':'T', 'letters':'\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786'},
-        {'base':'TZ','letters':'\uA728'},
-        {'base':'U', 'letters':'\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244'},
-        {'base':'V', 'letters':'\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245'},
-        {'base':'VY','letters':'\uA760'},
-        {'base':'W', 'letters':'\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72'},
-        {'base':'X', 'letters':'\u0058\u24CD\uFF38\u1E8A\u1E8C'},
-        {'base':'Y', 'letters':'\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE'},
-        {'base':'Z', 'letters':'\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762'},
-        {'base':'a', 'letters':'\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250'},
-        {'base':'aa','letters':'\uA733'},
-        {'base':'ae','letters':'\u00E6\u01FD\u01E3'},
-        {'base':'ao','letters':'\uA735'},
-        {'base':'au','letters':'\uA737'},
-        {'base':'av','letters':'\uA739\uA73B'},
-        {'base':'ay','letters':'\uA73D'},
-        {'base':'b', 'letters':'\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253'},
-        {'base':'c', 'letters':'\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184'},
-        {'base':'d', 'letters':'\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A'},
-        {'base':'dz','letters':'\u01F3\u01C6'},
-        {'base':'e', 'letters':'\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD'},
-        {'base':'f', 'letters':'\u0066\u24D5\uFF46\u1E1F\u0192\uA77C'},
-        {'base':'g', 'letters':'\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F'},
-        {'base':'h', 'letters':'\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265'},
-        {'base':'hv','letters':'\u0195'},
-        {'base':'i', 'letters':'\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131'},
-        {'base':'j', 'letters':'\u006A\u24D9\uFF4A\u0135\u01F0\u0249'},
-        {'base':'k', 'letters':'\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3'},
-        {'base':'l', 'letters':'\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747'},
-        {'base':'lj','letters':'\u01C9'},
-        {'base':'m', 'letters':'\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F'},
-        {'base':'n', 'letters':'\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5'},
-        {'base':'nj','letters':'\u01CC'},
-        {'base':'o', 'letters':'\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275'},
-        {'base':'oi','letters':'\u01A3'},
-        {'base':'ou','letters':'\u0223'},
-        {'base':'oo','letters':'\uA74F'},
-        {'base':'p','letters':'\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755'},
-        {'base':'q','letters':'\u0071\u24E0\uFF51\u024B\uA757\uA759'},
-        {'base':'r','letters':'\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783'},
-        {'base':'s','letters':'\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B'},
-        {'base':'t','letters':'\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787'},
-        {'base':'tz','letters':'\uA729'},
-        {'base':'u','letters': '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289'},
-        {'base':'v','letters':'\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C'},
-        {'base':'vy','letters':'\uA761'},
-        {'base':'w','letters':'\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73'},
-        {'base':'x','letters':'\u0078\u24E7\uFF58\u1E8B\u1E8D'},
-        {'base':'y','letters':'\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF'},
-        {'base':'z','letters':'\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763'}
-    ];
+  /* eslint-disable no-control-regex */
+  const removeDiacritics = str => str.replace(/[^\u0000-\u007E]/g, a => diacriticsMap[a] || a)
 
-    var initNeutraliser = function () {
-        for (var i=0; i < defaultAccentsDiacritics.length; i++){
-            var letters = defaultAccentsDiacritics[i].letters;
-            for (var j=0; j < letters.length ; j++){
-                diacriticsMap[letters[j]] = defaultAccentsDiacritics[i].base;
-            }
-        }
-    };
-
-    var removeDiacritics = function (str) {
-        return str.replace(/[^\u0000-\u007E]/g, function(a){
-            return diacriticsMap[a] || a;
-        });
-    };
+  $.extend($.fn.bootstrapTable.defaults, {
+    searchAccentNeutralise: false
+  })
 
-    $.extend($.fn.bootstrapTable.defaults, {
-        searchAccentNeutralise: false
-    });
+  $.BootstrapTable = class extends $.BootstrapTable {
+    init () {
+      if (this.options.searchAccentNeutralise) {
+        initNeutraliser()
+      }
+      super.init()
+    }
 
-    var BootstrapTable = $.fn.bootstrapTable.Constructor,
-        _init = BootstrapTable.prototype.init,
-        _initSearch = BootstrapTable.prototype.initSearch;
+    initSearch () {
+      if (this.options.sidePagination !== 'server') {
+        let s = this.searchText && this.searchText.toLowerCase()
+        const f = $.isEmptyObject(this.filterColumns) ? null : this.filterColumns
 
-    BootstrapTable.prototype.init = function () {
-        if (this.options.searchAccentNeutralise) {
-            initNeutraliser();
-        }
-        _init.apply(this, Array.prototype.slice.apply(arguments));
-    };
+        // Check filter
+        this.data = f ? this.options.data.filter((item, i) => {
+          for (const key in f) {
+            if (item[key] !== f[key]) {
+              return false
+            }
+          }
+          return true
+        }) : this.options.data
 
-    BootstrapTable.prototype.initSearch = function () {
-        var that = this;
+        this.data = s ? this.options.data.filter((item, i) => {
+          for (let [key, value] of Object.entries(item)) {
+            key = $.isNumeric(key) ? parseInt(key, 10) : key
+            const column = this.columns[this.fieldsColumnsIndex[key]]
+            const j = this.header.fields.indexOf(key)
 
-        if (this.options.sidePagination !== 'server') {
-            var s = this.searchText && this.searchText.toLowerCase();
-            var f = $.isEmptyObject(this.filterColumns) ? null : this.filterColumns;
+            if (column && column.searchFormatter) {
+              value = $.fn.bootstrapTable.utils.calculateObjectValue(column,
+                this.header.formatters[j], [value, item, i], value)
+            }
 
-            // Check filter
-            this.data = f ? $.grep(this.options.data, function (item, i) {
-                for (var key in f) {
-                    if (item[key] !== f[key]) {
-                        return false;
-                    }
+            const index = this.header.fields.indexOf(key)
+            if (index !== -1 && this.header.searchables[index] && typeof value === 'string') {
+              if (this.options.searchAccentNeutralise) {
+                value = removeDiacritics(value)
+                s = removeDiacritics(s)
+              }
+              if (this.options.strictSearch) {
+                if ((`${value}`).toLowerCase() === s) {
+                  return true
                 }
-                return true;
-            }) : this.options.data;
-
-            this.data = s ? $.grep(this.data, function (item, i) {
-                for (var key in item) {
-                    key = $.isNumeric(key) ? parseInt(key, 10) : key;
-                    var value = item[key],
-                        column = that.columns[that.fieldsColumnsIndex[key]],
-                        j = $.inArray(key, that.header.fields);
-
-                    if (column && column.searchFormatter) {
-                        value = $.fn.bootstrapTable.utils.calculateObjectValue(column,
-                            that.header.formatters[j], [value, item, i], value);
-                    }
-
-                    var index = $.inArray(key, that.header.fields);
-                    if (index !== -1 && that.header.searchables[index] && typeof value === 'string') {
-                        if (that.options.searchAccentNeutralise) {
-                            value = removeDiacritics(value);
-                            s = removeDiacritics(s);
-                        }
-                        if (that.options.strictSearch) {
-                            if ((value + '').toLowerCase() === s) {
-                                return true;
-                            }
-                        } else {
-                            if ((value + '').toLowerCase().indexOf(s) !== -1) {
-                                return true;
-                            }
-                        }
-                    }
+              } else {
+                if ((`${value}`).toLowerCase().includes(s)) {
+                  return true
                 }
-                return false;
-            }) : this.data;
-        }
-    };
-
-}(jQuery);
+              }
+            }
+          }
+          return false
+        }) : this.data
+      }
+    }
+  }
+})(jQuery)

src/extensions/addrbar/bootstrap-table-addrbar.js

@@ -6,126 +6,108 @@
  * @github: https://github.com/generals-space/bootstrap-table-addrbar
  */
 
-(function ($) {
-    'use strict';
-
-    /*
+($ => {
+  /*
      * function: 获取浏览器地址栏中的指定参数.
      * key: 参数名
      * url: 默认为当前地址栏
      */
-    function _GET(key, url){
-        var url = url ? url : window.location.search;
-        /* 
-        * 注意这里正则表达式的书写方法
-        * (^|&)key匹配: 直接以key开始或以&key开始的字符串
-        * 同理(&|$)表示以&结束或是直接结束的字符串
-        * ...当然, 我并不知道这种用法.
-        */
-        var reg = new RegExp('(^|&)'+ key +'=([^&]*)(&|$)');
-        var result = url.substr(1).match(reg);
+  function _GET (key, url = window.location.search) {
+    /*
+     * 注意这里正则表达式的书写方法
+     * (^|&)key匹配: 直接以key开始或以&key开始的字符串
+     * 同理(&|$)表示以&结束或是直接结束的字符串
+     * ...当然, 我并不知道这种用法.
+     */
+    const reg = new RegExp(`(^|&)${key}=([^&]*)(&|$)`)
+    const result = url.substr(1).match(reg)
 
-        // if(result != null) return unescape(result[2]);
-        if(result != null) return decodeURIComponent(result[2]);
-        return null;
+    if (result) {
+      return decodeURIComponent(result[2])
     }
+    return null
+  }
 
-    /*
+  /*
     * function: 根据给定参数生成url地址
     * var dic = {name: 'genreal', age: 24}
     * var url = 'https://www.baidu.com?age=22';
     * _buildUrl(dic, url);
     * 将得到"https://www.baidu.com?age=24&name=genreal"
     * 哦, 忽略先后顺序吧...
-    * 
-    * 补充: 可以参考浏览器URLSearchParams对象, 更加方便和强大. 
+    *
+    * 补充: 可以参考浏览器URLSearchParams对象, 更加方便和强大.
     * 考虑到兼容性, 暂时不使用这个工具.
     */
 
-    function _buildUrl(dict, url){
-        var url = url ? url : window.location.search;
-
-        for(var key in dict){
-            var val = dict[key];
+  function _buildUrl (dict, url = window.location.search) {
+    for (const [key, val] of Object.entries(dict)) {
+      // 搜索name=general这种形式的字符串(&是分隔符)
+      const pattern = `${key}=([^&]*)`
+      const targetStr = `${key}=${val}`
 
-            // 搜索name=general这种形式的字符串(&是分隔符)
-            var pattern = key + '=([^&]*)';
-            var targetStr = key + '=' + val;
-
-            /*
-            * 如果目标url中包含了key键, 我们需要将它替换成我们自己的val
-            * 不然就直接添加好了.
-            */
-            if(url.match(pattern)){
-                var tmp = new RegExp('(' + key + '=)([^&]*)', 'gi');
-                url = url.replace(tmp, targetStr);
-            }else{
-                var seperator = url.match('[\?]') ? '&' : '?';
-                url = url + seperator + targetStr
-            }
-        }
-        return url;
+      /*
+       * 如果目标url中包含了key键, 我们需要将它替换成我们自己的val
+       * 不然就直接添加好了.
+       */
+      if (url.match(pattern)) {
+        const tmp = new RegExp(`(${key}=)([^&]*)`, 'gi')
+        url = url.replace(tmp, targetStr)
+      } else {
+        const seperator = url.match('[?]') ? '&' : '?'
+        url = url + seperator + targetStr
+      }
     }
+    return url
+  }
 
-    /*
-     * 实例化bootstrapTable对象时, 合并用户选项
-     */
-    var _bootstrapTable = $.fn.bootstrapTable;
-    $.fn.bootstrapTable = function(option){
-        if(!(typeof option === 'object')){
-            // 直接传入arguments不行, 因为它是一个类数组的对象, 
-            // 而bt对参数的处理是面向原生参数列表的.
-            // 目前来看, bt还没有超过2个参数的方法, 暂时先这么用着
-            return _bootstrapTable.call(this, arguments[0], arguments[1]);
-        }
-
-        // 拥有addrbar选项并且其值为true的才会继续执行
-        if(!(option.hasOwnProperty('addrbar') && option.addrbar == true))
-            return _bootstrapTable.call(this, option);
+  $.BootstrapTable = class extends $.BootstrapTable {
+    init () {
+      // 拥有addrbar选项并且其值为true的才会继续执行
+      if (this.options.addrbar) {
         // 标志位, 初始加载后关闭
-        option._addrbarInit = true;
-        var _prefix = option.addrPrefix || '';
-        var _defaults = _bootstrapTable.defaults;
+        this.addrbarInit = true
+        const _prefix = this.options.addrPrefix || ''
 
         // 优先级排序: 用户指定值最优先, 未指定时从地址栏获取, 未获取到时采用默认值
+        this.options.pageSize = this.options.pageSize || (
+          _GET(`${_prefix}limit`) ? parseInt(_GET(`${_prefix}limit`)) : $.BootstrapTable.DEFAULTS.pageSize
+        )
+        this.options.pageNumber = this.options.pageNumber || (
+          _GET(`${_prefix}page`) ? parseInt(_GET(`${_prefix}page`)) : $.BootstrapTable.DEFAULTS.pageNumber
+        )
+        this.options.sortOrder = this.options.sortOrder || (
+          _GET(`${_prefix}order`) ? _GET(`${_prefix}order`) : $.BootstrapTable.DEFAULTS.sortOrder
+        )
+        this.options.sortName = this.options.sortName || (
+          _GET(`${_prefix}sort`) ? _GET(`${_prefix}sort`) : 'id'
+        )
+        this.options.searchText = this.options.searchText || (
+          _GET(`${_prefix}search`) ? _GET(`${_prefix}search`) : $.BootstrapTable.DEFAULTS.searchText
+        )
 
-        option.pageSize = option.pageSize || (
-            _GET(_prefix + 'limit') ? parseInt(_GET(_prefix + 'limit')): _defaults.pageSize
-        );
-        option.pageNumber = option.pageNumber || (
-            _GET(_prefix + 'page') ? parseInt(_GET(_prefix + 'page')): _defaults.pageNumber
-        );
-        option.sortOrder = option.sortOrder || (
-            _GET(_prefix + 'order') ? _GET(_prefix + 'order'): _defaults.sortOrder
-        );
-        option.sortName = option.sortName || (
-            _GET(_prefix + 'sort') ? _GET(_prefix + 'sort'): 'id'
-        );
-        option.searchText = option.searchText || (
-            _GET(_prefix + 'search') ? _GET(_prefix + 'search'): _defaults.searchText
-        );
+        const _onLoadSuccess = this.options.onLoadSuccess
 
-        option._onLoadSuccess = option.onLoadSuccess;
-        option.onLoadSuccess = function(data){
-            // md, 这里的this是option是什么鬼(好像貌似就是option...ok, 当我没说)
-            var opts = this;
-            // 页面初始加载不必改写url
-            if(opts._addrbarInit){
-                opts._addrbarInit = false;
-            }else{
-                var params = {};
-                params[_prefix + 'page']       = opts.pageNumber,
-                params[_prefix + 'limit']      = opts.pageSize,
-                params[_prefix + 'order']      = opts.sortOrder,
-                params[_prefix + 'sort']       = opts.sortName,
-                params[_prefix + 'search']     = opts.searchText
-                // h5提供的修改浏览器地址栏的方法
-                window.history.pushState({}, '', _buildUrl(params));
-            }
+        this.options.onLoadSuccess = data => {
+          if (this.addrbarInit) {
+            this.addrbarInit = false
+          } else {
+            const params = {}
+            params[`${_prefix}page`] = this.options.pageNumber,
+            params[`${_prefix}limit`] = this.options.pageSize,
+            params[`${_prefix}order`] = this.options.sortOrder,
+            params[`${_prefix}sort`] = this.options.sortName,
+            params[`${_prefix}search`] = this.options.searchText
+            // h5提供的修改浏览器地址栏的方法
+            window.history.pushState({}, '', _buildUrl(params))
+          }
 
-            if(option._onLoadSuccess) option._onLoadSuccess.call(this, data);
-        };
-
-        return _bootstrapTable.call(this, option);
-    };
-})(jQuery);
+          if (_onLoadSuccess) {
+            _onLoadSuccess.call(this, data)
+          }
+        }
+      }
+      super.init()
+    }
+  }
+})(jQuery)

src/extensions/addrbar/demo.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">    
-    <link href="https://cdn.bootcss.com/bootstrap-table/1.11.0/bootstrap-table.min.css" rel="stylesheet">
-    <title>bootstrap-table-addrbar Demo</title>
-</head>
-<body>
-    <div class="container">
-        <table id="bt-table"></table>
-    </div>
-
-    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap-table/1.11.0/bootstrap-table.min.js"></script>
-    <script src="./bootstrap-table-addrbar.js"></script>
-    <script type="text/javascript">
-        ;(function(){
-            var tableOpts = {
-                columns: [
-                    {title: 'id', field: 'id'},
-                    {title: '名称', field: 'name'},
-                    {title: '价格', field: 'price'},
-                ],
-                classes: 'table table-hover table-no-bordered',
-                sidePagination: 'server',
-                idField: 'id',
-                uniqueId: 'id',
-                search: true,
-                pagination: true,
-                paginationVAlign: 'bottom',
-                paginationHAlign: 'left',
-                paginationDetailHAlign: 'right',
-                pageList: [20, 50, 100, 500],
-                url: 'https://note.generals.space/napi/bootstrap-table-addrbar',
-                addrbar: true,
-            }
-            $('#bt-table').bootstrapTable(tableOpts);
-        })();
-    </script>
-</body>
-</html>

src/extensions/addrbar/demo2.html

@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">    
-    <link href="https://cdn.bootcss.com/bootstrap-table/1.10.0/bootstrap-table.min.css" rel="stylesheet">
-    <title>bootstrap-table-addrbar Demo</title>
-</head>
-<body>
-    <div class="container">
-        <div class="row">
-            <div class="col-md-6">
-                <table id="bt-table1"></table>                
-            </div>
-            <div class="col-md-6">
-                <table id="bt-table2"></table>                
-            </div>
-        </div>
-    </div>
-
-    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <script src="https://cdn.bootcss.com/bootstrap-table/1.10.0/bootstrap-table.min.js"></script>
-    <script src="./bootstrap-table-addrbar.js"></script>
-    <script type="text/javascript">
-        ;(function(){
-            var tableOpts = {
-                columns: [
-                    {title: 'id', field: 'id'},
-                    {title: '名称', field: 'name'},
-                    {title: '价格', field: 'price'},
-                ],
-                classes: 'table table-hover table-no-bordered',
-                sidePagination: 'server',
-                idField: 'id',
-                uniqueId: 'id',
-                search: true,
-                pagination: true,
-                paginationVAlign: 'bottom',
-                paginationHAlign: 'left',
-                paginationDetailHAlign: 'right',
-                pageList: [20, 50, 100, 500],
-                url: 'https://note.generals.space/napi/bootstrap-table-addrbar',
-                addrbar: true,
-            };
-
-            var tableOpts1 = Object.assign({}, tableOpts, {addrPrefix: 'tbl1'});
-            var tableOpts2 = Object.assign({}, tableOpts, {addrPrefix: 'tbl2'});
-            $('#bt-table1').bootstrapTable(tableOpts1);
-            $('#bt-table2').bootstrapTable(tableOpts2);
-        })();
-    </script>
-</body>
-</html>

src/extensions/cookie/bootstrap-table-cookie.js

@@ -58,15 +58,15 @@
         return
       }
 
-      cookieName = that.options.cookieIdTable + '.' + cookieName
+      cookieName = `${that.options.cookieIdTable}.${cookieName}`
 
       switch (that.options.cookieStorage) {
         case 'cookieStorage':
           document.cookie = [
             cookieName, '=', cookieValue,
-            '; expires=' + UtilsCookie.calculateExpiration(that.options.cookieExpire),
-            that.options.cookiePath ? '; path=' + that.options.cookiePath : '',
-            that.options.cookieDomain ? '; domain=' + that.options.cookieDomain : '',
+            `; expires=${UtilsCookie.calculateExpiration(that.options.cookieExpire)}`,
+            that.options.cookiePath ? `; path=${that.options.cookiePath}` : '',
+            that.options.cookieDomain ? `; domain=${that.options.cookieDomain}` : '',
             that.options.cookieSecure ? '; secure' : ''
           ].join('')
           break
@@ -91,12 +91,12 @@
         return null
       }
 
-      cookieName = tableName + '.' + cookieName
+      cookieName = `${tableName}.${cookieName}`
 
       switch (that.options.cookieStorage) {
         case 'cookieStorage':
-          const value = '; ' + document.cookie
-          const parts = value.split('; ' + cookieName + '=')
+          const value = `; ${document.cookie}`
+          const parts = value.split(`; ${cookieName}=`)
           return parts.length === 2 ? parts.pop().split(';').shift() : null
         case 'localStorage':
           return localStorage.getItem(cookieName)
@@ -107,15 +107,15 @@
       }
     },
     deleteCookie (that, tableName, cookieName) {
-      cookieName = tableName + '.' + cookieName
+      cookieName = `${tableName}.${cookieName}`
 
       switch (that.options.cookieStorage) {
         case 'cookieStorage':
           document.cookie = [
             encodeURIComponent(cookieName), '=',
             '; expires=Thu, 01 Jan 1970 00:00:00 GMT',
-            that.options.cookiePath ? '; path=' + that.options.cookiePath : '',
-            that.options.cookieDomain ? '; domain=' + that.options.cookieDomain : ''
+            that.options.cookiePath ? `; path=${that.options.cookiePath}` : '',
+            that.options.cookieDomain ? `; domain=${that.options.cookieDomain}` : ''
           ].join('')
           break
         case 'localStorage':
@@ -164,7 +164,7 @@
       return d.toGMTString()
     },
     initCookieFilters (bootstrapTable) {
-      setTimeout(function () {
+      setTimeout(() => {
         const parsedCookieFilters = JSON.parse(UtilsCookie.getCookie(bootstrapTable, bootstrapTable.options.cookieIdTable, UtilsCookie.cookieIds.filterControl))
 
         if (!bootstrapTable.options.filterControlValuesLoaded && parsedCookieFilters) {
@@ -173,8 +173,8 @@
           const header = UtilsCookie.getCurrentHeader(bootstrapTable)
           const searchControls = UtilsCookie.getCurrentSearchControls(bootstrapTable)
 
-          const applyCookieFilters = function (element, filteredCookies) {
-            $(filteredCookies).each(function (i, cookie) {
+          const applyCookieFilters = (element, filteredCookies) => {
+            $(filteredCookies).each((i, cookie) => {
               if (cookie.text !== '') {
                 $(element).val(cookie.text)
                 cachedFilters[cookie.field] = cookie.text
@@ -184,9 +184,7 @@
 
           header.find(searchControls).each(function () {
             const field = $(this).closest('[data-field]').data('field')
-            const filteredCookies = $.grep(parsedCookieFilters, function (cookie) {
-              return cookie.field === field
-            })
+            const filteredCookies = parsedCookieFilters.filter(cookie => cookie.field === field)
 
             applyCookieFilters(this, filteredCookies)
           })
@@ -243,7 +241,7 @@
 
       if (this.options.filterControl) {
         const that = this
-        this.$el.on('column-search.bs.table', function (e, field, text) {
+        this.$el.on('column-search.bs.table', (e, field, text) => {
           let isNewField = true
 
           for (let i = 0; i < that.options.filterControls.length; i++) {
@@ -255,8 +253,8 @@
           }
           if (isNewField) {
             that.options.filterControls.push({
-              field: field,
-              text: text
+              field,
+              text
             })
           }
 
@@ -282,37 +280,37 @@
       this.initCookie()
     }
 
-    onSort () {
-      const event = arguments[0]
+    onSort (...args) {
+      const event = args[0]
       super.onSort(event)
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.sortOrder, this.options.sortOrder)
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.sortName, this.options.sortName)
     }
 
-    onPageNumber () {
-      const event = arguments[0]
+    onPageNumber (...args) {
+      const event = args[0]
       super.onPageNumber(event)
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber)
       return false
     }
 
-    onPageListChange () {
-      const event = arguments[0]
+    onPageListChange (...args) {
+      const event = args[0]
       super.onPageListChange(event)
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageList, this.options.pageSize)
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber)
       return false
     }
 
-    onPagePre () {
-      const event = arguments[0]
+    onPagePre (...args) {
+      const event = args[0]
       super.onPagePre(event)
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber)
       return false
     }
 
-    onPageNext () {
-      const event = arguments[0]
+    onPageNext (...args) {
+      const event = args[0]
       super.onPageNext(event)
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber)
       return false
@@ -323,7 +321,7 @@
 
       const visibleColumns = []
 
-      $.each(this.columns, function (i, column) {
+      $.each(this.columns, (i, column) => {
         if (column.visible) {
           visibleColumns.push(column.field)
         }
@@ -337,8 +335,8 @@
       UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, page)
     }
 
-    onSearch () {
-      const target = Array.prototype.slice.apply(arguments)
+    onSearch (...args) {
+      const target = Array.prototype.slice.apply(args)
       super.onSearch(this, target)
 
       if ($(target[0].currentTarget).parent().hasClass('search')) {
@@ -382,7 +380,7 @@
       this.options.searchText = searchTextCookie ? searchTextCookie : ''
 
       if (columnsCookie) {
-        $.each(this.columns, function (i, column) {
+        $.each(this.columns, (i, column) => {
           column.visible = $.inArray(column.field, columnsCookie) !== -1
         })
       }
@@ -391,7 +389,7 @@
     getCookies () {
       const bootstrapTable = this
       const cookies = {}
-      $.each(UtilsCookie.cookieIds, function (key, value) {
+      $.each(UtilsCookie.cookieIds, (key, value) => {
         cookies[key] = UtilsCookie.getCookie(bootstrapTable, bootstrapTable.options.cookieIdTable, value)
         if (key === 'columns') {
           cookies[key] = JSON.parse(cookies[key])

src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -151,7 +151,7 @@
           field = $(this)
             .closest('[data-field]')
             .data('field')
-          result = $.grep(that.options.valuesFilterControl, valueObj => valueObj.field === field)
+          result = that.options.valuesFilterControl.filter(valueObj => valueObj.field === field)
 
           if (result.length > 0) {
             $(this).val(result[0].value)