浏览代码

fix datagrid error

CR003
Alex Cheung 11 个月前
父节点
当前提交
efa7c3933b
共有 6 个文件被更改,包括 8 次插入2 次删除
  1. +3
    -0
      src/components/FiDataGrid.js
  2. +1
    -0
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
  3. +1
    -1
      src/pages/User/SearchPage/UserTable.js
  4. +1
    -0
      src/pages/User/SearchPage_Individual/UserTable_Individual.js
  5. +1
    -1
      src/pages/User/SearchPage_Organization/UserTable_Organization.js
  6. +1
    -0
      src/pages/pnspsUserGroupSearchPage/UserGroupTable.js

+ 3
- 0
src/components/FiDataGrid.js 查看文件

@@ -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) => {


+ 1
- 0
src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js 查看文件

@@ -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 }) {


+ 1
- 1
src/pages/User/SearchPage/UserTable.js 查看文件

@@ -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}) {


+ 1
- 0
src/pages/User/SearchPage_Individual/UserTable_Individual.js 查看文件

@@ -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 }) {


+ 1
- 1
src/pages/User/SearchPage_Organization/UserTable_Organization.js 查看文件

@@ -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}) {


+ 1
- 0
src/pages/pnspsUserGroupSearchPage/UserGroupTable.js 查看文件

@@ -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}) {


正在加载...
取消
保存