Fix #1126 init sort using columns prop

buefy · Dec 19, 2018 · 19ec350 · 19ec350
1 parent a8fe73e
commit 19ec350
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 * Fix taginput when ``allow-new`` is enabled
 * Fix pagination order when simple
+* #1126 Fix init sort using columns table prop
 
 ## 0.7.1
 

diff --git a/src/components/table/Table.vue b/src/components/table/Table.vue
@@ -403,23 +403,8 @@
                 this.newColumns = [...value]
             },
 
-            /**
-             * When newColumns change, call initSort only first time (For example async data).
-             */
-            newColumns(newColumns) {
-                if (newColumns.length && this.firstTimeSort) {
-                    this.initSort()
-                    this.firstTimeSort = false
-                } else if (newColumns.length) {
-                    if (this.currentSortColumn.field) {
-                        for (let i = 0; i < newColumns.length; i++) {
-                            if (newColumns[i].field === this.currentSortColumn.field) {
-                                this.currentSortColumn = newColumns[i]
-                                break
-                            }
-                        }
-                    }
-                }
+            newColumns(value) {
+                this.checkSort()
             },
 
             /**
@@ -636,6 +621,25 @@
                 }
             },
 
+            /**
+             * Call initSort only first time (For example async data).
+             */
+            checkSort() {
+                if (this.newColumns.length && this.firstTimeSort) {
+                    this.initSort()
+                    this.firstTimeSort = false
+                } else if (this.newColumns.length) {
+                    if (this.currentSortColumn.field) {
+                        for (let i = 0; i < this.newColumns.length; i++) {
+                            if (this.newColumns[i].field === this.currentSortColumn.field) {
+                                this.currentSortColumn = this.newColumns[i]
+                                break
+                            }
+                        }
+                    }
+                }
+            },
+
             /**
              * Check if footer slot has custom content.
              */
@@ -711,6 +715,7 @@
 
         mounted() {
             this.checkPredefinedDetailedRows()
+            this.checkSort()
         }
     }
 </script>