Merge branch 'develop' into develop

site/docs/api/table-options.md

@@ -1082,7 +1082,7 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
 
 - **Detail:**
 
-  Set `true` to show the columns drop down list.
+  Set `true` to show the columns drop down list. We can set the [`switchable`](/docs/api/column-options/#switchable) column option to `false` to hide the columns item in the drop down list.
 
 - **Default:** `false`
 

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

@@ -361,7 +361,7 @@ const UtilsFilterControl = {
           selectControl = UtilsFilterControl.getControlContainer().find(`.bootstrap-table-filter-control-${UtilsFilterControl.escapeID(column.field)}`)
 
           UtilsFilterControl.addOptionToSelectControl(selectControl, '', column.filterControlPlaceholder, column.filterDefault)
-          filterDataType(filterDataSource, selectControl, column.filterDefault)
+          filterDataType(filterDataSource, selectControl, that.options.filterOrderBy, column.filterDefault)
         } else {
           throw new SyntaxError(
             'Error. You should use any of these allowed filter data methods: var, json, url.' +