@@ -93,6 +93,9 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, | |||||
if (customPageSize) { | if (customPageSize) { | ||||
setPageSize(customPageSize); | setPageSize(customPageSize); | ||||
} | } | ||||
if (_doLoad !== undefined && Object.keys(_doLoad).length==0 ){ | |||||
setLoading(false) | |||||
} | |||||
}, [sx, hideFooterSelectedRowCount, rowModesModel, rows, columns, pageSizeOptions, autoHeight, editMode, filterItems, customPageSize]); | }, [sx, hideFooterSelectedRowCount, rowModesModel, rows, columns, pageSizeOptions, autoHeight, editMode, filterItems, customPageSize]); | ||||
const handleChangePage = (event, newPage) => { | const handleChangePage = (event, newPage) => { | ||||
@@ -14,6 +14,7 @@ import { | |||||
import {GET_PUBLIC_NOTICE_LIST} from "utils/ApiPathConst"; | import {GET_PUBLIC_NOTICE_LIST} from "utils/ApiPathConst"; | ||||
import { useTheme } from "@emotion/react"; | import { useTheme } from "@emotion/react"; | ||||
import { FormattedMessage, useIntl } from "react-intl"; | import { FormattedMessage, useIntl } from "react-intl"; | ||||
import * as React from 'react'; | |||||
// ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
export default function SearchPublicNoticeTable({ searchCriteria }) { | export default function SearchPublicNoticeTable({ searchCriteria }) { | ||||
@@ -8,7 +8,7 @@ import * as HttpUtils from 'utils/HttpUtils'; | |||||
import { GLD_USER_PATH, GET_USER_LOCK, GET_USER_UNLOCK } from "utils/ApiPathConst"; | import { GLD_USER_PATH, GET_USER_LOCK, GET_USER_UNLOCK } from "utils/ApiPathConst"; | ||||
import { notifyLockSuccess, notifyUnlockSuccess , clickableLink} from 'utils/CommonFunction'; | import { notifyLockSuccess, notifyUnlockSuccess , clickableLink} from 'utils/CommonFunction'; | ||||
import { isGrantedAny } from "auth/utils"; | import { isGrantedAny } from "auth/utils"; | ||||
import * as React from 'react'; | |||||
// ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
export default function UserTable({searchCriteria}) { | export default function UserTable({searchCriteria}) { | ||||
@@ -9,6 +9,7 @@ import { useNavigate } from "react-router-dom"; | |||||
import * as DateUtils from "utils/DateUtils"; | import * as DateUtils from "utils/DateUtils"; | ||||
import { GET_IND_USER_PATH } from "utils/ApiPathConst"; | import { GET_IND_USER_PATH } from "utils/ApiPathConst"; | ||||
import { clickableLink} from 'utils/CommonFunction'; | import { clickableLink} from 'utils/CommonFunction'; | ||||
import * as React from 'react'; | |||||
// ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
export default function UserTable_Individual({ searchCriteria }) { | export default function UserTable_Individual({ searchCriteria }) { | ||||
@@ -12,7 +12,7 @@ import CheckCircleOutline from '@mui/icons-material/CheckCircleOutline'; | |||||
import * as DateUtils from 'utils/DateUtils'; | import * as DateUtils from 'utils/DateUtils'; | ||||
import { GET_ORG_USER_PATH } from "utils/ApiPathConst"; | import { GET_ORG_USER_PATH } from "utils/ApiPathConst"; | ||||
import { clickableLink} from 'utils/CommonFunction'; | import { clickableLink} from 'utils/CommonFunction'; | ||||
import * as React from 'react'; | |||||
// ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
export default function UserTable_Organization({searchCriteria}) { | export default function UserTable_Organization({searchCriteria}) { | ||||
@@ -8,6 +8,7 @@ import {useState, useEffect} from "react"; | |||||
import {useNavigate} from "react-router-dom"; | import {useNavigate} from "react-router-dom"; | ||||
import { GET_GROUP_LIST_PATH } from "utils/ApiPathConst"; | import { GET_GROUP_LIST_PATH } from "utils/ApiPathConst"; | ||||
import { clickableLink} from 'utils/CommonFunction'; | import { clickableLink} from 'utils/CommonFunction'; | ||||
import * as React from 'react'; | |||||
// ==============================|| EVENT TABLE ||============================== // | // ==============================|| EVENT TABLE ||============================== // | ||||
export default function UserGroupTable({searchCriteria}) { | export default function UserGroupTable({searchCriteria}) { | ||||