ソースを参照

Fix issue in 'is' function

djhvscf 7 年 前
コミット
6c055ce0fc

+ 4 - 3
src/dom/dom.js

@@ -43,9 +43,10 @@ export const removeClass = (ele, cls) => ele.classList.remove(cls)
 
 export const createOpt = (text, value, isSel) => {
   const isSelected = isSel ? true : false
+  const _value = '' + value
   const opt = isSelected ?
-    createElem('option', ['value', value.trim()], ['selected', 'true']) :
-    createElem('option', ['value', value.trim()])
+    createElem('option', ['value', _value.trim()], ['selected', 'true']) :
+    createElem('option', ['value', _value.trim()])
   opt.appendChild(createText(text.trim()))
   return opt
 }
@@ -72,7 +73,7 @@ export const is = (ele, tag) => {
     return ele.type === 'text' && ele.nodeName.toLowerCase() === 'input'
   }
 
-  ele.nodeName.toLowerCase() === tag
+  return ele.nodeName.toLowerCase() === tag
 }
 
 export const find = (ele, selector) => {

+ 3 - 2
src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -587,12 +587,13 @@ $.BootstrapTable = class extends $.BootstrapTable {
   initHeader () {
     super.initHeader()
 
-    if (!this.options.filterControl) {
+    if (!this.options.filterControl || this.options.cardView) {
       return
     }
 
     UtilsFilterControl.createControls(this, this.$header)
   }
+
   initBody () {
     super.initBody()
 
@@ -786,7 +787,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
   }
 
   EnableControls (enable) {
-    if (this.options.disableControlWhenSearch) {
+    if (this.options.disableControlWhenSearch && this.options.sidePagination === 'server') {
       const header = UtilsFilterControl.getCurrentHeader(this)
       const searchControls = UtilsFilterControl.getCurrentSearchControls(this)