Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Jan 11, 2024
2 parents 0d94c46 + 9b83c0b commit 42b4345
Show file tree
Hide file tree
Showing 232 changed files with 10,221 additions and 8,942 deletions.
57 changes: 57 additions & 0 deletions .cspell-words.txt
@@ -0,0 +1,57 @@
addrbar
akottr
bootcss
borderless
bowser
browserslistrc
bulma
clearfix
colspan
csses
datepicker
dblclick
djhvscf
dragaccept
dragtable
dropup
edubirdie
emptytext
endfor
falign
fullscreen
glyphicon
gmdfsp
halign
hoverable
icomoon
jsdelivr
keyup
labelledby
lsaquo
mouseleave
multipleselect
neutralise
noedit
opencollective
reinit
reinitialization
reorderable
rowspan
rsaquo
scrollbars
searchable
searchables
sprintf
stylelint
tablednd
tableexport
treegrid
uniqueid
unported
unstackable
utecht
valign
vuejs
wenzhixin
xmlhttp
zhixin
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1_Bug_report.yaml
Expand Up @@ -7,7 +7,7 @@ body:
id: affected-versions
attributes:
label: Bootstraptable version(s) affected
placeholder: 1.22.1
placeholder: 1.22.2
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Expand Up @@ -11,7 +11,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: 'yarn'

- uses: actions/checkout@v3
Expand Down
33 changes: 29 additions & 4 deletions CHANGELOG.md
@@ -1,6 +1,31 @@
ChangeLog
---------

### 1.22.2

#### Core

- **New:** Added `footerStyle` column option.
- **Update:** Fixed empty style in header and footer bug.
- **Update:** Fixed the trigger order of `sort` event.
- **Update:** Updated `ar-SA` locale.

#### Extensions

- **New(cookie):** Added cookie support for custom view extension.
- **Update(cookie):** Fixed cookie bug when using `cardView` option.
- **Update(cookie):** Fixed cookie bug with column switchable.
- **Update(editable):** Fixed `export-saved` event error when `exportDataType` is `all`.
- **Update(filter-control):** Fixed `searchAccentNeutralise` option not work.
- **Update(filter-control):** Fixed `filterOrderBy` not work bug for select.
- **Update(group-by):** Fixed group by bug when using `singleSelect` option.
- **Update(reorder-rows):** Fixed reorder bug when using pagination.

#### Documentation

- **Update:** Improved the parameter of `updateCellByUniqueId` method.
- **Update:** Improved the print docs.

### 1.22.1

#### Core
Expand Down Expand Up @@ -41,7 +66,7 @@ ChangeLog
#### Core

- **New:** Added `escapeTitle` table option.
- **New:** Added Aria Label to the search input for screenreaders.
- **New:** Added Aria Label to the search input for screen readers.
- **New:** Persist data attributes for the header(`th`).
- **Update:** Fixed wrong condition for searching with server-side pagination.
- **Update:** Fixed overwriting the `filterOptions` after rebuild.
Expand Down Expand Up @@ -99,8 +124,8 @@ ChangeLog
- **Update:** Fixed detail view with filter click error.
- **Update:** Fixed header does not center correctly for the sortable column.
- **Update:** Fixed `regexpCompare` bug when filtering columns.
- **Update:** Fixed `showToogle` title display error.
- **Update:** Fixed `remove` and `removeByUnqiueId` using object param bug.
- **Update:** Fixed `showToggle` title display error.
- **Update:** Fixed `remove` and `removeByUniqueId` using object param bug.
- **Update:** Fixed `searchHighlight` bug while using `searchAccentNeutralise`.
- **Update:** Fixed missing sort for `customSearch` option.
- **Update:** Removed duplicated escaping of the column value.
Expand Down Expand Up @@ -951,7 +976,7 @@ ChangeLog
- [bug] Fix #936 Sort carets should not be inline-styled by JS.
- [bug] Fix table header width bug when setting table to no bordered.
- [bug] Fix #938, fix #940: Multiple Sort and Hide/Show column.
- [bug] Fix #970: `click`and `dblclick` bug on no-rows table.
- [bug] Fix #970: `click` and `dblclick` bug on no-rows table.
- [bug] Fix #967: unselected column while column sorted display error.
- [enh] Support title feature in cells.
- [enh] Improved cookie, mobile extension.
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Expand Up @@ -27,7 +27,7 @@ algolia:
index_name: bootstrap-table

# Custom variables
current_version: 1.22.1
current_version: 1.22.2
title: "Bootstrap Table"
description: "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
authors: "Zhixin Wen, and Bootstrap Table contributors"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-table.jquery.json
@@ -1,6 +1,6 @@
{
"name": "bootstrap-table",
"version": "1.22.1",
"version": "1.22.2",
"title": "Bootstrap Table",
"description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
"author": {
Expand Down

0 comments on commit 42b4345

Please sign in to comment.