Merge pull request #4445 from wenzhixin/develop

v1.15.1

.eslintrc.js

@@ -64,7 +64,8 @@ module.exports = {
     'no-useless-constructor': 'warn',
     'comma-dangle': ['error', 'never'],
     'no-param-reassign': 'off',
-    'space-before-function-paren': ["error", "always"]
+    'space-before-function-paren': ["error", "always"],
+    'no-prototype-builtins': 'off'
   },
   'globals': {
     '$': true,

CHANGELOG.md

@@ -1,11 +1,11 @@
 ChangeLog
 ---------
 
-### 1.15.0
+### 1.15.1
 
 #### Core
 
-- **New:** Added virtual scroll to support large data sets.
+- **New:** Added `virtualScroll` and `virtualScrollItemHeight` options to support large data.
 - **New:** Added vue component support.
 - **New:** Added support comparisons search(<, >, <=, =<, >=, =>).
 - **New:** Added `detailViewByClick` table option and `detailFormatter` column option.
@@ -70,9 +70,11 @@ ChangeLog
 - **Update(filter-control):** Fixed loading screen with filter control.
 - **Update(filter-control):** Fixed overwriting the searchText bug.
 - **Update(filter-control):** Fixed filtering does not work json sub-object.
+- **Update(filter-control):** Fixed select filter with formatter.
 - **Update(multiple-sort):** Fixed multiple-sort does not work with data-query-params bug.
 - **Update(page-jump-to):** Fixed `click` bug when paginationVAlign is 'both'.
 - **Update(reorder-columns):** Fixed reorder columns cannot work bug.
+- **Update(reorder-columns):** Fix search and columns bug after reorder columns.
 - **Update(treegrid):** Fixed treegrid cannot work bug.
 
 ### 1.14.2

_config.yml

@@ -27,7 +27,7 @@ algolia:
   index_name:     bootstrap-table
 
 # Custom variables
-current_version:  1.15.0
+current_version:  1.15.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.15.0",
+  "version": "1.15.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": {