|
|
@@ -185,7 +185,7 @@ class BootstrapTable {
|
|
|
// if options.data is setting, do not process tbody and tfoot data
|
|
|
if (!this.options.data.length) {
|
|
|
this.options.data = Utils.trToData(this.columns, this.$el.find('>tbody>tr'))
|
|
|
- if (data.length) {
|
|
|
+ if (this.options.data.length) {
|
|
|
this.fromHtml = true
|
|
|
}
|
|
|
}
|
|
|
@@ -766,7 +766,7 @@ class BootstrapTable {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- const s = this.searchText && (this.options.escape
|
|
|
+ const s = this.searchText && (this.fromHtml
|
|
|
? Utils.escapeHTML(this.searchText) : this.searchText).toLowerCase()
|
|
|
const f = Utils.isEmptyObject(this.filterColumns) ? null : this.filterColumns
|
|
|
|