Merge pull request #5949 from wenzhixin/develop

v1.19.1

.github/ISSUE_TEMPLATE/4_Documentation.yaml

@@ -1,13 +1,8 @@
-name: ⛔ Documentation & Examples
-description: Issues with the Documentation and/or the Examples
+name: ⛔ Documentation
+description: Issues with the Documentation
 labels: docs
 
 body:
-  - type: markdown
-    attributes:
-      value: |
-        We have our own dedicated repository for the examples. Please open your
-        documentation-related issue at https://github.com/wenzhixin/bootstrap-table-examples
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📖 Example Issue
+    url: https://github.com/wenzhixin/bootstrap-table-examples
+    about: Please refer to our examples repository for example issues

.npmignore

@@ -1,6 +1,7 @@
 _gh_pages
 .github
 .sass-cache
+cypress
 site
 tools
 _config.yml

CHANGELOG.md

@@ -1,6 +1,20 @@
 ChangeLog
 ---------
 
+### 1.19.1
+
+#### Core
+
+- **Update:** Fixed the CVE security problem.
+- **Update:** Fixed cannot search for special characters when using `searchHighlight`.
+
+#### Extensions
+
+- **Update(auto-refresh):** Updated the `showAutoRefresh` option as default.
+- **Update(export):** Fixed export with only one export type bug.
+- **Update(filter-control):** Fixed filter-control cannot work bug.
+- **Update(filter-control):** Prevent duplicated elements for filter-control.
+
 ### 1.19.0
 
 #### Core

README.md

@@ -49,10 +49,10 @@ To get started, check out:
 
 Use [Releases page](https://github.com/wenzhixin/bootstrap-table/releases) or [the source](https://github.com/wenzhixin/bootstrap-table/archive/master.zip).
 
-### Bower
+### Yarn
 
 ```
-bower install bootstrap-table
+yarn add bootstrap-table
 ```
 
 ### Npm

_config.yml

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

dist/bootstrap-table.css

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <[email protected]>
- * version: 1.19.0
+ * version: 1.19.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 .bootstrap-table .fixed-table-toolbar::after {

dist/bootstrap-table.js

@@ -2717,7 +2717,7 @@
 
   /* eslint-disable no-unused-vars */
 
-  var VERSION = '1.19.0';
+  var VERSION = '1.19.1';
   var bootstrapVersion = 4;
 
   try {
@@ -3660,18 +3660,18 @@
       }
     },
     escapeHTML: function escapeHTML(text) {
-      if (typeof text === 'string') {
-        return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;').replace(/`/g, '&#x60;');
+      if (!text) {
+        return text;
       }
 
-      return text;
+      return text.toString().replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
     },
     unescapeHTML: function unescapeHTML(text) {
-      if (typeof text === 'string') {
-        return text.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#039;/g, '\'').replace(/&#x60;/g, '`');
+      if (!text) {
+        return text;
       }
 
-      return text;
+      return text.toString().replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#39;/g, '\'');
     },
     getRealDataAttr: function getRealDataAttr(dataAttr) {
       for (var _i3 = 0, _Object$entries = Object.entries(dataAttr); _i3 < _Object$entries.length; _i3++) {
@@ -5606,6 +5606,7 @@
               // value can contains a HTML tags
               var textContent = new DOMParser().parseFromString(value.toString(), 'text/html').documentElement.textContent;
               var textReplaced = textContent.replace(regExp, marker);
+              textContent = textContent.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
               defValue = value.replace(new RegExp("(>\\s*)(".concat(textContent, ")(\\s*)"), 'gm'), "$1".concat(textReplaced, "$3"));
             } else {
               // but usually not

dist/extensions/auto-refresh/bootstrap-table-auto-refresh.js

@@ -1116,6 +1116,7 @@
   var Utils = $__default['default'].fn.bootstrapTable.utils;
   $__default['default'].extend($__default['default'].fn.bootstrapTable.defaults, {
     autoRefresh: false,
+    showAutoRefresh: true,
     autoRefreshInterval: 60,
     autoRefreshSilent: true,
     autoRefreshStatus: true,