Skip to content

Commit

Permalink
Updated code and change log
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Jul 8, 2020
1 parent a74a8d7 commit 6803835
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,20 @@ ChangeLog
- **New(filter-control):** Added `showFilterControlSwitch` option.
- **New(fixed-columns):** Added support for sticky-header.
- **New(pipeline):** Added `pipeline` extension.
- **New(print):** Added support for print footer and merge cells.
- **Update(accent-neutralise):** Fixed comparison with arrays.
- **Update(cookie):** Updated cookie columns to always visible when `switchable` is `false`.
- **Update(cookie):** Fixed cookie value from existing options bug.
- **Update(editable):** Fixed not handle quotation marks bug.
- **Update(editable):** Updated `noeditFormatter` to `noEditFormatter`.
- **Update(export):** Fixed export error with `maintainMetaData` and `clientSidePagination`.
- **Update(filter-control):** Fixed not Working in multiple tables.
- **Update(filter-control):** Fixed not work with `height` option.
- **Update(filter-control):** Fixed not work in multiple tables.
- **Update(filter-control):** Fixed ignore default search text bug.
- **Update(filter-control):** Fixed not work with html formatter.
- **Update(filter-control):** Fixed reset `filterBy` method bug.
- **Update(filter-control):** Fixed issue with a custom filter control container.
- **Update(filter-control):** Fixed filter control disappear after column switched.
- **Update(fixed-columns):** Fixed loading message not hide bug.
- **Update(group-by):** Fixed params error of `checkAll`/`uncheckAll`.
- **Update(multiple-sort):** Fixed not working with multiple level field bug.
Expand Down
2 changes: 1 addition & 1 deletion site/docs/api/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ $('#table').on('event-name.bs.table', function (e, arg1, arg2, ...) {

- **jQuery Event:** `scroll-body.bs.table`

- **Parameter:**: `$tableBody`
- **Parameter:** `$tableBody`

- **Detail:**

Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -2849,7 +2849,7 @@ class BootstrapTable {
options = Object.assign(options, params)
} else if (typeof params === 'string' && params === 'bottom') {
options.value = this.$tableBody[0].scrollHeight
} else if (typeof params === 'string') {
} else if (typeof params === 'string' || typeof params === 'number') {
options.value = params
}

Expand Down

0 comments on commit 6803835

Please sign in to comment.