Merge branch 'develop' into feature/multiselect-filtercontrol

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,32 @@
-**Bug fix?**
-<!-- yes/no -->
+**🤔Type of Request**
+- [ ] **Bug fix**
+- [ ] **New feature**
+- [ ] **Improvement**
+- [ ] **Documentation**
+- [ ] **Other**
 
-**New Feature?**
-<!-- yes/no -->
-
-**Resolve an issue?**
+**🔗Resolves an issue?**
 <!-- Please prefix each issue number with  "Fix #"  (e.g. Fix #200)  -->
 
-**Example(s)?**
+**📝Changelog**
+
+<!-- The type of the change. --->
+- [ ] **Core**
+- [ ] **Extensions**
+
+<!-- Describe changes from the user side. -->
+
+**💡Example(s)?**
 <!-- Please use our online Editor (https://live.bootstrap-table.com/) to create example(s) (Before and after your changes).
      On our Wiki (https://github.com/wenzhixin/bootstrap-table/wiki/Online-Editor-Explanation) you can read how to use the editor.-->
-     
+
+**☑️Self Check before Merge**
+
+⚠️ Please check all items below before review. ⚠️
+
+- [ ] Doc is updated/provided or not needed
+- [ ] Demo is updated/provided or not needed
+- [ ] Changelog is provided or not needed
 
 <!-- Love bootstrap-table? Please consider supporting our collective:
-👉  https://opencollective.com/bootstrap-table/donate -->
+👉  https://opencollective.com/bootstrap-table/donate -->

site/docs/extensions/export.md

@@ -30,7 +30,7 @@ This is an important link to check out as some file types may require extra step
 
 - **Detail:**
 
-   set `true` to show export button.
+   Set `true` to show export button.
 
 - **Default:** `false`
 
@@ -42,7 +42,7 @@ This is an important link to check out as some file types may require extra step
 
 - **Detail:**
 
-   export data type, support: 'basic', 'all', 'selected'.
+   Export data type, support: `'basic'`, `'all'`, `'selected'`.
 
 - **Default:** `basic`
 
@@ -54,7 +54,7 @@ This is an important link to check out as some file types may require extra step
 
 - **Detail:**
 
-   set `true` to export the table footer.
+   Set `true` to export the table footer.
 
 - **Default:** `false`
 
@@ -66,7 +66,7 @@ This is an important link to check out as some file types may require extra step
 
 - **Detail:**
 
-   export [options](https://github.com/hhurz/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
+   Export [options](https://github.com/hhurz/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
 
    `exportOptions.fileName` can be a string or a function, for example:
 
@@ -86,7 +86,7 @@ This is an important link to check out as some file types may require extra step
 
 - **Detail:**
 
-   export types, support types: 'json', 'xml', 'png', 'csv', 'txt', 'sql', 'doc', 'excel', 'xlsx', 'pdf'.
+   Export types, support types: `['json', 'xml', 'png', 'csv', 'txt', 'sql', 'doc', 'excel', 'xlsx', 'pdf']`.
 
 - **Default:** `['json', 'xml', 'csv', 'txt', 'sql', 'excel']`
 

site/docs/extensions/pipeline.md

@@ -1,6 +1,10 @@
-# Bootstrap Table Pipelining
-
-Use Plugin: [bootstrap-table-pipeline]
+---
+layout: docs
+title: Table Pipeline
+description: Table Pipeline extension of Bootstrap Table.
+group: extensions
+toc: true
+---
 
 This plugin enables client side data caching for server side requests which will
 eliminate the need to issue a new request every page change. This will allow
@@ -42,22 +46,24 @@ There are two new events:
 - cached-data-hit.bs.table: issued when cached data is used on a page change
 - cached-data-reset.bs.table: issued when the cached data is invalidated and new server side request is issued
 
-## Features
+## Usage
 
-* Created with Bootstrap 4
+{% highlight html %}
+<script src="extensions/pipeline/bootstrap-table-pipeline.js"></script>
+{% endhighlight %}
 
 ## Usage
 
-```
-<script src="extensions/pipeline/bootstrap-table-pipeline.js"></script>
-```
+## Example
+
+[Pipeline](https://examples.bootstrap-table.com/#extensions/pipeline.html)
 
 ## Options
 
 ## pipelineSize
 
-* type: Integer
-* description: Size of each cache window. Must be greater than 0
+* type: Number
+* description: Size of each cache window. Must be greater than 0.
 * default: `1000`
 
 ### usePipeline

src/bootstrap-table.js

@@ -1375,6 +1375,9 @@ class BootstrapTable {
   }
 
   onPagePre (event) {
+    if ($(event.target).hasClass('disabled')) {
+      return
+    }
     event.preventDefault()
     if ((this.options.pageNumber - 1) === 0) {
       this.options.pageNumber = this.options.totalPages
@@ -1386,6 +1389,9 @@ class BootstrapTable {
   }
 
   onPageNext (event) {
+    if ($(event.target).hasClass('disabled')) {
+      return
+    }
     event.preventDefault()
     if ((this.options.pageNumber + 1) > this.options.totalPages) {
       this.options.pageNumber = 1
@@ -1567,7 +1573,7 @@ class BootstrapTable {
           this.options.undefinedText : value
       }
 
-      if (column.searchable && this.searchText && this.options.searchHighlight) {
+      if (column.searchable && this.searchText && this.options.searchHighlight && !(column.checkbox || column.radio)) {
         let defValue = ''
         const regExp = new RegExp(`(${ this.searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') })`, 'gim')
         const marker = '<mark>$1</mark>'

src/themes/_theme.scss

@@ -209,6 +209,7 @@
         position: absolute;
         bottom: 0;
         width: 100%;
+        max-width: 100%;
         z-index: 1000;
         transition: visibility 0s, opacity 0.15s ease-in-out;
         opacity: 0;