Merge pull request ElemeFE#50 from coolzjy/master

custom sorting method
laoxubuer · Jun 27, 2016 · 8aebcc2 · 8aebcc2
2 parents 240e39f + 59c0954
commit 8aebcc2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "babel-plugin-transform-runtime": "^6.1.18",
     "babel-preset-es2015": "^6.1.18",
     "babel-preset-stage-1": "^6.5.0",
-    "babel-runtime": "^5.8.x",
+    "babel-runtime": "^6.0.0",
     "chai": "^3.3.0",
     "chai-as-promised": "^5.1.0",
     "css-loader": "^0.21.0",

diff --git a/src/data/grid-body.vue b/src/data/grid-body.vue
@@ -78,7 +78,7 @@
 
     filters: {
       orderBy(array, sortKey, reverse) {
-        if (!sortKey) {
+        if (!sortKey || this.$parent.sortingCustom) {
           return array;
         }
         var order = (reverse && reverse < 0) ? -1 : 1;
@@ -164,4 +164,4 @@
       }
     }
   };
-</script>
+</script>
diff --git a/src/data/grid-column.vue b/src/data/grid-column.vue
@@ -14,7 +14,6 @@
       minWidth: {},
       htmlTemplate: {},
       sortable: {
-        type: Boolean,
         default: undefined
       },
       resizable: {
@@ -223,4 +222,4 @@
       }
     }
   };
-</script>
+</script>
diff --git a/src/data/grid.vue b/src/data/grid.vue
@@ -525,6 +525,11 @@
           this.sortingProperty = null;
         }
         this.sortingDirection = column.direction === 'descending' ? -1 : 1;
+
+        this.sortingCustom = column.sortable === 'custom';
+
+        // custom sorting event
+        this.sortingCustom && this.$emit('sort', column);
       },
 
       reRender() {
@@ -751,8 +756,9 @@
         fixedBodyWidth: '',
         sortingColumn: null,
         sortingProperty: null,
-        sortingDirection: 1
+        sortingDirection: 1,
+        sortingCustom: false
       };
     }
   };
-</script>
+</script>