#19 - release 1.1.13

jbaysolutions · Aug 24, 2018 · 3e74032 · 3e74032
1 parent 95ab0cc
commit 3e74032
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.1.13 (August 24, 2018)
+
+* #19 - Disable filter for specific columns
+
 ### 1.1.12
 
 * Enhancement - exposed methods.

diff --git a/README.md b/README.md
@@ -79,6 +79,7 @@ Or add the js script to your html (download from [releases](https://github.com/j
                     title:"name",
                     visible: true,
                     editable: true,
+                    filterable: false
                 },
                 {
                     title:"age",
@@ -267,6 +268,7 @@ The `columns` array takes object of type:
     cellstyle: String           // Optional: styles to be applied to the Cells of this column
     renderfunction: Function    // Optional: Function that receives as input the column name and entry, and returns an HTML String for drawing cell
     sortable: Boolean           // Optional, by default it is true!  Used to set particular columns as not sortable, in case the table is sortable itself. - From 1.1.12
+    filterable: Boolean         // Optional, by default it is true!  Used to exclude columns from the filtering process. - From 1.1.13
 }
 ```
 
@@ -533,6 +535,10 @@ If you have a feature request, please add it as an issue or make a pull request.
 
 ## Changelog
 
+### 1.1.13
+
+* #19 - Disable filter for specific columns
+
 ### 1.1.12
 
 * Enhancement - exposed methods.

diff --git a/dist/vue-bootstrap-table.js b/dist/vue-bootstrap-table.js
diff --git a/dist/vue-bootstrap-table.js.map b/dist/vue-bootstrap-table.js.map
diff --git a/dist/vue-bootstrap-table.min.js b/dist/vue-bootstrap-table.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue2-bootstrap-table2",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "description": "A sortable and searchable vue table, as a Vue component, using bootstrap styling.",
   "keywords": [
     "table",

diff --git a/src/VueBootstrapTable.vue b/src/VueBootstrapTable.vue
@@ -530,20 +530,20 @@
                    });
                 } else {
                     var result = this.rawValues.filter(item => {
-                                var good = false;
                                 for (var col in self.displayColsVisible) {
-                                    if (self.filterCaseSensitive) {
-                                        if (lodashincludes(item[self.displayColsVisible[col].name] + "", self.filterKey + "")) {
-                                            good = true;
-                                        }
-                                    } else {
-                                        if (lodashincludes((item[self.displayColsVisible[col].name] + "").toLowerCase(), (self.filterKey + "").toLowerCase())) {
-                                            good = true;
+                                    if (self.displayColsVisible[col].filterable) {
+                                        if (self.filterCaseSensitive) {
+                                            if (lodashincludes(item[self.displayColsVisible[col].name] + "", self.filterKey + "")) {
+                                                return true;
+                                            }
+                                        } else {
+                                            if (lodashincludes((item[self.displayColsVisible[col].name] + "").toLowerCase(), (self.filterKey + "").toLowerCase())) {
+                                                return true;
+                                            }
                                         }
                                     }
-
                                 }
-                                return good;
+                                return false;
                     });
 
                     var tColsDir = [];
@@ -698,6 +698,10 @@
                     obj.sortable = column.sortable;
                 else
                     obj.sortable = true;
+                if ( typeof column.filterable !== "undefined")
+                    obj.filterable = column.filterable;
+                else
+                    obj.filterable = true;
 
                 return obj;
             },

diff --git a/src/app.js b/src/app.js
@@ -25,7 +25,7 @@ new Vue({
         handleRowFunction: handleRow,
         columnToSortBy:"name",
         ajax: {
-            enabled: true,
+            enabled: false,
             url: "http://172.16.213.1:9430/data/test",
             method: "POST",
             delegate: true
@@ -37,7 +37,8 @@ new Vue({
             },
             {
               title: 'Name',
-              name: 'name'
+              name: 'name' ,
+              filterable: false
             },
             {
               title: 'Description',