From 8066888f3d700cc32839bf019c5f3c88787ed5ca Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Mon, 8 Jul 2024 17:26:57 +0900 Subject: [PATCH] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20data=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/NewFlightApprovalsTable.js | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/components/flight/NewFlightApprovalsTable.js b/src/components/flight/NewFlightApprovalsTable.js index 68ae6d33..2e3870a2 100644 --- a/src/components/flight/NewFlightApprovalsTable.js +++ b/src/components/flight/NewFlightApprovalsTable.js @@ -1,9 +1,9 @@ -import { useEffect, useState } from 'react'; -import { useDispatch, useSelector } from '@src/redux/store'; +import React, { useEffect, useState } from 'react'; +import { useDispatch, useSelector } from 'react-redux'; import { Button, Card } from '@component/ui'; import { openModal } from '@src/redux/features/comn/message/messageSlice'; import { FaAngleDown, FaAngleUp } from 'react-icons/fa'; -import { Form, Input, InputNumber, Popconfirm, Table, Typography } from 'antd'; +import { Form, Input, Table, Typography } from 'antd'; import { HOST } from '../../configs/constants'; import axios from 'axios'; import { getAccessToken } from '../../utility/authService/jwtTokenUtil'; @@ -27,8 +27,6 @@ export default function NewFlightApprovalsTable(props) { U: 0 }); - const [tableData, setTableData] = useState(laancAprvList); - // 확장된 행 키 const [expandedRowKeys, setExpandedRowKeys] = useState([]); @@ -46,7 +44,7 @@ export default function NewFlightApprovalsTable(props) { useEffect(() => { let approvalCdValue = { S: 0, F: 0, C: 0, U: 0 }; - tableData.map(item => { + laancAprvList.map(item => { item.areaList.map(area => { if (area.approvalCd === 'S') { approvalCdValue.S += 1; @@ -66,11 +64,10 @@ export default function NewFlightApprovalsTable(props) { C: approvalCdValue.C, U: approvalCdValue.U }); - }, [tableData]); - // 승인, 미승인, 비대상 건수 계산 - useEffect(() => { - setTableData(laancAprvList); + if (editingKey) { + setEditingKey(''); + } }, [laancAprvList]); // 수정 이벤트 @@ -96,8 +93,7 @@ export default function NewFlightApprovalsTable(props) { const save = async (key, type) => { try { const row = await form.validateFields(); - const newData = [...tableData]; - let index = { ...row, planAreaSno: selectedRowKey }; + const index = { ...row, planAreaSno: selectedRowKey }; const updateRes = await dispatch( updateLaancAprv([ @@ -113,16 +109,13 @@ export default function NewFlightApprovalsTable(props) { ); if (updateRes.meta.requestStatus === 'fulfilled') { - setTableData(newData); setEditingKey(''); - - const updatedList = await dispatch( + await dispatch( getLaancAprvList({ searchStDt: props.startDate, searchEndDt: props.endDate }) ); - setTableData(updatedList.payload); } else { handlerErrorModal(ERROR_TITLE, ERROR_MESSAGE); } @@ -1030,7 +1023,7 @@ export default function NewFlightApprovalsTable(props) { className='invoice-list-dataTable flight-approval' style={{ width: '100%' }} > - {tableData?.length > 0 ? ( + {laancAprvList?.length > 0 ? (
({ + dataSource={laancAprvList.map((item, index) => ({ ...item, key: `${item.planAreaSno}-${index}` }))}