Merge pull request #5169 from wenzhixin/develop

1.17.1

Author: wenzhixin

.travis.yml

@@ -9,8 +9,11 @@ jobs:
       node_js:
         - 12
       name: "Lint src and check docs"
+      before_install:
+        - cd tools
+        - git clone --depth=1 https://github.com/wenzhixin/bootstrap-table-examples
       script: npm run pre-commit
-      if: type = pull_request
+      if: branch != master AND type = pull_request
 
     - stage: deploy
       name: "Deploy docs"

CHANGELOG.md

@@ -1,7 +1,7 @@
 ChangeLog
 ---------
 
-### 1.17.0
+### 1.17.1
 
 #### Core
 
@@ -20,6 +20,7 @@ ChangeLog
 - **New:** Added `formatted` parameter for `getData` method to get formatted data.
 - **New:** Added `paginationParts` option instead of `onlyInfoPagination`.
 - **New:** Added `sortReset` option to reset sort on third click.
+- **New:** Added support for auto merge the table body cells.
 - **Update:** Fixed `updateByUniqueId` method cannot update multiple rows bug.
 - **Update:** Fixed `insertRow` not write to source data array bug.
 - **Update:** Fixed events bug with `detailViewIcon` option.
@@ -30,7 +31,9 @@ ChangeLog
 - **Update:** Fixed `font-size` of the loading text.
 - **Update:** Fixed table `border` bug when table is hidden.
 - **Update:** Fixed `showRow` method show all hidden rows bug.
+- **Update:** Fixed columnsSearch non-unique id warning.
 - **Remove:** Removed the `onlyInfoPagination` option.
+- **Remove:** Removed accent neutralise extension and moved it to core.
 
 #### Extensions
 
@@ -49,6 +52,7 @@ ChangeLog
 - **Update(accent-neutralise):** Fixed comparison with arrays.
 - **Update(cookie):** Updated cookie columns to always visible when `switchable` is `false`.
 - **Update(cookie):** Fixed cookie value from existing options bug.
+- **Update(copy-rows):** Fixed copy rows bug with fixed-column.
 - **Update(editable):** Fixed not handle quotation marks bug.
 - **Update(editable):** Updated `noeditFormatter` to `noEditFormatter`.
 - **Update(export):** Fixed export error with `maintainMetaData` and `clientSidePagination`.

_config.yml

@@ -27,7 +27,7 @@ algolia:
   index_name:     bootstrap-table
 
 # Custom variables
-current_version:  1.17.0
+current_version:  1.17.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.17.0",
+  "version": "1.17.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-locale-all.min.js

@@ -2046,6 +2046,10 @@ function _nonIterableSpread() {
 var $ = window.jQuery;
 
 var deepCopy = function deepCopy(arg) {
+  if (arg === undefined) {
+    return arg;
+  }
+
   return $.extend(true, Array.isArray(arg) ? [] : {}, arg);
 };
 

dist/bootstrap-table-vue.esm.js

@@ -2052,6 +2052,10 @@
 	var $ = window.jQuery;
 
 	var deepCopy = function deepCopy(arg) {
+	  if (arg === undefined) {
+	    return arg;
+	  }
+
 	  return $.extend(true, Array.isArray(arg) ? [] : {}, arg);
 	};
 

dist/bootstrap-table-vue.esm.min.js

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