From 1d333ced050ac13e4233687a9c2b0a43807c5e37 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 10 Apr 2024 14:49:43 +0800 Subject: [PATCH] fix bug --- src/pages/DemandNote/Search/DataGrid.js | 6 +-- src/pages/GFMIS/DataGrid.js | 4 +- src/pages/Payment/Search_GLD/DataGrid.js | 2 - src/pages/PublicNotice/Search_GLD/DataGrid.js | 43 +++++++++---------- src/pages/PublicNotice/Search_GLD/index.js | 1 - 5 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js index 0cc7d3b..1084b03 100644 --- a/src/pages/DemandNote/Search/DataGrid.js +++ b/src/pages/DemandNote/Search/DataGrid.js @@ -339,13 +339,13 @@ export default function SearchDemandNote({ searchCriteria, applySearch }) { customPageSize={100} getRowHeight={() => 'auto'} onRowDoubleClick={handleRowDoubleClick} - doLoad={{ + doLoad={React.useMemo(() => ({ url: UrlUtils.DEMAND_NOTE_LIST, params: _searchCriteria, - callback: (responseData)=>{ + callback: function (responseData) { setRows(responseData?.records); } - }} + }), [_searchCriteria])} />
diff --git a/src/pages/GFMIS/DataGrid.js b/src/pages/GFMIS/DataGrid.js index b237394..a92383f 100644 --- a/src/pages/GFMIS/DataGrid.js +++ b/src/pages/GFMIS/DataGrid.js @@ -68,9 +68,7 @@ export default function SearchTable({ searchCriteria }) { onRowDoubleClick={handleEditClick} doLoad={{ url:GFIMIS_LIST, - params:_searchCriteria, - callback: function(){ - } + params:_searchCriteria }} />
diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js index 5babb8f..d2d11af 100644 --- a/src/pages/Payment/Search_GLD/DataGrid.js +++ b/src/pages/Payment/Search_GLD/DataGrid.js @@ -99,8 +99,6 @@ export default function SearchPaymentTable({ searchCriteria }) { doLoad={{ url:PAYMENT_LIST, params:_searchCriteria, - callback: function(){ - } }} /> diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js index 24b7fc0..c4160b1 100644 --- a/src/pages/PublicNotice/Search_GLD/DataGrid.js +++ b/src/pages/PublicNotice/Search_GLD/DataGrid.js @@ -8,7 +8,7 @@ import { Stack, Dialog, DialogTitle, DialogContent, DialogActions, } from '@mui/material'; -import * as UrlUtils from "utils/ApiPathConst"; +import { GET_PUBLIC_NOTICE_LIST, SET_PUBLIC_NOTICE_STATUS_PUBLISH_BULK } from "utils/ApiPathConst"; import * as HttpUtils from "utils/HttpUtils"; import * as DateUtils from "utils/DateUtils"; import * as FormatUtils from "utils/FormatUtils"; @@ -21,17 +21,15 @@ import { FormattedMessage, useIntl } from "react-intl"; export default function SearchPublicNoticeTable({ searchCriteria }) { + const [rows, setRows] = React.useState([]); const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria); - const [rows, setRows] = React.useState(); const navigate = useNavigate() const [selectedRowItems, setSelectedRowItems] = React.useState([]); const [isConfirmPopUp, setIsConfirmPopUp] = React.useState(false); const [isWarningPopUp, setIsWarningPopUp] = React.useState(false); - - const intl = useIntl(); React.useEffect(() => { @@ -40,14 +38,14 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { function genIssueNo(params) { - const issueNo = params.row.issueYear+ " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3)+ ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2)+ ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)") + const issueNo = params.row.issueYear + " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3) + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2) + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)") return issueNo } function genGroupNo(params) { let groupNo = params.row.groupNo - if (groupNo!=null){ - groupNo = <>
{groupNo}
+ if (groupNo != null) { + groupNo = <>
{groupNo}
} return groupNo } @@ -77,7 +75,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { headerName: 'With Proof', width: 120, renderCell: (params) => { - return [params.row.proofId!=null?"Yes":""] + return [params.row.proofId != null ? "Yes" : ""] }, }, { @@ -111,12 +109,12 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { headerName: 'Gazette Issue No. / Gazette Code', flex: 1.5, minWidth: 350, - renderCell: (params) =>( + renderCell: (params) => (
{genIssueNo(params)} {genGroupNo(params)}
- + ) }, ]; @@ -136,21 +134,20 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { for (var i = 0; i < datas?.length; i++) { appIdList.push(datas[i].id); } - if(appIdList.length<1){ + if (appIdList.length < 1) { setIsWarningPopUp(true); - }else{ + } else { HttpUtils.post({ - url: UrlUtils.SET_PUBLIC_NOTICE_STATUS_PUBLISH_BULK, + url: SET_PUBLIC_NOTICE_STATUS_PUBLISH_BULK, params: { ids: appIdList }, onSuccess: () => { - reloadFunction() + searchCriteria.reload = new Date(); notifyActionSuccess("Action Success!") } }); } - } return (<> @@ -159,7 +156,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { @@ -179,13 +176,13 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { customPageSize={10} getRowHeight={() => 'auto'} onRowDoubleClick={handleRowDoubleClick} - doLoad={{ - url:UrlUtils.GET_PUBLIC_NOTICE_LIST, - params:_searchCriteria, - callback: function(responseData){ + doLoad={React.useMemo(() => ({ + url: GET_PUBLIC_NOTICE_LIST, + params: _searchCriteria, + callback: function (responseData) { setRows(responseData?.records); } - }} + }), [_searchCriteria])} />
@@ -207,7 +204,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { - Please Confirm to mark selected application as Published. + Please Confirm to mark selected application as Published. @@ -216,7 +213,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { - diff --git a/src/pages/PublicNotice/Search_GLD/index.js b/src/pages/PublicNotice/Search_GLD/index.js index 876c250..5c4f841 100644 --- a/src/pages/PublicNotice/Search_GLD/index.js +++ b/src/pages/PublicNotice/Search_GLD/index.js @@ -29,7 +29,6 @@ const BackgroundHead = { // ==============================|| DASHBOARD - DEFAULT ||============================== // const UserSearchPage_Individual = () => { - const [orgCombo, setOrgCombo] = React.useState([]); const [issueCombo, setIssueCombo] = React.useState([]); const [searchCriteria, setSearchCriteria] = React.useState({