diff --git a/src/components/crud/grid/GridDatatable.js b/src/components/crud/grid/GridDatatable.js index fb37edc..409e53f 100644 --- a/src/components/crud/grid/GridDatatable.js +++ b/src/components/crud/grid/GridDatatable.js @@ -8,10 +8,11 @@ import { ChevronDown } from 'react-feather'; import { useSelector } from 'react-redux'; -import { Card } from 'reactstrap'; import LoadingSpinner from '../../../@core/components/spinner/Loading-spinner'; +import { Spinner } from 'reactstrap'; export const GridDatabase = props => { const { loading } = useSelector(state => state.loadingReducer); + return props[`${props.handlerPageChange ? 'total' : 'count'}`] <= 0 ? (
표시할 데이터가 없습니다.
) : ( @@ -41,7 +42,14 @@ export const GridDatabase = props => { noRowsPerPage: props.handlerPageChange ? true : false }} progressPending={props.handlerPageChange ? loading : false} - progressComponent={} + progressComponent={ +
+
+ + Loading... +
+
+ } /> ); }; diff --git a/src/modules/analysis/history/reducers/analysisHitoryReducer.ts b/src/modules/analysis/history/reducers/analysisHitoryReducer.ts index 3ec741a..c7e0a1b 100644 --- a/src/modules/analysis/history/reducers/analysisHitoryReducer.ts +++ b/src/modules/analysis/history/reducers/analysisHitoryReducer.ts @@ -51,5 +51,6 @@ export const analysisHistoryReducer = createReducer< produce(state, draft => { draft.data = initResponseAnalysisHistoryData.data; draft.count = initResponseAnalysisHistoryData.count; + draft.total = initResponseAnalysisHistoryData.total; }) );