bcjang/operationSystem-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

조회조건 레이아웃 수정

Browse Source
This commit is contained in:
bcjang
2025-04-08 17:30:07 +09:00
parent f290f0dbf0
commit 80a3c0ab8a
20 changed files with 54 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/ServiceManage/index.js
View File

@@ -17,6 +17,10 @@ import MailListSearchBar from './searchBar/MailListSearchBar';
import LandInfoSearchBar from './searchBar/LandInfoSearchBar'; import LandInfoSearchBar from './searchBar/LandInfoSearchBar';
import BusinessLogSearchBar from './searchBar/BusinessLogSearchBar'; import BusinessLogSearchBar from './searchBar/BusinessLogSearchBar';
import DataInitSearchBar from './searchBar/DataInitSearchBar'; import DataInitSearchBar from './searchBar/DataInitSearchBar';
import LogViewSearchBar from './searchBar/LogViewSearchBar';
import AdminViewSearchBar from './searchBar/AdminViewSearchBar';
import CaliumRequestSearchBar from './searchBar/CaliumRequestSearchBar';
//etc //etc
import ReportListSummary from './ReportListSummary'; import ReportListSummary from './ReportListSummary';
import WhiteListSearchBar from './WhiteListRegistBar'; import WhiteListSearchBar from './WhiteListRegistBar';
@@ -29,6 +33,9 @@ export {
LandInfoSearchBar, LandInfoSearchBar,
BusinessLogSearchBar, BusinessLogSearchBar,
DataInitSearchBar, DataInitSearchBar,
LogViewSearchBar,
AdminViewSearchBar,
CaliumRequestSearchBar,
ReportListAnswerModal, ReportListAnswerModal,
ReportListDetailModal, ReportListDetailModal,
ReportListSearchBar, ReportListSearchBar,

8
src/components/UserManage/AdminViewSearchBar.js → src/components/ServiceManage/searchBar/AdminViewSearchBar.js
View File

@@ -1,9 +1,9 @@
import { styled } from 'styled-components'; import { styled } from 'styled-components';
import { TextInput, BtnWrapper, InputLabel, SelectInput } from '../../styles/Components'; import { TextInput, BtnWrapper, InputLabel, SelectInput } from '../../../styles/Components';
import Button from '../common/button/Button'; import Button from '../../common/button/Button';
import CheckBox from '../common/input/CheckBox'; import CheckBox from '../../common/input/CheckBox';
import { SearchBarLayout } from '../common/SearchBar'; import { SearchBarLayout } from '../../common/SearchBar';
import { useState } from 'react'; import { useState } from 'react';
const AdminViewSearchBar = ({ handleSearch, groupList, setResultData, setCurrentPage }) => { const AdminViewSearchBar = ({ handleSearch, groupList, setResultData, setCurrentPage }) => {

9
src/components/ServiceManage/searchBar/BattleEventSearchBar.js
View File

@@ -230,15 +230,8 @@ const BattleEventSearchBar = ({ searchParams, onSearch, onReset, configData, rew
handleEndDate={date => onSearch({ endDate: date }, false)} handleEndDate={date => onSearch({ endDate: date }, false)}
/> />
</>, </>,
<></>,<></>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={onReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={onReset} handleSubmit={handleSubmit} />;
}; };
export default BattleEventSearchBar; export default BattleEventSearchBar;

9
src/components/ServiceManage/searchBar/BusinessLogSearchBar.js
View File

@@ -197,15 +197,8 @@ const BusinessLogSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ end_dt: date }, false)} handleEndDate={date => onSearch({ end_dt: date }, false)}
/> />
</>, </>,
<></>,<></>,<></>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={onReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={onReset} handleSubmit={handleSubmit} />;
}; };
export default BusinessLogSearchBar; export default BusinessLogSearchBar;

8
src/components/ServiceManage/searchBar/CaliumRequestSearchBar.js
View File

@@ -72,15 +72,9 @@ const CaliumRequestSearchBar = ({ handleSearch, setResultData }) => {
))} ))}
</SelectInput> </SelectInput>
</>, </>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={handleReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} direction={'column'} onReset={handleReset} handleSubmit={handleSubmit} />;
}; };
export default CaliumRequestSearchBar; export default CaliumRequestSearchBar;

9
src/components/ServiceManage/searchBar/DataInitSearchBar.js
View File

@@ -117,16 +117,9 @@ const DataInitSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ end_dt: date }, false)} handleEndDate={date => onSearch({ end_dt: date }, false)}
/> />
</>, </>,
<></>,<></>,<></>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={onReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} direction={'column'} onReset={onReset} handleSubmit={handleSubmit} />;
}; };
export default DataInitSearchBar; export default DataInitSearchBar;

9
src/components/ServiceManage/searchBar/EventListSearchBar.js
View File

@@ -89,15 +89,8 @@ const EventListSearchBar = ({ handleSearch, setResultData }) => {
))} ))}
</SelectInput> </SelectInput>
</>, </>,
<></>,<></>,<></>,<></>,<></>,<></>,<></>,<></>,<></>,<></>,<></>,<></>,<></>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={handleReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={handleReset} handleSubmit={handleSubmit} />;
}; };
export default EventListSearchBar; export default EventListSearchBar;

8
src/components/ServiceManage/searchBar/ItemsSearchBar.js
View File

@@ -114,14 +114,8 @@ const ItemsSearchBar = ({ handleSearch, setResultData }) => {
maxDate={new Date()} maxDate={new Date()}
/> />
</>, </>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={handleReset} />
<Button theme="search" text="검색" type="submit" handleClick={handleSubmit} />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={handleReset} handleSubmit={handleSubmit} />;
}; };
export default ItemsSearchBar; export default ItemsSearchBar;

9
src/components/ServiceManage/searchBar/LandAuctionSearchBar.js
View File

@@ -191,15 +191,8 @@ const LandAuctionSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ auctionEndDate: date }, false)} handleEndDate={date => onSearch({ auctionEndDate: date }, false)}
/> />
</>, </>,
<></>,<></>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={onReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={onReset} handleSubmit={handleSubmit} />;
}; };
export default LandAuctionSearchBar; export default LandAuctionSearchBar;

9
src/components/ServiceManage/searchBar/LandInfoSearchBar.js
View File

@@ -187,15 +187,8 @@ const LandInfoSearchBar = ({ searchParams, onSearch, onReset }) => {
handleEndDate={date => onSearch({ endDate: date }, false)} handleEndDate={date => onSearch({ endDate: date }, false)}
/> />
</>, </>,
<></>,<></>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={onReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={onReset} handleSubmit={handleSubmit} />;
}; };
export default LandInfoSearchBar; export default LandInfoSearchBar;

6
src/components/UserManage/LogViewSearchBar.js → src/components/ServiceManage/searchBar/LogViewSearchBar.js
View File

@@ -1,9 +1,9 @@
import { styled } from 'styled-components'; import { styled } from 'styled-components';
import { useState } from 'react'; import { useState } from 'react';
import { TextInput, InputLabel, SelectInput, BtnWrapper } from '../../styles/Components'; import { TextInput, InputLabel, SelectInput, BtnWrapper } from '../../../styles/Components';
import Button from '../common/button/Button'; import Button from '../../common/button/Button';
import { SearchBarLayout, SearchPeriod } from '../common/SearchBar'; import { SearchBarLayout, SearchPeriod } from '../../common/SearchBar';
const LogViewSearchBar = ({ handleSearch, resultData }) => { const LogViewSearchBar = ({ handleSearch, resultData }) => {
const [searchData, setSearchData] = useState({ const [searchData, setSearchData] = useState({

8
src/components/ServiceManage/searchBar/MailListSearchBar.js
View File

@@ -130,14 +130,8 @@ const MailListSearchBar = ({ handleSearch, setResultData }) => {
))} ))}
</SelectInput> </SelectInput>
</>, </>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={handleReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={handleReset} handleSubmit={handleSubmit} />;
}; };
export default MailListSearchBar; export default MailListSearchBar;

8
src/components/ServiceManage/searchBar/ReportListSearchBar.js
View File

@@ -123,14 +123,8 @@ const ReportListSearchBar = ({ handleSearch, setResultData }) => {
<TextInput placeholder="입력" onChange={e => setSearchData({ ...searchData, searchKey: e.target.value })} /> <TextInput placeholder="입력" onChange={e => setSearchData({ ...searchData, searchKey: e.target.value })} />
</InputGroup> </InputGroup>
</>, </>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={handleReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={handleReset} handleSubmit={handleSubmit} />;
}; };
export default ReportListSearchBar; export default ReportListSearchBar;

8
src/components/ServiceManage/searchBar/UserBlockSearchBar.js
View File

@@ -104,14 +104,8 @@ const UserBlockSearchBar = ({ handleSearch, setResultData }) => {
))} ))}
</SelectInput> </SelectInput>
</>, </>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={handleReset} />
<Button theme="search" text="검색" type="submit" handleClick={handleSubmit} />
</BtnWrapper>
</>,
]; ];
return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} />; return <SearchBarLayout firstColumnData={searchList} secondColumnData={optionList} direction={'column'} onReset={handleReset} handleSubmit={handleSubmit} />;
}; };
export default UserBlockSearchBar; export default UserBlockSearchBar;

86
src/components/UserManage/CaliumRequestSearchBar.js
View File

@@ -1,86 +0,0 @@
import { TextInput, BtnWrapper, InputLabel, SelectInput } from '../../styles/Components';
import Button from '../common/button/Button';
import { SearchBarLayout, SearchPeriod } from '../common/SearchBar';
import { useState } from 'react';
import { caliumStatus } from '../../assets/data/options';
const CaliumRequestSearchBar = ({ handleSearch, setResultData }) => {
const [searchData, setSearchData] = useState({
content: '',
status: 'ALL',
startDate: '',
endDate: '',
});
const handleSubmit = event => {
event.preventDefault();
handleSearch(
searchData.content,
searchData.status ? searchData.status : 'ALL',
searchData.startDate ? searchData.startDate : '',
searchData.endDate ? searchData.endDate : new Date(),
(searchData.startDate && searchData.endDate === '') && setSearchData({ startDate : searchData.startDate ,endDate : new Date()}),
);
setResultData(searchData);
};
const handleReset = () => {
setSearchData({
content: '',
status: 'ALL',
startDate: '',
endDate: '',
order: 'DESC',
});
handleSearch('', 'ALL', '', '');
setResultData('', 'ALL', '', '');
window.location.reload();
};
const searchList = [
<>
<InputLabel>등록 일자</InputLabel>
<SearchPeriod
startDate={searchData.startDate}
handleStartDate={data => {
setSearchData({ ...searchData, startDate: data });
}}
endDate={searchData.endDate}
handleEndDate={data => setSearchData({ ...searchData, endDate: data })}
/>
</>,
<>
<InputLabel>요청 내용</InputLabel>
<TextInput
type="text"
placeholder="요청 내용"
value={searchData.content}
onChange={e => setSearchData({ ...searchData, content: e.target.value })}
/>
</>,
<>
<InputLabel>요청 상태</InputLabel>
<SelectInput value={searchData.status} onChange={e => setSearchData({ ...searchData, status: e.target.value })}>
{caliumStatus.map((data, index) => (
<option key={index} value={data.value}>
{data.name}
</option>
))}
</SelectInput>
</>,
<>
<BtnWrapper $gap="8px">
<Button theme="reset" handleClick={handleReset} type="button" />
<Button theme="search" text="검색" handleClick={handleSubmit} type="submit" />
</BtnWrapper>
</>,
];
return <SearchBarLayout firstColumnData={searchList} direction={'column'} />;
};
export default CaliumRequestSearchBar;

6
src/components/UserManage/index.js
View File

@@ -1,17 +1,11 @@
import CaliumRequestSearchBar from './CaliumRequestSearchBar';
import CaliumRequestRegistModal from './CaliumRequestRegistModal' import CaliumRequestRegistModal from './CaliumRequestRegistModal'
import AdminViewSearchBar from './AdminViewSearchBar'
import AuthRegistBar from './AuthRegistBar' import AuthRegistBar from './AuthRegistBar'
import LogViewModal from './LogViewModal' import LogViewModal from './LogViewModal'
import LogViewSearchBar from './LogViewSearchBar'
import AuthGroupRows from './AuthGroupRows' import AuthGroupRows from './AuthGroupRows'
export { export {
CaliumRequestSearchBar,
CaliumRequestRegistModal, CaliumRequestRegistModal,
AdminViewSearchBar,
AuthRegistBar, AuthRegistBar,
LogViewSearchBar,
LogViewModal, LogViewModal,
AuthGroupRows AuthGroupRows
} }

37
src/components/common/SearchBar/SearchBarLayout.js
View File

@@ -1,7 +1,8 @@
import { styled } from 'styled-components'; import { styled } from 'styled-components';
import { TextInput, SelectInput, SearchBarAlert } from '../../../styles/Components'; import { TextInput, SelectInput, SearchBarAlert, BtnWrapper } from '../../../styles/Components';
import Button from '../button/Button';
const SearchBarLayout = ({ firstColumnData, secondColumnData, direction }) => { const SearchBarLayout = ({ firstColumnData, secondColumnData, direction, onReset, handleSubmit }) => {
return ( return (
<SearchbarStyle direction={direction}> <SearchbarStyle direction={direction}>
<SearchRow> <SearchRow>
@@ -16,6 +17,12 @@ const SearchBarLayout = ({ firstColumnData, secondColumnData, direction }) => {
))} ))}
</SearchRow> </SearchRow>
)} )}
<SearchRow>
<BtnWrapper $gap="8px">
<Button theme="search" text="검색" handleClick={handleSubmit} type="button" />
<Button theme="reset" handleClick={onReset} type="button" />
</BtnWrapper>
</SearchRow>
</SearchbarStyle> </SearchbarStyle>
); );
}; };
@@ -23,16 +30,16 @@ const SearchBarLayout = ({ firstColumnData, secondColumnData, direction }) => {
export default SearchBarLayout; export default SearchBarLayout;
const SearchbarStyle = styled.div` const SearchbarStyle = styled.div`
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
font-size: 14px; font-size: 14px;
padding: 20px; padding: 20px;
border-top: 1px solid #000; border-radius: 8px;
border-bottom: 1px solid #000; border: 1px solid #ddd;
margin: 0 0 40px; margin: 0 0 40px;
flex-flow: ${props => props.direction}; flex-flow: ${props => props.direction};
gap: ${props => (props.direction === 'column' ? '20px' : '20px 0')}; gap: ${props => (props.direction === 'column' ? '20px' : '20px 0')};
`; `;
const SearchItem = styled.div` const SearchItem = styled.div`
@@ -54,4 +61,10 @@ const SearchRow = styled.div`
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
gap: 20px 0; gap: 20px 0;
&:last-child {
border-top: 1px solid #e0e0e0;
padding-top: 15px;
margin-top: 15px;
}
`; `;

2
src/pages/UserManage/AdminView.js
View File

@@ -7,7 +7,7 @@ import Pagination from '../../components/common/Pagination/Pagination';
import Modal from '../../components/common/modal/Modal'; import Modal from '../../components/common/modal/Modal';
import { AdminViewList, AdminViewGroupList, AdminLoginApprove, AdminDeleteUser, AdminChangeGroup, AdminChangePw } from '../../apis/Admin'; import { AdminViewList, AdminViewGroupList, AdminLoginApprove, AdminDeleteUser, AdminChangeGroup, AdminChangePw } from '../../apis/Admin';
import AdminViewSearchBar from '../../components/UserManage/AdminViewSearchBar'; import {AdminViewSearchBar} from '../../components/ServiceManage';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { authList } from '../../store/authList'; import { authList } from '../../store/authList';

3
src/pages/UserManage/CaliumRequest.js
View File

@@ -19,10 +19,11 @@ import {
} from '../../styles/ModuleComponents'; } from '../../styles/ModuleComponents';
import {Button, ExcelDownButton, Pagination, DynamicModal, ViewTableInfo, Loading} from '../../components/common'; import {Button, ExcelDownButton, Pagination, DynamicModal, ViewTableInfo, Loading} from '../../components/common';
import { convertKTC, truncateText } from '../../utils'; import { convertKTC, truncateText } from '../../utils';
import { CaliumRequestRegistModal, CaliumRequestSearchBar } from '../../components/UserManage'; import { CaliumRequestRegistModal } from '../../components/UserManage';
import { CaliumCharge, CaliumRequestView } from '../../apis'; import { CaliumCharge, CaliumRequestView } from '../../apis';
import { withAuth } from '../../hooks/hook'; import { withAuth } from '../../hooks/hook';
import { convertEndDateToISO, convertStartDateToISO } from '../../utils/date'; import { convertEndDateToISO, convertStartDateToISO } from '../../utils/date';
import {CaliumRequestSearchBar} from '../../components/ServiceManage';
const CaliumRequest = () => { const CaliumRequest = () => {
const token = sessionStorage.getItem('token'); const token = sessionStorage.getItem('token');

2
src/pages/UserManage/LogView.js
View File

@@ -1,6 +1,6 @@
import { Fragment, useState, useEffect } from 'react'; import { Fragment, useState, useEffect } from 'react';
import LogViewSearchBar from '../../components/UserManage/LogViewSearchBar'; import {LogViewSearchBar} from '../../components/ServiceManage';
import { Title, FormWrapper, SelectInput, TableInfo, ListCount, ListOption, TableStyle, BtnWrapper, ButtonClose, ModalText } from '../../styles/Components'; import { Title, FormWrapper, SelectInput, TableInfo, ListCount, ListOption, TableStyle, BtnWrapper, ButtonClose, ModalText } from '../../styles/Components';
import Button from '../../components/common/button/Button'; import Button from '../../components/common/button/Button';
import Pagination from '../../components/common/Pagination/Pagination'; import Pagination from '../../components/common/Pagination/Pagination';