diff --git a/src/extensions/select2-filter/bootstrap-table-select2-filter.js b/src/extensions/select2-filter/bootstrap-table-select2-filter.js index 21856264de..6bfa915c21 100644 --- a/src/extensions/select2-filter/bootstrap-table-select2-filter.js +++ b/src/extensions/select2-filter/bootstrap-table-select2-filter.js @@ -256,10 +256,10 @@ if (that.options.sidePagination === 'client') { this.data = $.grep(this.data, function (row, idx) { for (var field in filterValues) { - var column = that.columns[$.fn.bootstrapTable.utils.getFieldIndex(that.columns, field)], + var column = that.columns[that.fieldsColumnsIndex[field]], filterValue = filterValues[field].toLowerCase(), rowValue = row[field]; - + rowValue = $.fn.bootstrapTable.utils.calculateObjectValue( that.header, that.header.formatters[$.inArray(field, that.header.fields)], [rowValue, row, idx], rowValue); diff --git a/src/extensions/select2-filter/data.json b/src/extensions/select2-filter/data.json deleted file mode 100644 index 15e5d48967..0000000000 --- a/src/extensions/select2-filter/data.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "id": 0, - "name": "Item 0", - "price": "$0", - "amount": 3 - }, - { - "id": 1, - "name": "Item 1", - "price": "$1", - "amount": 4 - }, - { - "id": 2, - "name": "Item 2", - "price": "$2", - "amount": 8 - }, - { - "id": 3, - "name": "Item 3", - "price": "$3", - "amount": 2 - }, - { - "id": 4, - "name": "Item 4", - "price": "$4", - "amount": 90 - }, - { - "id": 5, - "name": "Item 5", - "price": "$5", - "amount": 2 - }, - { - "id": 6, - "name": "Item 6", - "price": "$6", - "amount": 3 - }, - { - "id": 7, - "name": "Item 7", - "price": "$7", - "amount": 7 - }, - { - "id": 8, - "name": "Item 8", - "price": "$8", - "amount": 39 - }, - { - "id": 9, - "name": "Item 9", - "price": "$9", - "amount": 78 - }, - { - "id": 10, - "name": "Item 10", - "price": "$10", - "amount": 30 - }, - { - "id": 11, - "name": "Item 11", - "price": "$11", - "amount": 32 - }, - { - "id": 12, - "name": "Item 12", - "price": "$12", - "amount": 12 - }, - { - "id": 13, - "name": "Item 13", - "price": "$13", - "amount": 76 - }, - { - "id": 14, - "name": "Item 14", - "price": "$14", - "amount": 10 - }, - { - "id": 15, - "name": "Item 15", - "price": "$15", - "amount": 9 - }, - { - "id": 16, - "name": "Item 16", - "price": "$16", - "amount": 8 - }, - { - "id": 17, - "name": "Item 17", - "price": "$17", - "amount": 1 - }, - { - "id": 18, - "name": "Item 18", - "price": "$18", - "amount": 99 - }, - { - "id": 19, - "name": "Item 19", - "price": "$19", - "amount": 100 - }, - { - "id": 20, - "name": "Item 20", - "price": "$20", - "amount": 109 - } -] \ No newline at end of file diff --git a/src/extensions/select2-filter/select2-filter.html b/src/extensions/select2-filter/select2-filter.html deleted file mode 100644 index ea4ddff568..0000000000 --- a/src/extensions/select2-filter/select2-filter.html +++ /dev/null @@ -1,119 +0,0 @@ - - -
-