浏览代码

Added onColumnSearch event and fix the issue when the filter control option is on and the pagination is from server side

Dennis Hernández 10 年之前
父节点
当前提交
567cc27043
共有 3 个文件被更改,包括 14 次插入5 次删除
  1. 6 0
      docs/_i18n/en/documentation/events.md
  2. 6 0
      docs/_i18n/es/documentation/events.md
  3. 2 5
      src/bootstrap-table.js

+ 6 - 0
docs/_i18n/en/documentation/events.md

@@ -113,6 +113,12 @@
         <td>Fires when switch the column visible.</td>
     </tr>
     <tr>
+        <td>onColumnSearch</td>
+        <td>column-search.bs.table</td>
+        <td>field, text</td>
+        <td>Fires when search by column.</td>
+    </tr>
+    <tr>
         <td>onPageChange</td>
         <td>page-change.bs.table</td>
         <td>number, size</td>

+ 6 - 0
docs/_i18n/es/documentation/events.md

@@ -104,6 +104,12 @@
         <td>Se ejecuta cuando se cambia la visibilidad de una columna.</td>
     </tr>
     <tr>
+        <td>onColumnSearch</td>
+        <td>column-search.bs.table</td>
+        <td>field, text</td>
+        <td>Se ejecuta cuando se busca por columna.</td>
+    </tr>
+    <tr>
         <td>onPageChange</td>
         <td>page-change.bs.table</td>
         <td>number, size</td>

+ 2 - 5
src/bootstrap-table.js

@@ -885,9 +885,6 @@
         var text = $.trim($(event.currentTarget).val());
         var $field = $(event.currentTarget).parent().parent().data('field')
 
-        // trim search input
-        //$(event.currentTarget).val(text);
-
         if ($.isEmptyObject(this.filterColumnsPartial)) {
             this.filterColumnsPartial = {};
         }
@@ -898,9 +895,9 @@
         }
 
         this.options.pageNumber = 1;
-        this.initSearch();
+        this.onSearch(event);
         this.updatePagination();
-        /* this.trigger('column-search', $field, text); */
+        this.trigger('column-search', $field, text);
     };
 
     BootstrapTable.prototype.initSearch = function () {