diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js index 761b5ec..58be5c4 100644 --- a/src/components/FiDataGrid.js +++ b/src/components/FiDataGrid.js @@ -4,7 +4,7 @@ import { DataGrid, GridOverlay, } from "@mui/x-data-grid"; import {FormattedMessage, useIntl} from "react-intl"; -import {Typography} from '@mui/material'; +import {TablePagination, Typography} from '@mui/material'; // ==============================|| EVENT TABLE ||============================== // @@ -124,27 +124,12 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, return ( - + ); } - const CustomPagination = (props) => { - const { pagination } = props; - const { page, pageSize, rowCount } = pagination; - - const startIndex = page * pageSize + 1; - const endIndex = Math.min((page + 1) * pageSize, rowCount); - - return ( -
-
{`${startIndex}-${endIndex} YES ${rowCount}`}
- {/* Render other pagination controls */} -
- ); - }; - return ( ( + { + return '' + from + '-' + to + ' ' + count + } + } + /> + ), }} componentsProps={{ pagination: { - labelRowsPerPage: intl.formatMessage({id: 'rowsPerPage'}), + labelRowsPerPage: intl.formatMessage({id: 'rowsPerPage'}) + ":", } }} /> diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js index 339e8c9..740cde8 100644 --- a/src/pages/DemandNote/Create/SearchForm.js +++ b/src/pages/DemandNote/Create/SearchForm.js @@ -144,6 +144,7 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p - + - + diff --git a/src/themes/themeConst.js b/src/themes/themeConst.js index 7ff2665..ce35db6 100644 --- a/src/themes/themeConst.js +++ b/src/themes/themeConst.js @@ -77,7 +77,7 @@ export const PNSPS_THEME = createTheme({ }, '&.MuiButton-root':{ fontSize: '1.2rem', - alignItems: 'normal', + alignItems: 'center', }, } } diff --git a/src/translations/en.json b/src/translations/en.json index 655115b..abb1f21 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -355,6 +355,10 @@ "district": "District", "noRecordFound": "No record found", "rowsPerPage": "Rows Per Page", + "date" : "Date", + "keyword": "Key word", + "dateFrom": "Date(From)", + "dateTo": "Date(To)", "Dashboard": "Dashboard", "event": "Event" diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 6558d95..aec6ce2 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -355,6 +355,10 @@ "district": "区", "noRecordFound": "找不到記錄", "rowsPerPage": "每页项数", + "date" : "日期", + "keyword": "关键字", + "dateFrom": "日期(从)", + "dateTo": "日期(到)", "Dashboard": "仪表板", "event": "活动" diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 7c0e384..b2ad9e8 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -355,6 +355,10 @@ "district": "區", "noRecordFound": "找不到記錄", "rowsPerPage": "每頁項數", + "date" : "日期", + "keyword": "關鍵字", + "dateFrom": "日期(從)", + "dateTo": "日期(到)", "Dashboard": "儀表板", "event": "活動"