Skip to content

Commit 4657cbe

Browse files
committed
Merge branch 'develop'
2 parents b5b418c + b5a41a3 commit 4657cbe

239 files changed

Lines changed: 5103 additions & 4775 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.cjs

Lines changed: 0 additions & 114 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/1_Bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
id: affected-versions
88
attributes:
99
label: Bootstraptable version(s) affected
10-
placeholder: 1.23.5
10+
placeholder: 1.24.0
1111
validations:
1212
required: true
1313
- type: textarea

.ncurc.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.stylelintrc

Lines changed: 0 additions & 11 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
ChangeLog
22
---------
33

4+
### 1.24.0
5+
6+
#### Core
7+
8+
- **New:** Added `card-view-field` class to `card-view`.
9+
- **Update:** Fixed `id` not working bug in `rowAttributes`.
10+
- **Update:** Fixed `data` field attr not working bug.
11+
- **Update:** Fixed column is `undefined` bug in `updateFieldGroup` when using `refreshOptions`.
12+
- **Update:** Fixed `post-header` trigger bug after table destroy.
13+
- **Update:** Fixed `strictSearch` not working bug.
14+
- **Update:** Fixed `insertRow` bug after on the last row of the table.
15+
- **Update:** Fixed display error of total rows using load more pagination.
16+
- **Update:** Updated Sass and refined the SCSS file.
17+
- **Update:** Update Eslint and fix some lint errors.
18+
19+
#### Extensions
20+
21+
- **Update(cookie):** Fixed cookie columns display error after adding a column.
22+
- **Update(filter-control):** Fixed select not working bug after an Ajax loaded.
23+
424
### 1.23.5
525

6-
### Core
26+
#### Core
727

828
- **New:** Added `getFooterData` method.
929
- **Update:** Fixed `refresh` invalid url bug when `url` is relative path.
@@ -12,22 +32,22 @@ ChangeLog
1232

1333
### 1.23.4
1434

15-
### Core
35+
#### Core
1636

1737
- **New:** Added support for column options `formatter` and `footerFormatter` methods returning type `jQuery`, `HTMLElement`.
1838
- **New:** Added `sortReset` method to reset the current sort state.
1939
- **New:** Added a presentation role if no matching rows are found.
2040
- **Update:** Fixed `refresh` method doesn't reuse parameters provided as query bug.
2141
- **Update:** Fixed compatibility issues when `colspan` is set as a string.
2242

23-
### Extensions
43+
#### Extensions
2444

2545
- **Update(fixed-columns):** Fixed undefined error in some cases.
2646
- **Update(reorder-columns):** Fixed incorrect column values order with detail view.
2747

2848
### 1.23.2
2949

30-
### Core
50+
#### Core
3151

3252
- **New:** Added `buttonsAttributeTitle` option to customize title attribute.
3353
- **Update:** Updated sort icons using SVG instead of PNG.
@@ -38,12 +58,12 @@ ChangeLog
3858

3959
### 1.23.1
4060

41-
### Core
61+
#### Core
4262

4363
- **Update:** Improved vue component init twice without `setTimeout`.
4464
- **Update:** Updated `af-ZA`, `fr-BE`, `fr-CH`, `fr-FR`, `fr-LU`, and `id-ID` locales.
4565

46-
### Extensions
66+
#### Extensions
4767

4868
- **Update(editable):** Fixed editable display bug of select type.
4969
- **Update(sticky-header):** Fixed issue if sticky-header extension is loaded but not enabled.

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
source 'https://rubygems.org'
22

33
group :development, :test do
4-
gem 'jekyll', '~> 3.8.5'
4+
gem 'jekyll'
55
gem 'jekyll-redirect-from', '~> 0.14.0'
66
gem 'jekyll-sitemap', '~> 1.2.0'
77
gem 'jekyll-toc', '~> 0.9.1'
88
gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
9+
gem "webrick"
10+
gem "kramdown-parser-gfm"
911
end
1012

1113
group :jekyll_plugins do

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ algolia:
2727
index_name: bootstrap-table
2828

2929
# Custom variables
30-
current_version: 1.23.5
30+
current_version: 1.24.0
3131
title: "Bootstrap Table"
3232
description: "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
3333
authors: "Zhixin Wen, and Bootstrap Table contributors"

bootstrap-table.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-table",
3-
"version": "1.23.5",
3+
"version": "1.24.0",
44
"title": "Bootstrap Table",
55
"description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
66
"author": {

cypress.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export default defineConfig({
77
e2e: {
88
// We've imported your old cypress plugins here.
99
// You may want to clean this up later by importing these.
10-
setupNodeEvents(on, config) {
10+
setupNodeEvents (on, config) {
1111
return plugins(on, config)
12-
},
13-
},
12+
}
13+
}
1414
})

0 commit comments

Comments
 (0)