8000 fix(filter-control extension): fix column name is already an existing… · Robothan/bootstrap-table@c842300 · GitHub
[go: up one dir, main page]
Skip to content

Commit c842300

Browse files
wenzhixinwenzhixin
committed
fix(filter-control extension): fix column name is already an existing class name bug
2 parents 445883e + 9e7532b commit c842300

File tree

2 files changed

+35
-18
lines changed

2 files changed

+35
-18
lines changed

‎CHANGELOG.md

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,47 @@
11
ChangeLog
22
---------
33

4-
### 1.10.2
4+
### 1.11.0
55

66
- fix(js): fix cardVisible doesn't work bug
7-
- feat(js): add support for transfer from rowspan / colspan table
87
- fix(js): int field break toggleColumn
8+
- fix(js): table elements inside bootstrap table bug
9+
- fix(js): move formatter after cellStyle
10+
- fix(js): the footer is hidden in card view
11+
- fix(js): fix sorting rows not working bug
12+
- fix(js): return field from visible cells
13+
- fix(js): onSearch event is not fire when we press the arrows keys
14+
- fix(js): fix fromHtml error
15+
- fix(js): fix event cannot work when some columns are hideen
16+
- fix(js): remove page size and number when pagination is false
17+
- fix(js): remove getFieldIndexFromColumnIndex because it cause events bug
18+
- fix(js): fix getSelections method bug
19+
- fix(js): update records to rows
920
- fix(locale): update it-IT locale
1021
- fix(locale): add formatAllRows in template locale
11-
- fix(js): table elements inside bootstrap table bug
12-
- docs(filter-control extension): add documentation for filterData
22+
- fix(filter-control extension): add check for null values on existsOptionInSelectControl
23+
- fix(filter-control extension): fix show-clear button bug
24+
- feat(js): add support for transfer from rowspan / colspan table
1325
- feat(js): add data variable to post-body event
1426
- feat(js): add `buttonsClass` option
15-
- fix(js): move formatter after cellStyle
1627
- feat(js): add `getVisibleColumns` method
1728
- feat(js): add resize event to fit the header
18-
- fix(js): the footer is hidden in card view
19-
- fix(filter-control extension): add check for null values on existsOptionInSelectControl
20-
- fix(js): fix sorting rows not working bug
21-
- refactor(filter-control extension): refactor the filterDataType method
22-
- feat(angular extension): add constant in order to get it from angular scope
23-
- fix(js): return field from visible cells
2429
- feat(js): add `onRefresh` event
25-
- fix(js): onSearch event is not fire when we press the arrows keys
2630
- feat(js): add field parameter in the click and dblClick row events
31+
- feat(js): add div.card-views surrounds all the card view divs
32+
- feat(js): add `field` parameter to cellStyle
33+
- feat(js): add `sortStable` option
34+
- feat(js): add `footerStyle` option
35+
- feat(extension): add select2 filter and i18n enhance extensions
36+
- feat(extension): add multi-column-toggle extension
2737
- feat(filter-control extension): add select list data to be passed in as JSON string and filter control starts with search
38+
- feat(angular extension): add constant in order to get it from angular scope
39+
- feat(export extension): add `formatExport` locale
40+
- feat(multiple-sort extension): add `formatSortOrders` option
41+
- refactor(filter-control extension): refactor the filterDataType method
42+
- refactor(filter-control extension): adding all unique values to select control and performance improvements
43+
- refactor(extension): refactor filter cookies extension to avoid dbcalls
44+
- docs(filter-control extension): add documentation for filterData
2845

2946

3047
### 1.10.1

‎src/extensions/filter-control/bootstrap-table-filter-control.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182

183183
$.each(that.header.fields, function (j, field) {
184184
var column = that.columns[$.fn.bootstrapTable.utils.getFieldIndex(that.columns, field)],
185-
selectControl = $('.' + escapeID(column.field));
185+
selectControl = $('.bootstrap-table-filter-control-' + escapeID(column.field));
186186

187187
if (isColumnSearchableViaSelect(column) && isFilterDataNotGiven(column) && hasSelectControlElement(selectControl)) {
188188
if (selectControl.get(selectControl.length - 1).options.length === 0) {
@@ -252,7 +252,7 @@
252252

253253
if (filterDataType !== null) {
254254
filterDataSource = column.filterData.substring(column.filterData.indexOf(':') + 1, column.filterData.length);
255-
selectControl = $('.' + escapeID(column.field));
255+
selectControl = $('.bootstrap-table-filter-control-' + escapeID(column.field));
256256

257257
addOptionToSelectControl(selectControl, '', '');
258258
filterDataType(filterDataSource, selectControl);
@@ -330,7 +330,7 @@
330330
if (header.find('.date-filter-control').length > 0) {
331331
$.each(that.columns, function (i, column) {
332332
if (column.filterControl !== undefined && column.filterControl.toLowerCase() === 'datepicker') {
333-
header.find('.date-filter-control.' + column.field).datepicker(column.filterDatepickerOptions)
333+
header.find('.date-filter-control.bootstrap-table-filter-control-' + column.field).datepicker(column.filterDatepickerOptions)
334334
.on('changeDate', function (e) {
335335
//Fired the keyup event
336336
$(e.currentTarget).keyup();
@@ -407,14 +407,14 @@
407407
alignmentSelectControlOptions: undefined,
408408
filterTemplate: {
409409
input: function (that, field, isVisible) {
410-
return sprintf('<input type="text" class="form-control %s" style="width: 100%; visibility: %s">', field, isVisible);
410+
return sprintf('<input type="text" class="form-control bootstrap-table-filter-control-%s" style="width: 100%; visibility: %s">', field, isVisible);
411411
},
412412
select: function (that, field, isVisible) {
413-
return sprintf('<select class="%s form-control" style="width: 100%; visibility: %s" dir="%s"></select>',
413+
return sprintf('<select class="form-control bootstrap-table-filter-control-%s" style="width: 100%; visibility: %s" dir="%s"></select>',
414414
field, isVisible, getDirectionOfSelectOptions(that.options.alignmentSelectControlOptions));
415415
},
416416
datepicker: function (that, field, isVisible) {
417-
return sprintf('<input type="text" class="date-filter-control %s form-control" style="width: 100%; visibility: %s">', field, isVisible);
417+
return sprintf('<input type="text" class="form-control date-filter-control bootstrap-table-filter-control-%s" style="width: 100%; visibility: %s">', field, isVisible);
418418
}
419419
},
420420
//internal variables

0 commit comments

Comments
 (0)
0