Merge pull request #6148 from wenzhixin/develop

v1.20.1

Author: wenzhixin

.github/ISSUE_TEMPLATE/1_Bug_report.yaml

@@ -7,7 +7,7 @@ body:
     id: affected-versions
     attributes:
       label: Bootstraptable version(s) affected
-      placeholder: 1.18.0
+      placeholder: 1.20.1
     validations:
       required: true
   - type: textarea
@@ -38,4 +38,4 @@ body:
     attributes:
         value: |
           Love bootstrap-table? Please consider supporting our collective:
-          👉  https://opencollective.com/bootstrap-table/donate
+          👉  https://opencollective.com/bootstrap-table/donate

.github/workflows/deploy.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Build theme with node
         run: |
           cd ${{ github.workspace }}/site/_themes
-          yarn
+          yarn install --frozen-lockfile
           yarn build
           mv dist/js ../assets/js/themes
           cd ../assets/js/themes

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Test
+
+on:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - uses: actions/checkout@v3
+        with:
+          repository: 'wenzhixin/bootstrap-table-examples'
+          path: './tools/bootstrap-table-examples'
+
+      - name: Lint src and check docs
+        run: |
+          yarn install --frozen-lockfile
+          yarn pre-commit
+
+      - name: Cypress Test
+        run: |
+          mv ./tools/bootstrap-table-examples cypress/html
+          yarn css:build:src
+          yarn test

.gitignore

@@ -21,8 +21,8 @@ check.js
 # Common IDE files
 nbproject
 .~lock.*
+Gemfile.lock
 package-lock.json
-*.lock
 .buildpath
 .idea
 .project

.travis.yml

@@ -1,6 +1,21 @@
 ChangeLog
 ---------
 
+### 1.20.1
+
+### Core
+
+- **Update:** Fixed toggle column bug with complex headers.
+- **Update:** Fixed icons option cannot work bug when it's a string.
+- **Update:** Updated TypeScript definitions.
+
+##### Extensions
+
+- **Update(cookie):** Fixed cookie extension error with multiple-sort.
+- **Update(export):** Fixed the `exportOptions` option cannot support the data attribute.
+- **Update(reorder-rows):**  Fixed reorder-rows cannot work because of missing default functions.
+
+
 ### 1.20.0
 
 #### Core

CHANGELOG.md

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

_config.yml

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-table",
-  "version": "1.20.0",
+  "version": "1.20.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": {

bootstrap-table.jquery.json

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

cypress/integration/extensions/filter-control/options/bootstrap5.js renamed to cypress/integration/extensions/filter-control/options/bootstrap4.js

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