From dc39322e9bffcde61d1f45eef52a4fc808c9a443 Mon Sep 17 00:00:00 2001 From: Jason Chuang Date: Tue, 3 Feb 2026 15:04:18 +0800 Subject: [PATCH] fix date sorting in proof search --- src/pages/Proof/Search_GLD/DataGrid.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pages/Proof/Search_GLD/DataGrid.js b/src/pages/Proof/Search_GLD/DataGrid.js index 6f4c841..6ba3a3e 100644 --- a/src/pages/Proof/Search_GLD/DataGrid.js +++ b/src/pages/Proof/Search_GLD/DataGrid.js @@ -70,9 +70,25 @@ export default function SearchPublicNoticeTable({searchCriteria, applyGridOnRead headerName: 'Confirmed/ Return Date', flex: 1, minWidth: 200, + type: 'dateTime', + valueGetter: (params) => { - return params?.value ? DateUtils.datetimeStr(params?.value) : ""; - } + const v = params?.value; + if (!Array.isArray(v) || v.length < 3) return null; + + const year = v[0]; + const month = v[1]; // 1-12 + const day = v[2]; + const hour = v[3] ?? 0; + const minute = v[4] ?? 0; + const second = v[5] ?? 0; + + return new Date(year, month - 1, day, hour, minute, second); + }, + + valueFormatter: (params) => { + return params.value ? DateUtils.datetimeStr(params.value) : ""; + }, }, { id: 'contactPerson',