Merge pull request wenzhixin#5471 from wenzhixin/develop

Release 1.18.1

.eslintrc.js

@@ -1,75 +1,100 @@
 module.exports = {
-  'root': true,
-  'env': {
-    'browser': true,
-    'node': true
+  root: true,
+  env: {
+    browser: true,
+    node: true
   },
-  'parserOptions': {
-    'parser': 'babel-eslint',
-    'ecmaVersion': 2017,
-    'sourceType': 'module'
+  parserOptions: {
+    parser: 'babel-eslint',
+    ecmaVersion: 2017,
+    sourceType: 'module'
   },
-  'extends': [
+  extends: [
     'eslint:recommended'
   ],
-  'rules': {
-    'indent': ['error',
+  rules: {
+    'array-bracket-newline': ['error', 'consistent'],
+    'array-bracket-spacing': ['error', 'never'],
+    'arrow-parens': ['error', 'as-needed'],
+    'arrow-spacing': ['error', { after: true, before: true }],
+    'block-spacing': 'error',
+    camelcase: 'off',
+    'comma-dangle': ['error', 'never'],
+    'comma-spacing': ['error', { after: true, before: false }],
+    'default-case': 'error',
+    'dot-location': ['error', 'property'],
+    'eol-last': ['error', 'always'],
+    eqeqeq: 'error',
+    'guard-for-in': 'warn',
+    indent: ['error',
       2,
       {
-        'SwitchCase': 1,
-        'MemberExpression': 1,
-        'ArrayExpression': 1,
-        'FunctionDeclaration': {'parameters': 'first'},
-        'CallExpression': {'arguments': 1},
-        'ImportDeclaration': 'first',
-        'ObjectExpression': 1
-      }
-    ],
+        ArrayExpression: 1,
+        CallExpression: { arguments: 1 },
+        FunctionDeclaration: { parameters: 'first' },
+        ImportDeclaration: 'first',
+        MemberExpression: 1,
+        ObjectExpression: 1,
+        SwitchCase: 1
+      }],
+    'jsdoc/require-jsdoc': 0,
+    'key-spacing': ['error', { afterColon: true, beforeColon: false, mode: 'strict' }],
+    'keyword-spacing': ['error', { after: true, before: true }],
     'linebreak-style': 'off',
-    'quotes': ['error', 'single'],
-    'semi': ['error', 'never'],
-    'semi-style': ['error', 'last'],
-    'semi-spacing': ['error', {'before': false, 'after': true}],
-    'camelcase': 'off',
-    'default-case': 'error',
-    'no-new-func': 'error',
-    'no-void': 'error',
-    'array-bracket-spacing': ['error', 'never'],
-    'no-tabs': 'error',
-    'one-var': ['error', 'never'],
-    'prefer-const': 'error',
-    'no-trailing-spaces': 'error',
-    'operator-assignment': ['error', 'always'],
-    'dot-location': ['error', 'property'],
-    'no-console': ['error', { allow: ['log', 'info', 'warn', 'error'] }],
-    'no-else-return': ['error', {allowElseIf: false}],
+    'lines-between-class-members': ['error', 'always'],
+    'no-alert': 'error',
     'no-case-declarations': 'off',
-    'no-unused-vars': 'off',
+    'no-console': ['warn', { allow: ['warn', 'error', 'trace'] }],
+    'no-duplicate-imports': 'error',
+    'no-else-return': ['error', { allowElseIf: false }],
+    'no-lonely-if': 'error',
     'no-multi-spaces': 'error',
-    'valid-jsdoc': 'warn',
-    'eqeqeq': 'error',
-    'guard-for-in': 'off',
     'no-multi-str': 'error',
-    'no-return-await': 'error',
+    'no-multiple-empty-lines': 'error',
+    'no-new-func': 'error',
+    'no-prototype-builtins': 'off',
     'no-return-assign': 'error',
+    'no-return-await': 'error',
+    'no-sequences': 'error',
+    'no-tabs': 'error',
     'no-throw-literal': 'error',
+    'no-trailing-spaces': 'error',
     'no-undef-init': 'error',
+    'no-unused-vars': 'error',
     'no-use-before-define': 'warn',
-    'key-spacing': ['error', {'beforeColon': false, 'afterColon': true, 'mode': 'strict'}],
-    'keyword-spacing': ['error', {'before': true, 'after': true}],
-    'space-before-blocks': ['error', {'functions': 'always', 'keywords': 'always', 'classes': 'always'}],
-    'spaced-comment': ['error', 'always'],
-    'space-infix-ops': 'error',
-    'arrow-spacing': ['error', { 'before': true, 'after': true }],
     'no-useless-constructor': 'warn',
-    'comma-dangle': ['error', 'never'],
-    'no-param-reassign': 'off',
-    'space-before-function-paren': ["error", "always"],
-    'no-prototype-builtins': 'off'
+    'no-var': 'error',
+    'no-void': 'error',
+    'object-curly-spacing': ['error', 'always'],
+    'object-shorthand': 'error',
+    'one-var': ['error', 'never'],
+    'operator-assignment': ['error', 'always'],
+    'operator-linebreak': ['error', 'after'],
+    'padding-line-between-statements': [
+      'error',
+      { blankLine: 'always', next: '*', prev: ['const', 'let', 'var'] },
+      { blankLine: 'any', next: ['const', 'let', 'var'], prev: ['const', 'let', 'var'] },
+      { blankLine: 'always', next: 'export', prev: '*' }
+    ],
+    'prefer-const': 'error',
+    'prefer-spread': 'error',
+    'prefer-template': 'error',
+    'quote-props': ['error', 'as-needed'],
+    quotes: ['error', 'single'],
+    semi: ['error', 'never'],
+    'semi-spacing': ['error', { after: true, before: false }],
+    'semi-style': ['error', 'last'],
+    'sort-imports': 'off',
+    'space-before-blocks': ['error', { classes: 'always', functions: 'always', keywords: 'always' }],
+    'space-before-function-paren': ['error', 'always'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 'error',
+    'spaced-comment': ['error', 'always'],
+    'switch-colon-spacing': 'error'
   },
-  'globals': {
-    '$': true,
-    'jQuery': true,
-    'adsbygoogle': true
+  globals: {
+    $: true,
+    jQuery: true,
+    adsbygoogle: true
   }
 }

CHANGELOG.md

@@ -1,6 +1,38 @@
 ChangeLog
 ---------
 
+### 1.18.1
+
+#### Core
+
+- **New(locale):** Added short locales based on [ISO Language](http://www.lingoes.net/en/translator/langcode.htm).
+- **Update:** Updated `sk-SK`, `fr-FR`, `de-DE`, and `es-*` locales.
+- **Update:** Fixed `toggleCheck`, `getSelections` and `remove` bug.
+- **Update:** Fixed `buttons` option bug using in data attribute.
+- **Update:** Fixed custom `icons` option bug.
+- **Update:** Fixed `cellStyle` column option not work in card view.
+- **Update:** Fixed getSelection bug when using search.
+- **Update:** Fixed `pageList` option with `all` display bug using `smartDisplay`.
+- **Update:** Fixed search highlight cannot work bug when data field is number.
+- **Update:** Fixed `updateColumnTitle` is undo bug after pagination.
+- **Update:** Fixed `multipleSelectRow` option bug.
+- **Update:** Fixed `icon-size` option bug with pagination.
+
+#### Extensions
+
+- **New(page-jump-to):** Added `min`, `max` and enter support for jump input.
+- **Update(export):** Fixed export cannot work with `materialize` and `foundation` themes.
+- **Update(filter-control):** Updated `filterDatepickerOptions` to support datepicker option.
+- **Update(filter-control):** Fixed select bug when using `&` in the value.
+- **Update(fixed-columns):** Fixed `toggleView` display bug.
+- **Update(group-by):** Fixed not collapse detail view expanded row bug.
+- **Update(group-by):** Fixed display error using `formatter` column option.
+- **Update(group-by):** Fixed `groupByFormatter` option  bug using in data attribute.
+- **Update(multiple-sort):** Fixed cannot work bug using in server `sidePagination`.
+- **Update(page-jump-to):** Fixed page jump input and button bug with `icon-size` option.
+- **Update(print):** Fixed print with `rowspan` or `colspan`.
+- **Update(reorder-columns):** Fixed reorder column when a column is removed or added.
+
 ### 1.18.0
 
 #### Core

_config.yml

@@ -27,7 +27,7 @@ algolia:
   index_name:     bootstrap-table
 
 # Custom variables
-current_version:  1.18.0
+current_version:  1.18.1
 title:            "Bootstrap Table"
 description:      "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
 authors:          "Zhixin Wen, and Bootstrap Table contributors"

bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-table",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "title": "Bootstrap Table",
   "description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
   "author": {