pav
/
pav-fe-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

비행승인리스트 보더라인 추가

master
김장현 3 months ago
parent
39461cf238
commit
56b80b4560
5 changed files with 54 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      public/index.html
  2. 14
      src/@core/components/spinner/Fallback-spinner.js
  3. 2
      src/components/account/login/AccountLogin.js
  4. 50
      src/components/flight/FlightApprovalsTable.js
  5. 5
      src/redux/features/account/auth/authThunk.ts

1
public/index.html
Unescape View File

@ -60,6 +60,7 @@
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<div id="spinner-root"></div>
<!-- <!--
This HTML file is a template. This HTML file is a template.
If you open it directly in the browser, you will see an empty page. If you open it directly in the browser, you will see an empty page.

14
src/@core/components/spinner/Fallback-spinner.js
Unescape View File

@ -1,8 +1,9 @@
import { createPortal } from 'react-dom';
// ** Logo // ** Logo
import logo from '@src/assets/images/logo/logo.png' import logo from '@src/assets/images/logo/kac_logo.svg';
const SpinnerComponent = () => { const SpinnerComponent = () => {
return ( return createPortal(
<div className='fallback-spinner vh-100'> <div className='fallback-spinner vh-100'>
<img className='fallback-logo' src={logo} alt='logo' /> <img className='fallback-logo' src={logo} alt='logo' />
<div className='loading'> <div className='loading'>
@ -10,8 +11,9 @@ const SpinnerComponent = () => {
<div className='effect-2 effects'></div> <div className='effect-2 effects'></div>
<div className='effect-3 effects'></div> <div className='effect-3 effects'></div>
</div> </div>
</div> </div>,
) document.getElementById('spinner-root')
} );
};
export default SpinnerComponent export default SpinnerComponent;

2
src/components/account/login/AccountLogin.js
Unescape View File

@ -66,7 +66,7 @@ export const AccountLogin = ({ history }) => {
} }
const { meta } = await dispatch(setLogin(loginForm)); const { meta } = await dispatch(setLogin(loginForm));
console.log(meta);
if (meta.requestStatus === 'fulfilled') { if (meta.requestStatus === 'fulfilled') {
history.push('/control'); history.push('/control');
} }

50
src/components/flight/FlightApprovalsTable.js
Unescape View File

@ -30,10 +30,13 @@ export default function FlightApprovalsTable(props) {
}, [laancAprvList]); }, [laancAprvList]);
// 행 토글 // 행 토글
const toggleRow = rowId => { const toggleRow = (e, row) => {
const parent = e.target.parentElement.parentElement;
parent.classList.add(`A${row.planSno}`);
setExpandedRows({ setExpandedRows({
...expandedRows, ...expandedRows,
[rowId]: !expandedRows[rowId] [row.planSno]: !expandedRows[row.planSno]
}); });
}; };
@ -178,7 +181,7 @@ export default function FlightApprovalsTable(props) {
width: '83px', width: '83px',
cell: row => cell: row =>
row.areaList.length > 1 ? ( row.areaList.length > 1 ? (
<Button color='flat-dark' onClick={() => toggleRow(row.planSno)}> <Button color='flat-dark' onClick={e => toggleRow(e, row)}>
{row.areaList.length}건<br /> 더보기 {row.areaList.length}건<br /> 더보기
{expandedRows[row.planSno] ? <FaAngleDown /> : <FaAngleUp />} {expandedRows[row.planSno] ? <FaAngleDown /> : <FaAngleUp />}
</Button> </Button>
@ -381,15 +384,44 @@ export default function FlightApprovalsTable(props) {
// 데이터 테이블 내부 컴포넌트 // 데이터 테이블 내부 컴포넌트
const FlightInfoComponent = ({ data }) => { const FlightInfoComponent = ({ data }) => {
useEffect(() => {
const expandeds = Object.keys(expandedRows);
if (expandeds.length > 0) {
expandeds.forEach(key => {
const el = document.querySelectorAll(`.A${key}`);
el.forEach((i, idx) => {
expandedRows[key]
? idx === 0
? (() => {
i.style.borderTop = '2px solid blue';
i.style.borderRight = '2px solid blue';
i.style.borderLeft = '2px solid blue';
})()
: (() => {
i.style.borderBottom = '2px solid blue';
i.style.borderRight = '2px solid blue';
i.style.borderLeft = '2px solid blue';
})()
: (() => {
i.classList.remove(`A${key}`);
i.style = '';
})();
});
});
}
}, []);
return ( return (
<> <>
<div <div
// style={{ className={`A${data.planSno}`}
// borderBottom: '2px dashed #0000FF', // style={{
// borderLeft: '2px dashed #0000FF', // borderBottom: '2px dashed #0000FF',
// borderRight: '2px dashed #0000FF', // borderLeft: '2px dashed #0000FF',
// cursor: 'pointer' // borderRight: '2px dashed #0000FF',
// }} // cursor: 'pointer'
// }}
> >
<DataTable <DataTable
className='flight-approval-in-table' className='flight-approval-in-table'

5
src/redux/features/account/auth/authThunk.ts
Unescape View File

@ -30,6 +30,7 @@ import {
ORIGINPSWD_MISMATCH_MESSAGE, ORIGINPSWD_MISMATCH_MESSAGE,
WITHDRAWAL_CONFIRM_MESSAGE WITHDRAWAL_CONFIRM_MESSAGE
} from '@src/configs/msgConst'; } from '@src/configs/msgConst';
import { AxiosError } from 'axios';
// 로그인 // 로그인
export const setLogin = createAsyncThunk( export const setLogin = createAsyncThunk(
@ -55,8 +56,8 @@ export const setLogin = createAsyncThunk(
} catch (error: any) { } catch (error: any) {
thunkAPI.dispatch( thunkAPI.dispatch(
openModal({ openModal({
header: ERROR_TITLE, header: '로그인 실패',
body: ERROR_MESSAGE body: error
}) })
); );
} }

Write Preview
Loading…
Cancel
Save