Merge branch 'fix-issue-122'

ratiw · Nov 14, 2016 · ad0fea3 · ad0fea3
2 parents dce89e7 + 9ffb25b
commit ad0fea3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/dist/vue-table.js b/dist/vue-table.js
@@ -739,7 +739,7 @@ exports.default = {
                 if (i === false) {
                     //this field is not in the sort array yet
                     this.sortOrder.push({
-                        field: field.name,
+                        field: field.sortField,
                         direction: 'asc'
                     });
                 } else {
@@ -763,15 +763,14 @@ exports.default = {
 
                 this.sortOrder.splice(1); //removes additional columns
 
-                if (this.sortOrder[0].field == field.name) {
+                if (this.sortOrder[0].field == field.sortField) {
                     // change sort direction
                     this.sortOrder[0].direction = this.sortOrder[0].direction == 'asc' ? 'desc' : 'asc';
                 } else {
                     // reset sort direction
                     this.sortOrder[0].direction = 'asc';
                 }
-                this.sortOrder[0].field = field.name;
-                this.sortOrder[0].sortField = field.sortField;
+                this.sortOrder[0].field = field.sortField;
             }
 
             this.currentPage = 1; // reset page index
@@ -789,7 +788,7 @@ exports.default = {
             }
 
             for (var i = 0; i < this.sortOrder.length; i++) {
-                if (this.sortOrder[i].field == field.name) {
+                if (this.sortOrder[i].field == field.sortField) {
                     return i;
                 }
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuetable",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "vue.js table component that will automatically request JSON data from server and display them nicely in HTML table with swap-able/extensible pagination component",
   "main": "dist/vue-table.js",
   "dependencies": {

diff --git a/src/components/Vuetable.vue b/src/components/Vuetable.vue
@@ -534,16 +534,16 @@ export default {
 
             var key = this.multiSortKey.toLowerCase() + 'Key'
 
-            if (this.multiSort && event[key]){ //adding column to multisort
+            if (this.multiSort && event[key]) { //adding column to multisort
                 var i = this.currentSortOrder(field);
 
-                if(i === false){ //this field is not in the sort array yet
+                if (i === false) { //this field is not in the sort array yet
                     this.sortOrder.push({
-                        field: field.name,
+                        field: field.sortField,
                         direction: 'asc'
                     });
                 } else { //this field is in the sort array, now we change its state
-                    if(this.sortOrder[i].direction == 'asc'){
+                    if (this.sortOrder[i].direction == 'asc'){
                         // switch direction
                         this.sortOrder[i].direction = 'desc'
                     } else {
@@ -561,15 +561,14 @@ export default {
 
                 this.sortOrder.splice(1); //removes additional columns
 
-                if (this.sortOrder[0].field == field.name) {
+                if (this.sortOrder[0].field == field.sortField) {
                     // change sort direction
                     this.sortOrder[0].direction = this.sortOrder[0].direction == 'asc' ? 'desc' : 'asc'
                 } else {
                     // reset sort direction
                     this.sortOrder[0].direction = 'asc'
                 }
-                this.sortOrder[0].field = field.name
-                this.sortOrder[0].sortField = field.sortField
+                this.sortOrder[0].field = field.sortField
             }
 
 
@@ -587,8 +586,8 @@ export default {
                 return false
             }
 
-            for(var i = 0; i<this.sortOrder.length; i++){
-                if(this.sortOrder[i].field == field.name){
+            for(var i = 0; i < this.sortOrder.length; i++){
+                if(this.sortOrder[i].field == field.sortField){
                     return i;
                 }
             }