|
|
@@ -2061,7 +2061,13 @@ class BootstrapTable {
|
|
|
if (!params.hasOwnProperty('index') || !params.hasOwnProperty('row')) {
|
|
|
continue
|
|
|
}
|
|
|
+
|
|
|
$.extend(this.options.data[params.index], params.row)
|
|
|
+ if (params.hasOwnProperty('replace') && params.replace) {
|
|
|
+ this.options.data[params.index] = params.row
|
|
|
+ } else {
|
|
|
+ $.extend(this.options.data[params.index], params.row)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
this.initSearch()
|
|
|
@@ -2118,11 +2124,15 @@ class BootstrapTable {
|
|
|
}
|
|
|
|
|
|
const rowId = this.options.data.indexOf(this.getRowByUniqueId(params.id))
|
|
|
-
|
|
|
if (rowId === -1) {
|
|
|
continue
|
|
|
}
|
|
|
- $.extend(this.options.data[rowId], params.row)
|
|
|
+
|
|
|
+ if (params.hasOwnProperty('replace') && params.replace) {
|
|
|
+ this.options.data[rowId] = params.row
|
|
|
+ } else {
|
|
|
+ $.extend(this.options.data[rowId], params.row)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
this.initSearch()
|