diff --git a/src/components/crud/grid/GridDatatable.js b/src/components/crud/grid/GridDatatable.js index 3185aab9..5dd45483 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 d73e80a3..9e28cacb 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 ( - - -
- 드론 별 비행운항 목록 -
- {user?.cptAuthCode === 'KAC' || - (user?.authId === 'SUPER' && ( - { - const { value } = e.target; - handlerDronOperationChange(value); - }} - > - - {competentAgency?.map(i => ( - +
+ +
+ +
+ 드론 별 비행운항 목록 +
+ {user?.cptAuthCode === 'KAC' || + (user?.authId === 'SUPER' && ( + { + const { value } = e.target; + handlerDronOperationChange(value); + }} + > + + {competentAgency?.map(i => ( + + ))} + ))} - - ))} - -
+ +
+
+ + + +
- - - - - + +
); } diff --git a/src/components/laanc/list/LaancGrid.js b/src/components/laanc/list/LaancGrid.js index 3f2b41db..0f3bfd93 100644 --- a/src/components/laanc/list/LaancGrid.js +++ b/src/components/laanc/list/LaancGrid.js @@ -26,6 +26,10 @@ export default function LaancGrid() { ); const { loading } = useSelector(state => state.loadingReducer); + useEffect(() => { + return () => dispatch(LaancAction.LAANC_APPROVAL_DETAIL_INIT()); + }, []); + useEffect(() => { if (laancDetail) { dispatch(FLIGHT_PLAN_AREA_BUFFER_LIST.request(laancDetail?.areaList)); diff --git a/src/modules/laanc/actions/laancActions.ts b/src/modules/laanc/actions/laancActions.ts index 81c729ac..d5680b9b 100644 --- a/src/modules/laanc/actions/laancActions.ts +++ b/src/modules/laanc/actions/laancActions.ts @@ -60,6 +60,8 @@ const LAANC_VALID_TS_FAILURE = 'laanc/valid/ts/FAILURE'; // laanc 초기화 const INIT_LAANC = 'laanc/init'; +// laanc approval detail 초기화 +const INIT_APPROVAL_DETAIL = 'laanc/init/approval/detail'; // 허뎓 고도 초기화 // const INIT_ALTITUDE = 'laanc/init/altitude'; @@ -79,6 +81,9 @@ export const LAANC_FLIGHT_Approval = createAsyncAction( // laanc 초기화 export const LAANC_APPROVAL_INIT = createAction(INIT_LAANC)(); +// laanc approval detail 초기화 +export const LAANC_APPROVAL_DETAIL_INIT = createAction(INIT_APPROVAL_DETAIL)(); + // 허용고도 초기화 // export const LAANC_ALTITUDE_INIT = createAction(INIT_ALTITUDE)(); @@ -146,6 +151,7 @@ const actions = { LAANC_DETAIL, LAANC_ALTITUDE, LAANC_VALID_AREA, - LAANC_VALID_TS + LAANC_VALID_TS, + LAANC_APPROVAL_DETAIL_INIT }; export type LaancAction = ActionType; diff --git a/src/modules/laanc/reducers/laancReducers.ts b/src/modules/laanc/reducers/laancReducers.ts index 107b1b45..8a7e5364 100644 --- a/src/modules/laanc/reducers/laancReducers.ts +++ b/src/modules/laanc/reducers/laancReducers.ts @@ -36,6 +36,11 @@ export const laancReducer = createReducer( draft.laancPdf = undefined; }) ) + .handleAction(Actions.LAANC_APPROVAL_DETAIL_INIT, (state, action) => + produce(state, draft => { + draft.laancDetail = undefined; + }) + ) .handleAction(Actions.LAANC_SUN_DATA.success, (state, action) => produce(state, draft => { const data = action.payload; @@ -62,7 +67,6 @@ export const laancReducer = createReducer( } draft.laancElev.push(...data); if (draft.laancElev.length > 0) { - console.log('data>>', [Math.min(...draft.laancElev)]); draft.laancElev = data; // draft.laancElev = [Math.min(...draft.laancElev)]; }