Skip to content

Commit c7aa683

Browse files
committed
Merge pull request wenzhixin#1597 from wenzhixin/develop
Update to 1.9.1
2 parents 66bf0e4 + 96e1c9f commit c7aa683

23 files changed

+346
-150
lines changed

CHANGELOG.md

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

3+
### 1.9.1
4+
5+
- [bug] Removed no records events.
6+
- [bug] Fixed cardView fieldIndex error.
7+
- [bug] Fixed #1130: table-condensed is not working.
8+
- [bug] Fixed #1482: export all server sidePagination bug(export extension).
9+
- [bug] Fixed #1248: IE8 does not support indexOf function.
10+
- [bug] Fixed #1491: (un)check event element argument missing.
11+
- [bug] Fixed Italian translation.
12+
- [bug] Unified naming of MS in type names(export extension).
13+
- [bug] Fixed selectPage method fails(cookie extension).
14+
- [bug] Add ja-JP and ms-MY translation for formatAllRows.
15+
- [enh] UniqueId can also be stored in a row's data property.
16+
- [enh] Use default settings when cookie settings don't exist(cookie extension).
17+
- [enh] Expand `filterBy` to accept and array of values.
18+
- [enh] Added `updateByUniqueId` method.
19+
- [doc] Added `iconSize` docs.
20+
321
### 1.9.0
422

523
- [enh] Update bootstrap-table-cookie.js.

DONATORS.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,18 @@
1515
* Nicolas Pascual - $10
1616
* Hassan Ejaz - $10
1717
* Frank Hines - $100
18+
* Luis Triana Vega - $10
19+
* PROMOTUX DI FRANCESCO MELONI E C. S.N.C. - $15
20+
* Emmanuel Kielichowski - $15
21+
22+
## 支付宝
23+
24+
* 萃华:10.18元
25+
* 小马哥:5元
26+
* 振:20元
27+
* 懒虫:8.8元
28+
* rainc:50元
29+
30+
## 微信
31+
32+
* 笑:50元

docs/_i18n/en/documentation/localizations.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<td>pageFrom, pageTo, totalRows</td>
3232
<td>'Showing %s to %s of %s rows'</td>
3333
</tr>
34+
<tr>
35+
<td>formatDetailPagination</td>
36+
<td>totalRows</td>
37+
<td>'Showing %s rows'</td>
38+
</tr>
3439
<tr>
3540
<td>formatSearch</td>
3641
<td>-</td>

docs/_i18n/en/documentation/methods.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
1515
<th>Name</th>
1616
<th>Parameter</th>
1717
<th>Description</th>
18+
<th data-formatter="methodFormatter"
19+
data-align="center"
20+
data-valign="middle">Example</th>
1821
</tr>
1922
</thead>
2023
<tbody>
@@ -45,9 +48,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
4548
<tr>
4649
<td>getRowByUniqueId</td>
4750
<td>id</td>
48-
<td>
49-
Get data from table, the row that contains the id passed by parameter.
50-
</td>
51+
<td>Get data from table, the row that contains the id passed by parameter.</td>
5152
<td>getRowByUniqueId</td>
5253
</tr>
5354
<tr>
@@ -75,8 +76,8 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
7576
Remove data from table, the params contains two properties: <br>
7677
field: the field name of remove rows. <br>
7778
values: the array of values for rows which should be removed.
78-
<td>remove</td>
7979
</td>
80+
<td>remove</td>
8081
</tr>
8182
<tr>
8283
<td>removeAll</td>
@@ -111,6 +112,15 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
111112
index: the row index to be updated. <br>
112113
row: the new row data.
113114
</td>
115+
</tr>
116+
<tr>
117+
<td>updateByUniqueId</td>
118+
<td>params</td>
119+
<td>
120+
Update the specified row, the param contains following properties: <br>
121+
id: a row id where the id should be the uniqueid field assigned to the table. <br>
122+
row: the new row data.
123+
</td>
114124
</tr>
115125
<tr>
116126
<td>showRow</td>
@@ -258,7 +268,7 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
258268
<tr>
259269
<td>filterBy</td>
260270
<td>params</td>
261-
<td>(Can use only in client-side)Filter data in table, eg. you can filter <code>{age: 10}</code> to show the data only age is equal to 10.</td>
271+
<td>(Can use only in client-side) Filter data in table, e.g. you can filter <code>{age: 10}</code> to show the data only age is equal to 10. You can also filter with an array of values, as in: <code>{age: 10, hairColor: ["blue", "red", "green"]} to find data where age is equal to 10 and hairColor is either blue, red, or green.</td>
262272
</tr>
263273
<tr>
264274
<td>selectPage</td>

docs/_i18n/en/documentation/table-options.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
7676
<td>'glyphicon'</td>
7777
<td>Defines icon set name ('glyphicon' or 'fa' for FontAwesome). By default 'glyphicon' is used. </td>
7878
</tr>
79+
<tr>
80+
<td>iconSize</td>
81+
<td>data-icon-size</td>
82+
<td>String</td>
83+
<td>undefined</td>
84+
<td>Defines icon size: <ul><li>undefined => btn</li><li>xs => btn-xs</li><li>sm => btn-sm</li><li>lg => btn-lg</li></ul>
85+
</tr>
7986
<tr>
8087
<td>icons</td>
8188
<td>data-icons</td>
@@ -209,6 +216,13 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
209216
<td>false</td>
210217
<td>True to show a pagination toolbar on table bottom.</td>
211218
</tr>
219+
<tr>
220+
<td>onlyInfoPagination</td>
221+
<td>data-only-info-pagination</td>
222+
<td>Boolean</td>
223+
<td>false</td>
224+
<td>True to show only the quantity of the data that is showing in the table. It needs the pagination table options is set to true.</td>
225+
</tr>
212226
<tr>
213227
<td>sidePagination</td>
214228
<td>data-side-pagination</td>

docs/_i18n/es/documentation/localizations.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<td>pageFrom, pageTo, totalRows</td>
3232
<td>'Showing %s to %s of %s rows'</td>
3333
</tr>
34+
<tr>
35+
<td>formatDetailPagination</td>
36+
<td>totalRows</td>
37+
<td>'Showing %s rows'</td>
38+
</tr>
3439
<tr>
3540
<td>formatSearch</td>
3641
<td>-</td>

docs/_i18n/es/documentation/table-options.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,13 @@ Las opciones de la tabla están definidas en `jQuery.fn.bootstrapTable.defaults`
181181
<td>false</td>
182182
<td>True para mostrar la paginación al final de la tabla.</td>
183183
</tr>
184+
<tr>
185+
<td>onlyInfoPagination</td>
186+
<td>data-only-info-pagination</td>
187+
<td>Boolean</td>
188+
<td>false</td>
189+
<td>True para mostrar solo la cantidad de los registros que se están mostrando en la tabla. Esta opción necesita que la opción pagination este en true.</td>
190+
</tr>
184191
<tr>
185192
<td>sidePagination</td>
186193
<td>data-side-pagination</td>

docs/_i18n/es/extensions/filter-control.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ Dependence if you use the datepicker option: [bootstrap-datepicker](https://gith
2424
* default: `false`
2525

2626

27+
### filterStrictSearch
28+
29+
* type: Boolean
30+
* description: Set true to enable the strict search in column.
31+
* default: `false`
32+
33+
2734
## Column options
2835

2936
### filterControl

docs/_i18n/zh-cn/documentation/localizations.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<td>pageFrom, pageTo, totalRows</td>
3232
<td>'Showing %s to %s of %s rows'</td>
3333
</tr>
34+
<tr>
35+
<td>formatDetailPagination</td>
36+
<td>totalRows</td>
37+
<td>'Showing %s rows'</td>
38+
</tr>
3439
<tr>
3540
<td>formatSearch</td>
3641
<td>-</td>

docs/_i18n/zh-cn/documentation/table-options.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,13 @@
189189
<td>false</td>
190190
<td>True to show a pagination toolbar on table bottom.</td>
191191
</tr>
192+
<tr>
193+
<td>onlyInfoPagination</td>
194+
<td>data-only-info-pagination</td>
195+
<td>Boolean</td>
196+
<td>false</td>
197+
<td>True to show only the quantity of the data that is showing in the table. It needs the pagination table options is set to true.</td>
198+
</tr>
192199
<tr>
193200
<td>sidePagination</td>
194201
<td>data-side-pagination</td>

0 commit comments

Comments
 (0)