diff --git a/src/components/crud/grid/GridDatatable.js b/src/components/crud/grid/GridDatatable.js index 3185aab..5dd4548 100644 --- a/src/components/crud/grid/GridDatatable.js +++ b/src/components/crud/grid/GridDatatable.js @@ -10,6 +10,7 @@ import { import { selectableRowsComponent } from './selectableRowsComponent'; export const GridDatabase = props => { + console.log(props.rowsPerPageText); return props[`${props.handlerPageChange ? 'total' : 'count'}`] <= 0 ? (
표시할 데이터가 없습니다.
@@ -39,7 +40,9 @@ export const GridDatabase = props => { } onChangePage={props.pagination ? props.handlerPageChange : null} paginationComponentOptions={{ - noRowsPerPage: props.handlerPageChange ? true : false + noRowsPerPage: props.handlerPageChange ? true : false, + rowsPerPageText: + props.rowsPerPageText === 'noText' ? '' : 'Rows per page:' }} selectableRows={props.selectableRows} selectableRowsComponent={props.selectableRowsComponent} diff --git a/src/components/dashboard/DroneFlightSchedule.js b/src/components/dashboard/DroneFlightSchedule.js index d73e80a..9e28cac 100644 --- a/src/components/dashboard/DroneFlightSchedule.js +++ b/src/components/dashboard/DroneFlightSchedule.js @@ -120,47 +120,57 @@ export default function DroneFlightSchedule({ const { dronOperationList } = useSelector(state => state.mainDashState); return ( -