Merge pull request #6049 from wenzhixin/fix/6020

Fix/6020

src/constants/index.js

@@ -16,6 +16,7 @@ const CONSTANTS = {
       inputGroup: 'input-group',
       inputPrefix: 'input-',
       input: 'form-control',
+      select: 'form-control',
       paginationDropdown: 'btn-group dropdown',
       dropup: 'dropup',
       dropdownActive: 'active',
@@ -48,6 +49,7 @@ const CONSTANTS = {
       inputGroup: 'btn-group',
       inputPrefix: 'form-control-',
       input: 'form-control',
+      select: 'form-control',
       paginationDropdown: 'btn-group dropdown',
       dropup: 'dropup',
       dropdownActive: 'active',
@@ -80,6 +82,7 @@ const CONSTANTS = {
       inputGroup: 'btn-group',
       inputPrefix: 'form-control-',
       input: 'form-control',
+      select: 'form-select',
       paginationDropdown: 'btn-group dropdown',
       dropup: 'dropup',
       dropdownActive: 'active',

src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -22,22 +22,22 @@ $.extend($.fn.bootstrapTable.defaults, {
     input (that, column, placeholder, value) {
       return Utils.sprintf(
         '<input type="search" class="%s bootstrap-table-filter-control-%s search-input" style="width: 100%;" placeholder="%s" value="%s">',
-        UtilsFilterControl.getFormControlClass(that.options),
+        UtilsFilterControl.getInputClass(that),
         column.field,
         'undefined' === typeof placeholder ? '' : placeholder,
         'undefined' === typeof value ? '' : value
       )
     },
 
-    select ({ options }, column) {
+    select (that, column) {
       return Utils.sprintf(
         '<select class="%s bootstrap-table-filter-control-%s %s" %s style="width: 100%;" dir="%s"></select>',
-        UtilsFilterControl.getFormControlClass(options),
+        UtilsFilterControl.getInputClass(that, true),
         column.field,
-        '', // column.filterControlMultipleSelect ? 'fc-multipleselect' : '',
-        '', // column.filterControlMultipleSelect ? 'multiple="multiple"' : '',
+        '',
+        '',
         UtilsFilterControl.getDirectionOfSelectOptions(
-          options.alignmentSelectControlOptions
+          that.options.alignmentSelectControlOptions
         )
       )
     },
@@ -45,7 +45,7 @@ $.extend($.fn.bootstrapTable.defaults, {
     datepicker (that, column, value) {
       return Utils.sprintf(
         '<input type="date" class="%s date-filter-control bootstrap-table-filter-control-%s" style="width: 100%;" value="%s">',
-        UtilsFilterControl.getFormControlClass(that.options),
+        UtilsFilterControl.getInputClass(that),
         column.field,
         'undefined' === typeof value ? '' : value
       )

src/extensions/filter-control/utils.js

@@ -2,8 +2,10 @@
 const Utils = $.fn.bootstrapTable.utils
 const searchControls = 'select, input:not([type="checkbox"]):not([type="radio"])'
 
-export function getFormControlClass (options) {
-  return options.iconSize ? Utils.sprintf('form-control-%s', options.iconSize) : 'form-control'
+export function getInputClass (that, isSelect = false) {
+  const formControlClass = isSelect ? that.constants.classes.select : that.constants.classes.input
+
+  return that.options.iconSize ? Utils.sprintf('%s-%s', formControlClass, that.options.iconSize) : formControlClass
 }
 
 export function getOptionsFromSelectControl (selectControl) {