Merge pull request #6108 from wenzhixin/develop

v1.20.0

.travis.yml

@@ -7,7 +7,7 @@ jobs:
     - stage: test
       language: node_js
       node_js:
-        - 12
+        - 14
       name: "Lint src and check docs"
       cache:
         npm: true
@@ -22,7 +22,7 @@ jobs:
     - stage: test
       language: node_js
       node_js:
-        - 12
+        - 14
       name: "Cypress Test"
       cache:
         npm: true
@@ -40,7 +40,7 @@ jobs:
       rvm:
         - 2.4.1
       before_install:
-        - nvm install 12
+        - nvm install 14
       script: ./deploy.sh
       if: branch = master AND type = push
       cache: bundler

CHANGELOG.md

@@ -1,6 +1,39 @@
 ChangeLog
 ---------
 
+### 1.20.0
+
+#### Core
+
+- **New:** Used `bootstrap5` as the default theme.
+- **New:** Added column-switch-all event of toggle all columns.
+- **New:** Added hi-IN and lb-LU locales.
+- **Update:** Fixed the toolbar cannot refresh search bug.
+- **Update:** Fixed the card view align style bug.
+- **Update:** Fixed custom search filter bug if the value is Object.
+- **Update:** Fixed table border displays bug when setting height.
+- **Update:** Fixed error when the column events are undefined.
+- **Update:** Fixed escape column option doesn't override table option bug.
+- **Update:** Fixed toggle all columns error when column switchable is false.
+- **Update:** Fixed check if the column is visible on card view.
+- **Update:** Fixed hide loading bug when canceling the request.
+- **Update:** Fixed default value of `clickToSelect` column option.
+- **Update:** Fixed `onVirtualScroll` not define default method.
+- **Update:** Updated cs-CZ, ko-KR, nl-NL, nl-BE, bg-BG, fr-LU locales.
+
+##### Extensions
+
+- **New(filter-control):** New version of filter-control with new features.
+- **New(reorder-rows):**: Added `onAllowDrop` and `onDragStop` options.
+- **Update(cookie):** Fixed `sortName` and `sortOrder` bug with cookie.
+- **Update(cookie):** Fixed the toggle column bug with the cookie.
+- **Update(export):** Fixed selector error if only one export type is defined.
+- **Update(filter-control):** Fixed new input class `form-select` of bootstrap 5.
+- **Update(multiple-sort):** Fixed the modal cannot close after sorting.
+- **Update(print):** Fixed missing print button for bootstrap 5.
+- **Update(print):** Fixed `printPageBuilder` option cannot define in html attribute.
+- **Update(toolbar):** Fixed toolbar extension modal bug with bootstrap 5.
+
 ### 1.19.1
 
 #### Core

_config.yml

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

cypress/extensions/filter-control/options.js

@@ -0,0 +1,44 @@
+module.exports = (theme = '') => {
+    const baseUrl = require('../../common/utils')(theme, 'for-tests/extensions/filter-control')
+
+    describe('Test basic filter control', () => {
+      it('Test basic filter control', () => {
+        cy.visit(`${baseUrl}filter-control.html`)
+          .get('.table > thead > tr > th > .fht-cell > .filter-control')
+          .its('length')
+          .should('be.gte', 1)
+      })
+
+      it('Test if filter control visible is set to false, controls shouldnt be visible.', () => {
+        cy.visit(`${baseUrl}filter-control-filterControlVisible.html`)
+          .get('.table > thead > tr > th > .fht-cell > .filter-control')
+          .invoke('attr', 'style')
+          .should('eq', 'display: none;')
+      })
+
+      it('Test if filter control searchOnEnteyKey is set to true. Type "cypress" and validate table should not perform any action.', () => {
+        cy.visit(`${baseUrl}filter-control-searchOnEnterKey.html`)
+          .wait(1000)
+          .get('.table > thead > tr > th > .fht-cell > .filter-control')
+          .find('input')
+          .type('cypress')
+          .get('.table > tbody > tr')
+          .its('length')
+          .should('eq', 21)
+      })
+
+      it('Test if filter control searchOnEnteyKey is set to true. Type "Item 0", hit enter and validate table should perform search action.', () => {
+        cy.visit(`${baseUrl}filter-control-searchOnEnterKey.html`)
+          .wait(1000)
+          .get('.table > thead > tr > th > .fht-cell > .filter-control')
+          .find('input')
+          .type('Item 0')
+          .type('{enter}')
+          .wait(1000)
+          .get('.table > tbody > tr')
+          .its('length')
+          .should('eq', 1)
+      })
+    })
+  }
+

cypress/integration/extensions/filter-control/options/bootstrap3.js

@@ -0,0 +1 @@
+require('../../../../extensions/filter-control/options')('bootstrap3')

cypress/integration/extensions/filter-control/options/bootstrap5.js

@@ -0,0 +1 @@
+require('../../../../extensions/filter-control/options')('bootstrap5')

cypress/integration/extensions/filter-control/options/bulma.js

@@ -0,0 +1 @@
+require('../../../../extensions/filter-control/options')('bulma')

cypress/integration/extensions/filter-control/options/foundation.js

@@ -0,0 +1 @@
+require('../../../../extensions/filter-control/options')('foundation')

cypress/integration/extensions/filter-control/options/index.js

@@ -0,0 +1 @@
+require('../../../../extensions/filter-control/options')()

cypress/integration/extensions/filter-control/options/materialize.js

@@ -0,0 +1 @@
+require('../../../../extensions/filter-control/options')('materialize')

cypress/integration/extensions/filter-control/options/semantic.js

@@ -0,0 +1 @@
+require('../../../../extensions/filter-control/options')('semantic')