From ff20a00e8f1805b02f96e5bbd178b30a924401d5 Mon Sep 17 00:00:00 2001
From: cagataycivici <cagatay.civici@gmail.com>
Date: Mon, 1 Jul 2019 16:50:55 +0300
Subject: [PATCH] Single column sorting for table

---
 src/components/datatable/DataTable.vue    | 96 +++++++++++++++++++++--
 src/router.js                             |  5 ++
 src/views/datatable/DataTableDemo.vue     | 14 +++-
 src/views/datatable/DataTableSortDemo.vue | 44 +++++++++++
 4 files changed, 150 insertions(+), 9 deletions(-)
 create mode 100644 src/views/datatable/DataTableSortDemo.vue

diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index a509b5ceb..fe0fa0c5a 100644
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -17,8 +17,9 @@
             <table>
                 <thead class="p-datatable-thead">
                     <tr>
-                        <th v-for="(col,i) of columns" :key="col.columnKey||col.field||i" :style="col.headerStyle" :class="col.headerClass">
+                        <th v-for="(col,i) of columns" :key="col.columnKey||col.field||i" :style="col.headerStyle" :class="getColumnHeaderClass(col)" @click="onColumnHeaderClick($event, col)">
                             <span class="p-column-title" v-if="col.header">{{col.header}}</span>
+                            <span v-if="col.sortable" :class="getSortableColumnIcon(col)"></span>
                         </th>
                     </tr>
                 </thead>
@@ -56,6 +57,7 @@
 
 <script>
 import ObjectUtils from '../utils/ObjectUtils';
+import DomHandler from '../utils/DomHandler';
 import Paginator from '../paginator/Paginator';
 
 const ColumnSlot = {
@@ -144,13 +146,27 @@ export default {
         loadingIcon: {
             type: String,
             default: 'pi pi-spinner'
+        },
+        sortField: {
+            type: String,
+            default: null
+        },
+        sortOrder: {
+            type: Number,
+            default: null
+        },
+        defaultSortOrder: {
+            type: Number,
+            default: 1
         }
     },
     data() {
         return {
             columns: [],
             d_first: this.first,
-            d_rows: this.rows
+            d_rows: this.rows,
+            d_sortField: this.sortField,
+            d_sortOrder: this.sortOrder
         };
     },
     watch: {
@@ -159,11 +175,16 @@ export default {
         },
         rows(newValue) {
             this.d_rows = newValue;
+        },
+        sortField(newValue) {
+            this.d_sortField = newValue;
+        },
+        sortOrder(newValue) {
+            this.d_sortOrder = newValue;
         }
     },
     mounted() {
         this.columns = this.$children.filter(child =>  child.$options._propKeys.indexOf('columnKey') !== -1);
-       
     },
     methods: {
         getRowKey(rowData, index) {
@@ -179,6 +200,67 @@ export default {
             this.$emit('update:first', this.d_first);
             this.$emit('update:rows', this.d_rows);
             this.$emit('page', event);
+        },
+        onColumnHeaderClick($event, column) {
+            if (column.sortable) {
+                let targetNode = event.target;
+                let columnField = column.field || column.sortField;
+
+                if(DomHandler.hasClass(targetNode, 'p-sortable-column') || DomHandler.hasClass(targetNode, 'p-column-title') 
+                    || DomHandler.hasClass(targetNode, 'p-sortable-column-icon') || DomHandler.hasClass(targetNode.parentElement, 'p-sortable-column-icon')) {
+                    
+                    this.d_sortOrder = (this.d_sortField === columnField) ? this.d_sortOrder * -1 : this.defaultSortOrder;
+                    this.d_sortField = columnField;
+                    DomHandler.clearSelection();
+                }
+            }
+        },
+        sort(value) {
+            if (value) {
+                let data = [...this.value];
+
+                data.sort((data1, data2) => {
+                    let value1 = ObjectUtils.resolveFieldData(data1, this.d_sortField);
+                    let value2 = ObjectUtils.resolveFieldData(data2, this.d_sortField);
+                    let result = null;
+
+                    if (value1 == null && value2 != null)
+                        result = -1;
+                    else if (value1 != null && value2 == null)
+                        result = 1;
+                    else if (value1 == null && value2 == null)
+                        result = 0;
+                    else if (typeof value1 === 'string' && typeof value2 === 'string')
+                        result = value1.localeCompare(value2, undefined, { numeric: true });
+                    else
+                        result = (value1 < value2) ? -1 : (value1 > value2) ? 1 : 0;
+
+                    return (this.d_sortOrder * result);
+                });
+
+                return data;
+            }
+            else {
+                return null;
+            }
+        },
+        getColumnHeaderClass(column) {
+            const sorted = this.d_sortField === (column.field || column.sortField);
+
+            return [column.headerClass, 
+                    {'p-sortable-column': column.sortable}, 
+                    {'p-highlight': sorted}
+            ];
+        },
+        getSortableColumnIcon(column) {
+            const sorted = this.d_sortField === (column.field || column.sortField);
+   
+            return [
+                'p-sortable-column-icon pi pi-fw',
+                {'pi-sort': !sorted},
+                {'pi-sort-up': sorted && this.d_sortOrder > 0},
+                {'pi-sort-down': sorted && this.d_sortOrder < 0},
+            ];
         }
     },
     computed: {
@@ -186,10 +268,10 @@ export default {
             if (this.value && this.value.length) {
                 let data = this.value;
 
-                /*if (data && data.length && this.sortField) {
-                    data = this.sort();
-                }*/
-            
+                if (data && data.length && this.d_sortField) {
+                    data = this.sort(data);
+                }
+
                 if (this.paginator) {
                     const first = this.lazy ? 0 : this.d_first;
                     return data.slice(first, first + this.d_rows);
diff --git a/src/router.js b/src/router.js
index ca6ca83ee..5126d60ea 100644
--- a/src/router.js
+++ b/src/router.js
@@ -120,6 +120,11 @@ export default new Router({
 			path: '/datatable/paginator',
 			name: 'datatablepaginator',
 			component: () => import('./views/datatable/DataTablePaginatorDemo.vue')
+        },
+        {
+			path: '/datatable/sort',
+			name: 'datatablesort',
+			component: () => import('./views/datatable/DataTableSortDemo.vue')
 		},
 		{
 			path: '/dataview',
diff --git a/src/views/datatable/DataTableDemo.vue b/src/views/datatable/DataTableDemo.vue
index 556482e13..d7b98dcf1 100644
--- a/src/views/datatable/DataTableDemo.vue
+++ b/src/views/datatable/DataTableDemo.vue
@@ -19,9 +19,11 @@
             </DataTable>
 
             <h3>Dynamic Columns</h3>
-			<DataTable :value="cars">
+			<DataTable :value="cars" :columns="columns">
                 <Column v-for="col of columns" :field="col.field" :header="col.header" :key="col.field"></Column>
             </DataTable>
+
+            <button type="button" @click="add">Add</button>
 		</div>
 
         <DataTableDoc />
@@ -37,7 +39,8 @@ export default {
     data() {
         return {
             columns: null,
-            cars: null
+            cars: null,
+            i: 0
         }
     },
     carService: null,
@@ -54,6 +57,13 @@ export default {
     mounted() {
         this.carService.getCarsSmall().then(data => this.cars = data);
     },
+    methods: {
+        add() {
+            this.i++;
+            this.columns.push({field: 'color' + this.i, header: 'Color' + this.i});
+            this.columns = [...this.columns];
+        }
+    },
     components: {
         'DataTableDoc': DataTableDoc,
         'DataTableSubMenu': DataTableSubMenu
diff --git a/src/views/datatable/DataTableSortDemo.vue b/src/views/datatable/DataTableSortDemo.vue
new file mode 100644
index 000000000..f773036bc
--- /dev/null
+++ b/src/views/datatable/DataTableSortDemo.vue
@@ -0,0 +1,44 @@
+<template>
+	<div>
+        <DataTableSubMenu />
+
+		<div class="content-section introduction">
+			<div class="feature-intro">
+				<h1>DataTable - Sort</h1>
+				<p>Enabling sortable property on a column is enough to make a column sortable. Multiple column sorting is enabled using sortMode property and used with metaKey.</p>
+			</div>
+		</div>
+
+		<div class="content-section implementation">
+			<DataTable :value="cars">
+                <Column field="vin" header="Vin" :sortable="true"></Column>
+                <Column field="year" header="Year" :sortable="true"></Column>
+                <Column field="brand" header="Brand" :sortable="true"></Column>
+                <Column field="color" header="Color" :sortable="true"></Column>
+            </DataTable>
+		</div>
+	</div>
+</template>
+
+<script>
+import CarService from '../../service/CarService';
+import DataTableSubMenu from './DataTableSubMenu';
+
+export default {
+    data() {
+        return {
+            cars: null
+        }
+    },
+    carService: null,
+    created() {
+        this.carService = new CarService();
+    },
+    mounted() {
+        this.carService.getCarsSmall().then(data => this.cars = data);
+    },
+    components: {
+        'DataTableSubMenu': DataTableSubMenu
+    }
+}
+</script>
\ No newline at end of file