finetune sorting

xaksis · Oct 29, 2018 · 4396893 · 4396893
1 parent 198e260
commit 4396893
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/dev/App.vue b/dev/App.vue
@@ -18,6 +18,8 @@
       :columns="columns"
       :rows="rows"
       theme="black-rhino"
+      :fixed-header="true"
+      max-height="200px"
       :pagination-options="{
         mode: 'pages',
         perPage: 3,
@@ -35,7 +37,6 @@
       :search-options="{
         enabled: true,
         skipDiacritics: true,
-        trigger: 'enter',
       }">
     </vue-good-table>
     <h3>Grouped Table</h3>

diff --git a/src/components/Table.vue b/src/components/Table.vue
@@ -439,8 +439,10 @@ export default {
     },
 
     sortOptions: {
-      handler() {
-        this.initializeSort();
+      handler(newValue, oldValue) {
+        if (!isEqual(newValue, oldValue)) {
+          this.initializeSort();
+        }
       },
       deep: true,
     },
@@ -1322,11 +1324,12 @@ export default {
 
       //* initialSortBy can be an array or an object
       if (typeof initialSortBy === 'object') {
+        const ref = this.fixedHeader ? this.$refs['table-header-secondary'] : this.$refs['table-header-primary'];
         if (Array.isArray(initialSortBy)) {
-          this.$refs['table-header-primary'].setInitialSort(initialSortBy);
+          ref.setInitialSort(initialSortBy);
         } else {
           const hasField = Object.prototype.hasOwnProperty.call(initialSortBy, 'field');
-          if (hasField) this.$refs['table-header-primary'].setInitialSort([initialSortBy]);
+          if (hasField) ref.setInitialSort([initialSortBy]);
         }
       }
     },

diff --git a/src/components/VgtTableHeader.vue b/src/components/VgtTableHeader.vue
@@ -152,7 +152,9 @@ export default {
 
     getColumnSort(column) {
       for (let i = 0; i < this.sorts.length; i += 1) {
-        if (this.sorts[i].field === column.field) return this.sorts[i].type;
+        if (this.sorts[i].field === column.field) {
+          return this.sorts[i].type || 'asc';
+        }
       }
       return null;
     },

diff --git a/src/components/utils/sort.js b/src/components/utils/sort.js
@@ -1,7 +1,7 @@
 
 function getNextSort(currentSort) {
   if (currentSort === 'asc') return 'desc';
-  if (currentSort === 'desc') return null;
+  // if (currentSort === 'desc') return null;
   return 'asc';
 }