diff --git a/app/client/src/widgets/TableWidget/derived.js b/app/client/src/widgets/TableWidget/derived.js index 8a2c0e2ba2..99b5f090b5 100644 --- a/app/client/src/widgets/TableWidget/derived.js +++ b/app/client/src/widgets/TableWidget/derived.js @@ -240,7 +240,7 @@ export default { const column = columns.find((column) => column.id === sortedColumn); const columnType = column && column.columnType ? column.columnType : "text"; - + const inputFormat = column.inputFormat; sortedTableData = derivedTableData.sort((a, b) => { if ( _.isPlainObject(a) && @@ -260,10 +260,14 @@ export default { case "date": try { return sortOrder - ? moment(a[sortedColumn]).isAfter(b[sortedColumn]) + ? moment(a[sortedColumn], inputFormat).isAfter( + moment(b[sortedColumn], inputFormat), + ) ? 1 : -1 - : moment(b[sortedColumn]).isAfter(a[sortedColumn]) + : moment(b[sortedColumn], inputFormat).isAfter( + moment(a[sortedColumn], inputFormat), + ) ? 1 : -1; } catch (e) {