fixed sorting issue in table's data/datetime columns

raheeliftikhar5 · raheeliftikhar5 · commit a68c306174fb · 2025-03-01T01:04:30.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx
@@ -219,6 +219,7 @@ export class ColumnComp extends ColumnInitComp {
     const columnType = this.children.render.getSelectedComp().getComp().children.compType.getView();
     return {
       ...superView,
+      columnType,
       editable: ColumnTypeCompMap[columnType].canBeEditable() && superView.editable,
     };
   }
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableUtils.tsx
@@ -21,6 +21,7 @@ import { TableColumnLinkStyleType, TableColumnStyleType } from "comps/controls/s
 import Tooltip from "antd/es/tooltip";
 import InfoCircleOutlined from "@ant-design/icons/InfoCircleOutlined";
 import { EMPTY_ROW_KEY } from "./tableCompView";
+import dayjs from "dayjs";
 
 export const COLUMN_CHILDREN_KEY = "children";
 export const OB_ROW_ORI_INDEX = "__ob_origin_index";
@@ -399,7 +400,14 @@ export function columnsToAntdFormat(
       },
       ...(column.sortable
         ? {
-            sorter: { multiple: (sortedColumns.length - mIndex) + 1 },
+            sorter: {
+              multiple: (sortedColumns.length - mIndex) + 1,
+              compare: column.columnType === 'date' || column.columnType === 'dateTime'
+                ? (a,b) => {
+                  return dayjs(a[column.dataIndex] as string).unix() - dayjs(b[column.dataIndex] as string).unix();
+                }
+              : undefined
+            },
             sortOrder: sortMap.get(column.dataIndex),
             showSorterTooltip: false,
           }

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,7 @@ export class ColumnComp extends ColumnInitComp {`
`219`	`219`	`const columnType = this.children.render.getSelectedComp().getComp().children.compType.getView();`
`220`	`220`	`return {`
`221`	`221`	`...superView,`
	`222`	`+ columnType,`
`222`	`223`	`editable: ColumnTypeCompMap[columnType].canBeEditable() && superView.editable,`
`223`	`224`	`};`
`224`	`225`	`}`