diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 6489e81b..a50e24ae 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -790,6 +790,9 @@ export default function ControlApprovalsTable(props) { } } })} + rowSelection={{ + ...rowSelection + }} showHeader={false} rowHoverable={false} /> @@ -968,6 +971,22 @@ export default function ControlApprovalsTable(props) { } }; + const rowSelection = { + onChange: (selectedRowKeys, selectedRows) => { + console.log( + `selectedRowKeys: ${selectedRowKeys}`, + 'selectedRows: ', + selectedRows + ); + }, + onSelect: (record, selected, selectedRows) => { + console.log(record, selected, selectedRows); + }, + onSelectAll: (selected, selectedRows, changeRows) => { + console.log(selected, selectedRows, changeRows); + } + }; + return (
@@ -1038,7 +1057,10 @@ export default function ControlApprovalsTable(props) { }} dataSource={laancAprvList.map((item, index) => ({ ...item, - key: `${item.planAreaSno}-${index}` + key: + item.areaList.length >= 1 + ? `${item.planAreaSno}-${index}` + : `${item.planAreaSno}` }))} columns={mergedColumns} rowClassName={record => { @@ -1067,6 +1089,9 @@ export default function ControlApprovalsTable(props) { } return className; }} + rowSelection={{ + ...rowSelection + }} onRow={record => ({ onClick: event => { if (editingKey !== '') { diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index 16d1ade0..ba8d3300 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -344,8 +344,6 @@ export default function ControlApprovalsContainer({ mode }) { } }; - const [testModal, setTestModal] = useState(false); - return ( <>
diff --git a/src/redux/features/laanc/laancThunk.ts b/src/redux/features/laanc/laancThunk.ts index 94934dce..3591e53b 100644 --- a/src/redux/features/laanc/laancThunk.ts +++ b/src/redux/features/laanc/laancThunk.ts @@ -296,6 +296,7 @@ export const getLaancAprvList = createAsyncThunk( } else { return { ...item, + planAreaSno: item.areaList[0].planAreaSno, areaList: item.areaList.map((area, innerIndex) => { return { ...area,