Skip to content

Commit 33de0ac

Browse files
wenzhixinwenzhixin
committed
Update version to 1.7.0
1 parent 0be1596 commit 33de0ac

File tree

141 files changed

+4754
-130
lines changed

Some content is hidden

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

141 files changed

+4754
-130
lines changed

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
## ChangeLog
22

3+
### 1.7.0
4+
5+
- [enh] Add `showFooter`, `keyEvents`, `searchText` and `uniqueId` options.
6+
- [enh] Add `cardVisible` column options.
7+
- [enh] Add `checkBy` and `uncheckBy`, `showRow` and `hideRow` and `getRowsHidden` methods.
8+
- [enh] Add nb-NO, ar-SA, es-MX, ka-GE locales.
9+
- [enh] Add cookie, resizable, natural-sorting, toolbar extensions.
10+
- [enh] Add exportOptions to export extension.
11+
- [enh] Fix #263: prepend method support object and array.
12+
- [enh] Card View support checkbox and radio.
13+
- [bug] Fix Card View events bug.
14+
- [enh] Keep all `data-*` attributes when transform from normal table.
15+
- [enh] Load method support fixedScroll param.
16+
- [enh] Added 'all' option in pagination.
17+
- [enh] Added pagination detail align.
18+
319
### 1.6.0
420

521
- [bug] Fix queryParams bug when use `sidePagination='server'`.

‎Gruntfile.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ module.exports = function(grunt) {
5858
src: '**/*', // copy all files and subfolders
5959
dest: 'docs/dist', // destination folder
6060
expand: true // required when using cwd
61+
},
62+
source: {
63+
cwd: 'src', // set working folder / root to copy
64+
src: ['**/*.js', '**/*.css'], // copy all files and subfolders
65+
dest: 'dist', // destination folder
66+
expand: true // required when using cwd
6167
}
6268
}
6369
});

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ languages: ["en", "zh-cn", "es"]
2323
languages_string: ["English", "简体中文", "Español"]
2424

2525
# Custom vars
26-
current_version: 1.6.0
26+
current_version: 1.7.0
2727
repo: https://github.com/wenzhixin/bootstrap-table
2828
website: http://wenzhixin.net.cn
2929
repos: http://repos.wenzhixin.net.cn

‎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.6.0",
3+
"version": "1.7.0",
44
"title": "Bootstrap Table",
55
"description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
66
"author": {

‎bower.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.6.0",
3+
"version": "1.7.0",
44
"homepage": "https://github.com/wenzhixin/bootstrap-table",
55
"authors": [
66
"zhixin <wenzhixin2010@gmail.com>"

‎dist/bootstrap-table.css‎

Lines changed: 264 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
1+
/**
2+
* @author zhixin wen <wenzhixin2010@gmail.com>
3+
* version: 1.7.0
4+
* https://github.com/wenzhixin/bootstrap-table/
5+
*/
6+
7+
.bootstrap-table .table {
8+
margin-bottom: 0 !important;
9+
border-bottom: 1px solid #dddddd;
10+
border-collapse: collapse !important;
11+
border-radius: 1px;
12+
}
13+
14+
.bootstrap-table
15+
.table,
16+
.table>tbody>tr>th,
17+
.table>tfoot>tr>th,
18+
.table>thead>tr>td,
19+
.table>tbody>tr>td,
20+
.table>tfoot>tr>td {
21+
padding: 8px !important;
22+
}
23+
24+
.fixed-table-container {
25+
position: relative;
26+
clear: both;
27+
border: 1px solid #dddddd;
28+
border-radius: 4px;
29+
-webkit-border-radius: 4px;
30+
-moz-border-radius: 4px;
31+
}
32+
33+
.fixed-table-footer,
34+
.fixed-table-header {
35+
height: 37px; /*cellHeight*/
36+
overflow: hidden;
37+
border-radius: 4px 4px 0 0;
38+
-webkit-border-radius: 4px 4px 0 0;
39+
-moz-border-radius: 4px 4px 0 0;
40+
}
41+
42+
.fixed-table-header {
43+
border-bottom: 1px solid #dddddd;
44+
}
45+
46+
.fixed-table-footer {
47+
border-top: 1px solid #dddddd;
48+
}
49+
50+
.fixed-table-body {
51+
overflow-x: auto;
52+
overflow-y: auto;
53+
height: 100%;
54+
}
55+
56+
.fixed-table-container table {
57+
width: 100%;
58+
}
59+
60+
.fixed-table-container thead th {
61+
height: 0;
62+
padding: 0;
63+
margin: 0;
64+
border-left: 1px solid #dddddd;
65+
}
66+
67+
.fixed-table-container thead th:first-child {
68+
border-left: none;
69+
border-top-left-radius: 4px;
70+
-webkit-border-top-left-radius: 4px;
71+
-moz-border-radius-topleft: 4px;
72+
}
73+
74+
.fixed-table-container thead th .th-inner {
75+
padding: 8px;
76+
line-height: 24px;
77+
vertical-align: top;
78+
overflow: hidden;
79+
text-overflow: ellipsis;
80+
white-space: nowrap;
81+
}
82+
83+
.fixed-table-container thead th .sortable {
84+
cursor: pointer;
85+
}
86+
87+
.fixed-table-container tbody td {
88+
border-left: 1px solid #dddddd;
89+
}
90+
91+
.fixed-table-container tbody tr:first-child td {
92+
border-top: none;
93+
}
94+
95+
.fixed-table-container tbody td:first-child {
96+
border-left: none;
97+
}
98+
99+
/* the same color with .active */
100+
.fixed-table-container tbody .selected td {
101+
background-color: #f5f5f5;
102+
}
103+
104+
.fixed-table-container .bs-checkbox {
105+
text-align: center;
106+
}
107+
108+
.fixed-table-container .bs-checkbox .th-inner {
109+
padding: 8px 0;
110+
}
111+
112+
.fixed-table-container input[type="radio"],
113+
.fixed-table-container input[type="checkbox"] {
114+
margin: 0 auto !important;
115+
}
116+
117+
.fixed-table-container .no-records-found {
118+
text-align: center;
119+
}
120+
121+
.fixed-table-pagination .pagination,
122+
.fixed-table-pagination .pagination-detail {
123+
margin-top: 10px;
124+
margin-bottom: 10px;
125+
}
126+
127+
.fixed-table-pagination .pagination a {
128+
padding: 6px 12px;
129+
line-height: 1.428571429;
130+
}
131+
132+
.fixed-table-pagination .pagination-info {
133+
line-height: 34px;
134+
margin-right: 5px;
135+
}
136+
137+
.fixed-table-pagination .btn-group {
138+
position: relative;
139+
display: inline-block;
140+
vertical-align: middle;
141+
}
142+
143+
.fixed-table-pagination .dropup .dropdown-menu {
144+
margin-bottom: 0;
145+
}
146+
147+
.fixed-table-pagination .page-list {
148+
display: inline-block;
149+
}
150+
151+
.fixed-table-toolbar .columns-left {
152+
margin-right: 5px;
153+
}
154+
155+
.fixed-table-toolbar .columns-right {
156+
margin-left: 5px;
157+
}
158+
159+
.fixed-table-toolbar .columns label {
160+
display: block;
161+
padding: 3px 20px;
162+
clear: both;
163+
font-weight: normal;
164+
line-height: 1.428571429;
165+
}
166+
167+
.fixed-table-toolbar .bars,
168+
.fixed-table-toolbar .search,
169+
.fixed-table-toolbar .columns {
170+
position: relative;
171+
margin-top: 10px;
172+
margin-bottom: 10px;
173+
line-height: 34px;
174+
}
175+
176+
.fixed-table-pagination li.disabled a {
177+
pointer-events: none;
178+
cursor: default;
179+
}
180+
181+
.fixed-table-loading {
182+
display: none;
183+
position: absolute;
184+
top: 42px;
185+
right: 0;
186+
bottom: 0;
187+
left: 0;
188+
z-index: 99;
189+
background-color: #fff;
190+
text-align: center;
191+
}
192+
193+
.fixed-table-body .card-view .title {
194+
font-weight: bold;
195+
display: inline-block;
196+
min-width: 30%;
197+
text-align: left !important;
198+
}
199+
200+
/* support bootstrap 2 */
201+
.fixed-table-body thead th .th-inner {
202+
box-sizing: border-box;
203+
}
204+
205+
.table th, .table td {
206+
vertical-align: middle;
207+
box-sizing: border-box;
208+
}
209+
210+
.fixed-table-toolbar .dropdown-menu {
211+
text-align: left;
212+
max-height: 300px;
213+
overflow: auto;
214+
}
215+
216+
.fixed-table-toolbar .btn-group > .btn-group {
217+
display: inline-block;
218+
margin-left: -1px !important;
219+
}
220+
221+
.fixed-table-toolbar .btn-group > .btn-group > .btn {
222+
border-radius: 0;
223+
}
224+
225+
.fixed-table-toolbar .btn-group > .btn-group:first-child > .btn {
226+
border-top-left-radius: 4px;
227+
border-bottom-left-radius: 4px;
228+
}
229+
230+
.fixed-table-toolbar .btn-group > .btn-group:last-child > .btn {
231+
border-top-right-radius: 4px;
232+
border-bottom-right-radius: 4px;
233+
}
234+
235+
.bootstrap-table .table > thead > tr > th {
236+
vertical-align: bottom;
237+
border-bottom: 2px solid #ddd;
238+
}
239+
240+
/* support bootstrap 3 */
241+
.bootstrap-table .table thead > tr > th {
242+
padding: 0;
243+
margin: 0;
244+
}
245+
246+
.pull-right .dropdown-menu {
247+
right: 0;
248+
left: auto;
249+
}
250+
251+
/* calculate scrollbar width */
252+
p.fixed-table-scroll-inner {
253+
width: 100%;
254+
height: 200px;
255+
}
256+
257+
div.fixed-table-scroll-outer {
258+
top: 0;
259+
left: 0;
260+
visibility: hidden;
261+
width: 200px;
262+
height: 150px;
263+
overflow: hidden;
264+
}

0 commit comments

Comments
 (0)