Browse Source

Fixing more bugs

djhvscf 4 years ago
parent
commit
45c7e1aea3

+ 1 - 1
src/bootstrap-table.js

@@ -932,7 +932,7 @@ class BootstrapTable {
       }
       }
     }
     }
 
 
-    if (!firedByInitSearchText) {
+    if (!firedByInitSearchText && !this.options.cookie) {
       this.options.pageNumber = 1
       this.options.pageNumber = 1
     }
     }
     this.initSearch()
     this.initSearch()

+ 1 - 1
src/extensions/filter-control/bootstrap-table-filter-control.scss

@@ -5,7 +5,7 @@
  */
  */
 
 
 .no-filter-control {
 .no-filter-control {
-  height: 34px;
+  height: 40px;
 }
 }
 
 
 .filter-control {
 .filter-control {

+ 1 - 0
src/extensions/filter-control/utils.js

@@ -62,6 +62,7 @@ export function addOptionToSelectControl (selectControl, _value, text, selected)
   let value = (_value === undefined || _value === null) ? '' : _value.toString().trim()
   let value = (_value === undefined || _value === null) ? '' : _value.toString().trim()
 
 
   value = value.replace(/(<([^>]+)>)/ig, '').replace(/&[#A-Za-z0-9]+;/gi, '').trim()
   value = value.replace(/(<([^>]+)>)/ig, '').replace(/&[#A-Za-z0-9]+;/gi, '').trim()
+  text = text.replace(/(<([^>]+)>)/ig, '').replace(/&[#A-Za-z0-9]+;/gi, '').trim()
 
 
   if (existOptionInSelectControl(selectControl, value)) {
   if (existOptionInSelectControl(selectControl, value)) {
     return
     return