fix: heading and data style when sortable (#826)

carbon-design-system · Feb 12, 2020 · 59bd310 · 59bd310
1 parent 2d20ff7
commit 59bd310
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/core/src/components/cv-data-table/cv-data-table.vue b/packages/core/src/components/cv-data-table/cv-data-table.vue
@@ -277,9 +277,11 @@ export default {
   computed: {
     isSortable() {
       return col => {
-        if (col && this.columns.some(column => column.sortable)) {
-          return col.sortable;
+        if (col) {
+          // specific column or all sortable
+          return (col && col.sortable) || this.sortable;
         } else {
+          // is any column sortable
           return this.sortable || this.columns.some(column => column.sortable);
         }
       };
@@ -441,6 +443,7 @@ export default {
     watchColumns() {
       this.dataColumns = this.isSortable
         ? this.columns.map(item => ({
+            ...item,
             label: item.label ? item.label : item,
             order: 'none',
             sortable: item.sortable,