diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js index 82545f0..3ae3451 100644 --- a/src/components/FiDataGrid.js +++ b/src/components/FiDataGrid.js @@ -6,12 +6,13 @@ import { import * as HttpUtils from "utils/HttpUtils"; import { FormattedMessage, useIntl } from "react-intl"; import { TablePagination, Typography } from '@mui/material'; +import { getSearchCriteria } from "auth/utils"; // ==============================|| EVENT TABLE ||============================== // export function FiDataGrid({ rows, columns, sx, autoHeight, hideFooterSelectedRowCount, rowModesModel, editMode, - pageSizeOptions, filterItems, customPageSize, doLoad, applyGridOnReady, ...props }) { + pageSizeOptions, filterItems, customPageSize, doLoad, applyGridOnReady, applySearch, ...props }) { const intl = useIntl(); const [_rows, set_rows] = useState([]); const [_doLoad, set_doLoad] = useState({}); @@ -52,7 +53,16 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, useEffect(() => { if (doLoad !== undefined && Object.keys(doLoad).length>0 ){ - setPage(0); + if(applySearch!=undefined){ + if (Object.keys(getSearchCriteria(window.location.pathname)).length>0){ + const localStorageSearchCriteria = getSearchCriteria(window.location.pathname) + if(localStorageSearchCriteria.start!=undefined){ + setPage(localStorageSearchCriteria.start/pageSize); + } + } + }else{ + setPage(0); + } set_doLoad(doLoad); setLoading(true) } @@ -137,6 +147,8 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, if (_doLoad.params == null) _doLoad.params = {}; _doLoad.params.start = page * pageSize; _doLoad.params.limit = pageSize; + localStorage.setItem('searchCriteria', JSON.stringify({path:window.location.pathname,data:_doLoad.params})) + HttpUtils.get({ url: _doLoad.url, params: _doLoad.params, diff --git a/src/pages/Announcement/Search/DataGrid.js b/src/pages/Announcement/Search/DataGrid.js index 0f7d1d9..9c265fe 100644 --- a/src/pages/Announcement/Search/DataGrid.js +++ b/src/pages/Announcement/Search/DataGrid.js @@ -10,7 +10,7 @@ import { clickableLink } from 'utils/CommonFunction'; import {GET_ANNOUNCE_LIST} from "utils/ApiPathConst"; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady }) { +export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady, applySearch}) { const navigate = useNavigate() @@ -74,6 +74,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea getRowHeight={() => 'auto'} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch = {applySearch} // doLoad={{ // url: GET_ANNOUNCE_LIST, // params: _searchCriteria, diff --git a/src/pages/Announcement/Search/index.js b/src/pages/Announcement/Search/index.js index 0327006..a8c4156 100644 --- a/src/pages/Announcement/Search/index.js +++ b/src/pages/Announcement/Search/index.js @@ -94,6 +94,7 @@ const UserSearchPage_Individual = () => { diff --git a/src/pages/Announcement/Search_Public/DataGrid.js b/src/pages/Announcement/Search_Public/DataGrid.js index 348e644..4d22350 100644 --- a/src/pages/Announcement/Search_Public/DataGrid.js +++ b/src/pages/Announcement/Search_Public/DataGrid.js @@ -6,7 +6,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import {GET_ANNOUNCE_LIST} from "utils/ApiPathConst"; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady }) { +export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady,applySearch }) { const intl = useIntl(); const { locale } = intl; @@ -58,6 +58,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea customPageSize={10} getRowHeight={() => 'auto'} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: GET_ANNOUNCE_LIST, // params: _searchCriteria diff --git a/src/pages/Announcement/Search_Public/index.js b/src/pages/Announcement/Search_Public/index.js index cece798..46ca7c1 100644 --- a/src/pages/Announcement/Search_Public/index.js +++ b/src/pages/Announcement/Search_Public/index.js @@ -96,6 +96,7 @@ const UserSearchPage_Individual = () => { diff --git a/src/pages/AuditLog/AuditLogTable.js b/src/pages/AuditLog/AuditLogTable.js index d02defa..fee2719 100644 --- a/src/pages/AuditLog/AuditLogTable.js +++ b/src/pages/AuditLog/AuditLogTable.js @@ -12,7 +12,7 @@ import { } from '@mui/material'; // ==============================|| EVENT TABLE ||============================== // -export default function AuditLogTable({searchCriteria, applyGridOnReady}) { +export default function AuditLogTable({searchCriteria, applyGridOnReady,applySearch}) { const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria); useEffect(() => { @@ -88,6 +88,7 @@ export default function AuditLogTable({searchCriteria, applyGridOnReady}) { customPageSize={10} getRowHeight={() => 'auto'} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: GET_AUDIT_LOG_LIST, // params: _searchCriteria diff --git a/src/pages/AuditLog/index.js b/src/pages/AuditLog/index.js index 09716e1..52e697d 100644 --- a/src/pages/AuditLog/index.js +++ b/src/pages/AuditLog/index.js @@ -83,6 +83,7 @@ const AuditLogPage = () => { diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js index a41c28f..2ceb8d8 100644 --- a/src/pages/DemandNote/Search/DataGrid.js +++ b/src/pages/DemandNote/Search/DataGrid.js @@ -389,6 +389,7 @@ export default function SearchDemandNote({ applySearch, searchCriteria, applyGri getRowHeight={() => 'auto'} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} doLoad={useMemo(() => ({ url: DEMAND_NOTE_LIST_ALL, params: _searchCriteria, diff --git a/src/pages/DemandNote/Search_Public/DataGrid.js b/src/pages/DemandNote/Search_Public/DataGrid.js index 87f0bd8..9c71eb1 100644 --- a/src/pages/DemandNote/Search_Public/DataGrid.js +++ b/src/pages/DemandNote/Search_Public/DataGrid.js @@ -15,7 +15,7 @@ import {useIntl} from "react-intl"; import {DEMAND_NOTE_LIST} from "utils/ApiPathConst"; // ==============================|| EVENT TABLE ||============================== // -export default function SearchDemandNote({ searchCriteria, applyGridOnReady }) { +export default function SearchDemandNote({ searchCriteria, applyGridOnReady,applySearch }) { const intl = useIntl(); const theme = useTheme(); @@ -98,6 +98,7 @@ export default function SearchDemandNote({ searchCriteria, applyGridOnReady }) { customPageSize={10} getRowHeight={() => 'auto'} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: DEMAND_NOTE_LIST, // params: _searchCriteria, diff --git a/src/pages/DemandNote/Search_Public/index.js b/src/pages/DemandNote/Search_Public/index.js index a3a2e39..7abee35 100644 --- a/src/pages/DemandNote/Search_Public/index.js +++ b/src/pages/DemandNote/Search_Public/index.js @@ -127,6 +127,7 @@ const SearchPage_DemandNote_Pub = () => { diff --git a/src/pages/GFMIS/index.js b/src/pages/GFMIS/index.js index 2620eb4..68870b4 100644 --- a/src/pages/GFMIS/index.js +++ b/src/pages/GFMIS/index.js @@ -143,6 +143,7 @@ const Index = () => { diff --git a/src/pages/Message/Search/DataGrid.js b/src/pages/Message/Search/DataGrid.js index 60c4a1f..cbc3ab2 100644 --- a/src/pages/Message/Search/DataGrid.js +++ b/src/pages/Message/Search/DataGrid.js @@ -9,7 +9,7 @@ import {GET_MSG_LIST} from "utils/ApiPathConst"; // ==============================|| EVENT TABLE ||============================== // -export default function MsgTable({ searchCriteria, applyGridOnReady }) { +export default function MsgTable({ searchCriteria, applyGridOnReady, applySearch}) { const navigate = useNavigate() const intl = useIntl(); @@ -78,6 +78,7 @@ export default function MsgTable({ searchCriteria, applyGridOnReady }) { getRowHeight={() => 'auto'} onRowDoubleClick={handleEditClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} doLoad={React.useMemo(() => ({ url: GET_MSG_LIST, params: _searchCriteria, diff --git a/src/pages/Message/Search/index.js b/src/pages/Message/Search/index.js index 97ec5fb..5745347 100644 --- a/src/pages/Message/Search/index.js +++ b/src/pages/Message/Search/index.js @@ -112,6 +112,7 @@ const Index = () => { // recordList={record} searchCriteria={searchCriteria} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} /> diff --git a/src/pages/Organization/SearchPage/OrganizationTable.js b/src/pages/Organization/SearchPage/OrganizationTable.js index 81363c5..ace715a 100644 --- a/src/pages/Organization/SearchPage/OrganizationTable.js +++ b/src/pages/Organization/SearchPage/OrganizationTable.js @@ -11,7 +11,7 @@ import { clickableLink} from 'utils/CommonFunction'; import {GET_ORG_PATH} from "utils/ApiPathConst"; // ==============================|| EVENT TABLE ||============================== // -export default function OrganizationTable({ searchCriteria, applyGridOnReady }) { +export default function OrganizationTable({ searchCriteria, applyGridOnReady, applySearch}) { const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria); const navigate = useNavigate() @@ -114,6 +114,7 @@ export default function OrganizationTable({ searchCriteria, applyGridOnReady }) customPageSize={10} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: GET_ORG_PATH, // params: _searchCriteria, diff --git a/src/pages/Organization/SearchPage/index.js b/src/pages/Organization/SearchPage/index.js index 2c2f408..778cb49 100644 --- a/src/pages/Organization/SearchPage/index.js +++ b/src/pages/Organization/SearchPage/index.js @@ -90,6 +90,7 @@ const OrganizationSearchPage = () => { diff --git a/src/pages/Payment/Search_GLD/DataGrid.js b/src/pages/Payment/Search_GLD/DataGrid.js index f58ba4e..913becd 100644 --- a/src/pages/Payment/Search_GLD/DataGrid.js +++ b/src/pages/Payment/Search_GLD/DataGrid.js @@ -9,7 +9,7 @@ import { FiDataGrid } from "components/FiDataGrid"; import { clickableLink } from 'utils/CommonFunction'; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPaymentTable({ searchCriteria, applyGridOnReady }) { +export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, applySearch}) { const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria); const navigate = useNavigate() @@ -97,6 +97,7 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady }) customPageSize={10} onRowDoubleClick={handleEditClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url:PAYMENT_LIST, // params:_searchCriteria, diff --git a/src/pages/Payment/Search_GLD/index.js b/src/pages/Payment/Search_GLD/index.js index 7a21db1..4a00787 100644 --- a/src/pages/Payment/Search_GLD/index.js +++ b/src/pages/Payment/Search_GLD/index.js @@ -95,6 +95,7 @@ const Index = () => { diff --git a/src/pages/Payment/Search_Public/DataGrid.js b/src/pages/Payment/Search_Public/DataGrid.js index 7520163..1e16572 100644 --- a/src/pages/Payment/Search_Public/DataGrid.js +++ b/src/pages/Payment/Search_Public/DataGrid.js @@ -14,7 +14,7 @@ import { clickableLink } from 'utils/CommonFunction'; import {PAYMENT_LIST} from "utils/ApiPathConst"; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady }) { +export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady, applySearch }) { const navigate = useNavigate() const theme = useTheme(); const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); @@ -111,6 +111,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea customPageSize={10} onRowDoubleClick={handleEditDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: PAYMENT_LIST, // params: _searchCriteria, diff --git a/src/pages/Payment/Search_Public/index.js b/src/pages/Payment/Search_Public/index.js index c47943a..d426395 100644 --- a/src/pages/Payment/Search_Public/index.js +++ b/src/pages/Payment/Search_Public/index.js @@ -100,6 +100,7 @@ const Index = () => { diff --git a/src/pages/Proof/Search_GLD/DataGrid.js b/src/pages/Proof/Search_GLD/DataGrid.js index 1196ac9..6f4c841 100644 --- a/src/pages/Proof/Search_GLD/DataGrid.js +++ b/src/pages/Proof/Search_GLD/DataGrid.js @@ -9,7 +9,7 @@ import { FiDataGrid } from "components/FiDataGrid"; import { clickableLink } from 'utils/CommonFunction'; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({searchCriteria, applyGridOnReady}) { +export default function SearchPublicNoticeTable({searchCriteria, applyGridOnReady,applySearch}) { const navigate = useNavigate() @@ -125,6 +125,7 @@ export default function SearchPublicNoticeTable({searchCriteria, applyGridOnRead getRowHeight={() => 'auto'} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch = {applySearch} // doLoad={{ // url: LIST_PROOF, // params: _searchCriteria, diff --git a/src/pages/Proof/Search_GLD/index.js b/src/pages/Proof/Search_GLD/index.js index 827da6b..fb015c9 100644 --- a/src/pages/Proof/Search_GLD/index.js +++ b/src/pages/Proof/Search_GLD/index.js @@ -123,6 +123,7 @@ const UserSearchPage_Individual = () => { diff --git a/src/pages/Proof/Search_Public/DataGrid.js b/src/pages/Proof/Search_Public/DataGrid.js index 41ea740..25d8d87 100644 --- a/src/pages/Proof/Search_Public/DataGrid.js +++ b/src/pages/Proof/Search_Public/DataGrid.js @@ -18,7 +18,7 @@ import { useIntl } from "react-intl"; import { clickableLink } from 'utils/CommonFunction'; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady }) { +export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady, applySearch }) { const navigate = useNavigate() const theme = useTheme(); @@ -193,6 +193,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea getRowHeight={() => "auto"} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} doLoad={React.useMemo(() => ({ url: LIST_PROOF, params: _searchCriteria, diff --git a/src/pages/Proof/Search_Public/index.js b/src/pages/Proof/Search_Public/index.js index 2cb51f7..d7348cb 100644 --- a/src/pages/Proof/Search_Public/index.js +++ b/src/pages/Proof/Search_Public/index.js @@ -112,6 +112,7 @@ const UserSearchPage_Individual = () => { diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js index 52ce150..8396c39 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTab.js @@ -69,6 +69,7 @@ const UserSearchPage_Individual = () => { diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js index 64f2456..e69aade 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js @@ -18,7 +18,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import * as React from 'react'; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({ searchCriteria }) { +export default function SearchPublicNoticeTable({ searchCriteria, applySearch }) { const navigate = useNavigate() const theme = useTheme(); const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); @@ -144,6 +144,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) { customPageSize={10} onRowDoubleClick={handleRowDoubleClick} getRowHeight={() => 'auto'} + applySearch={applySearch} // doLoad={{ // url: GET_PUBLIC_NOTICE_LIST, // params: _searchCriteria diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js index 6b8f3cc..ca85133 100644 --- a/src/pages/PublicNotice/Search_GLD/DataGrid.js +++ b/src/pages/PublicNotice/Search_GLD/DataGrid.js @@ -21,7 +21,7 @@ import * as utils from "auth/utils" import { isGrantedAny } from "auth/utils"; // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady }) { +export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady, applySearch }) { const [rows, setRows] = React.useState([]); const navigate = useNavigate() @@ -192,6 +192,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea getRowHeight={() => 'auto'} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady = {applyGridOnReady} + applySearch = {applySearch} doLoad={React.useMemo(() => ({ url: GET_PUBLIC_NOTICE_LIST, params: _searchCriteria, diff --git a/src/pages/PublicNotice/Search_GLD/index.js b/src/pages/PublicNotice/Search_GLD/index.js index 30a6e3c..71da881 100644 --- a/src/pages/PublicNotice/Search_GLD/index.js +++ b/src/pages/PublicNotice/Search_GLD/index.js @@ -120,7 +120,8 @@ const UserSearchPage_Individual = () => { + applySearch={applySearch} + /> diff --git a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js index 6ca5aeb..d3ca5e1 100644 --- a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js +++ b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js @@ -23,7 +23,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import * as utils from "auth/utils" // ==============================|| EVENT TABLE ||============================== // -export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady }) { +export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnReady, applySearch }) { const [rows, setRows] = React.useState([]); const navigate = useNavigate() @@ -181,6 +181,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea getRowHeight={() => 'auto'} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} doLoad={React.useMemo(() => ({ url: GET_PUBLIC_NOTICE_OFFLINE_PAYMENT_LIST, params: _searchCriteria, diff --git a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/index.js b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/index.js index 0726584..af89b4b 100644 --- a/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/index.js +++ b/src/pages/PublicNotice/Search_Mark_As_Paid_GLD/index.js @@ -120,6 +120,7 @@ const UserSearchPage_Individual = () => { diff --git a/src/pages/User/SearchPage/UserTable.js b/src/pages/User/SearchPage/UserTable.js index 136ac47..1f7c4b8 100644 --- a/src/pages/User/SearchPage/UserTable.js +++ b/src/pages/User/SearchPage/UserTable.js @@ -11,7 +11,7 @@ import { isGrantedAny } from "auth/utils"; import * as React from 'react'; // ==============================|| EVENT TABLE ||============================== // -export default function UserTable({searchCriteria, applyGridOnReady}) { +export default function UserTable({searchCriteria, applyGridOnReady,applySearch}) { const [_searchCriteria, set_searchCriteria] = useState(searchCriteria); const [reloadTime, setReloadTime] = useState(new Date()); const theme = useTheme(); @@ -138,6 +138,7 @@ export default function UserTable({searchCriteria, applyGridOnReady}) { onRowDoubleClick={handleRowDoubleClick} getRowHeight={() => 'auto'} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: GLD_USER_PATH, // params: _searchCriteria, diff --git a/src/pages/User/SearchPage/index.js b/src/pages/User/SearchPage/index.js index f9b6ba3..4f9cbb8 100644 --- a/src/pages/User/SearchPage/index.js +++ b/src/pages/User/SearchPage/index.js @@ -114,6 +114,7 @@ const UserSettingPage = () => { diff --git a/src/pages/User/SearchPage_Individual/UserTable_Individual.js b/src/pages/User/SearchPage_Individual/UserTable_Individual.js index ad401b8..181a287 100644 --- a/src/pages/User/SearchPage_Individual/UserTable_Individual.js +++ b/src/pages/User/SearchPage_Individual/UserTable_Individual.js @@ -12,7 +12,7 @@ import { clickableLink} from 'utils/CommonFunction'; import * as React from 'react'; // ==============================|| EVENT TABLE ||============================== // -export default function UserTable_Individual({ searchCriteria, applyGridOnReady }) { +export default function UserTable_Individual({ searchCriteria, applyGridOnReady,applySearch }) { const [_searchCriteria, set_searchCriteria] = useState(searchCriteria); const navigate = useNavigate() @@ -154,6 +154,7 @@ export default function UserTable_Individual({ searchCriteria, applyGridOnReady customPageSize={10} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: GET_IND_USER_PATH, // params: _searchCriteria, diff --git a/src/pages/User/SearchPage_Individual/index.js b/src/pages/User/SearchPage_Individual/index.js index af4edc7..e3b52bd 100644 --- a/src/pages/User/SearchPage_Individual/index.js +++ b/src/pages/User/SearchPage_Individual/index.js @@ -88,6 +88,7 @@ const UserSearchPage_Individual = () => { diff --git a/src/pages/User/SearchPage_Organization/UserTable_Organization.js b/src/pages/User/SearchPage_Organization/UserTable_Organization.js index 270a42d..c215614 100644 --- a/src/pages/User/SearchPage_Organization/UserTable_Organization.js +++ b/src/pages/User/SearchPage_Organization/UserTable_Organization.js @@ -15,7 +15,7 @@ import { clickableLink} from 'utils/CommonFunction'; import * as React from 'react'; // ==============================|| EVENT TABLE ||============================== // -export default function UserTable_Organization({searchCriteria, applyGridOnReady}) { +export default function UserTable_Organization({searchCriteria, applyGridOnReady, applySearch}) { const [_searchCriteria, set_searchCriteria] = useState(searchCriteria); const navigate = useNavigate() @@ -148,6 +148,7 @@ export default function UserTable_Organization({searchCriteria, applyGridOnReady customPageSize={10} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: GET_ORG_USER_PATH, // params: _searchCriteria, diff --git a/src/pages/User/SearchPage_Organization/index.js b/src/pages/User/SearchPage_Organization/index.js index 2044ed7..4af63ff 100644 --- a/src/pages/User/SearchPage_Organization/index.js +++ b/src/pages/User/SearchPage_Organization/index.js @@ -101,6 +101,7 @@ const UserSearchPage_Organization = () => { diff --git a/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js b/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js index b8eb711..3d2890f 100644 --- a/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js +++ b/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js @@ -11,7 +11,7 @@ import { clickableLink} from 'utils/CommonFunction'; import * as React from 'react'; // ==============================|| EVENT TABLE ||============================== // -export default function UserGroupTable({searchCriteria, applyGridOnReady}) { +export default function UserGroupTable({searchCriteria, applyGridOnReady,applySearch}) { const [_searchCriteria, set_searchCriteria] = useState(searchCriteria); const navigate = useNavigate() @@ -71,6 +71,7 @@ export default function UserGroupTable({searchCriteria, applyGridOnReady}) { pageSizeOptions={[10, 15, 20]} onRowDoubleClick={handleRowDoubleClick} applyGridOnReady={applyGridOnReady} + applySearch={applySearch} // doLoad={{ // url: GET_GROUP_LIST_PATH, // params: _searchCriteria, diff --git a/src/pages/pnspsUserGroupSearchPage/index.js b/src/pages/pnspsUserGroupSearchPage/index.js index f6e7b44..10b9549 100644 --- a/src/pages/pnspsUserGroupSearchPage/index.js +++ b/src/pages/pnspsUserGroupSearchPage/index.js @@ -96,6 +96,7 @@ const UserGroupSearchPanel = () => {