From 80bddc52c7eb584f5f1d91ed9b2a1cb9ff0c2c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Thu, 6 Oct 2022 16:30:36 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=95=20-=20=EC=8A=B9=EC=9D=B8=EA=B4=80=EB=A6=AC/=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=EA=B4=80=EB=A6=AC/=EA=B8=B0=EC=B2=B4?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/dron/BasisDronGrid.js | 5 +- .../basis/dron/BasisGroupDronGrid.js | 25 +- .../basis/group/BasisGroupApprovalGrid.js | 11 +- .../basis/group/BasisGroupApprovalSearch.js | 2 +- .../basis/group/BasisGroupUsersGrid.js | 2 + .../basis/group/BasisGroupUsersSearch.js | 2 +- .../basis/dron/BasisDronContainer.js | 16 +- .../group/BasisGroupApprovalContainer.js | 75 ++---- .../basis/group/BasisGroupUsersContainer.js | 234 +++++++----------- 9 files changed, 130 insertions(+), 242 deletions(-) diff --git a/src/components/basis/dron/BasisDronGrid.js b/src/components/basis/dron/BasisDronGrid.js index 42d7e399..a18bbc56 100644 --- a/src/components/basis/dron/BasisDronGrid.js +++ b/src/components/basis/dron/BasisDronGrid.js @@ -24,7 +24,7 @@ import { ExcelExportButton } from '../../crud/excel/ExcelExportButton'; export const BasisDronGrid = props => { return ( <> -
+

{props.subTitle} 기체목록

검색결과 총 {props.count}건 @@ -47,6 +47,9 @@ export const BasisDronGrid = props => { data={props.data} count={props.count} columns={props.columns} + pagination={props.pagination} + paginationPerPage={props.paginationPerPage} + paginationRowsPerPageOptions={props.paginationRowsPerPageOptions} />
diff --git a/src/components/basis/dron/BasisGroupDronGrid.js b/src/components/basis/dron/BasisGroupDronGrid.js index 91b4c211..5ae84f4e 100644 --- a/src/components/basis/dron/BasisGroupDronGrid.js +++ b/src/components/basis/dron/BasisGroupDronGrid.js @@ -1,25 +1,5 @@ import { GridDatabase } from '../../crud/grid/GridDatatable'; -import { - Row, - Col, - Table, - Badge, - UncontrolledDropdown, - DropdownMenu, - DropdownItem, - DropdownToggle, - Card, - CardHeader, - CardBody, - CardTitle, - CardSubtitle, - ButtonGroup, - Button, - Input, - CustomInput, - FormGroup -} from 'reactstrap'; -import { ExcelExportButton } from '../../crud/excel/ExcelExportButton'; +import { Card } from 'reactstrap'; export const BasisGroupDronGrid = props => { return ( @@ -39,6 +19,9 @@ export const BasisGroupDronGrid = props => { data={props.data} count={props.count} columns={props.columns} + pagination={props.pagination} + paginationPerPage={props.paginationPerPage} + paginationRowsPerPageOptions={props.paginationRowsPerPageOptions} />
diff --git a/src/components/basis/group/BasisGroupApprovalGrid.js b/src/components/basis/group/BasisGroupApprovalGrid.js index 4a6645e5..170c630e 100644 --- a/src/components/basis/group/BasisGroupApprovalGrid.js +++ b/src/components/basis/group/BasisGroupApprovalGrid.js @@ -32,15 +32,6 @@ export const BasisGroupApprovalGrid = props => {

{props.title} 목록

검색결과 총 {props.count}건
- {/*
- - 그룹생성 - -
*/}
@@ -51,6 +42,8 @@ export const BasisGroupApprovalGrid = props => { count={props.count} columns={props.columns} pagination={props.pagination} + paginationPerPage={props.paginationPerPage} + paginationRowsPerPageOptions={props.paginationRowsPerPageOptions} />
diff --git a/src/components/basis/group/BasisGroupApprovalSearch.js b/src/components/basis/group/BasisGroupApprovalSearch.js index a4aee472..e4bcb75c 100644 --- a/src/components/basis/group/BasisGroupApprovalSearch.js +++ b/src/components/basis/group/BasisGroupApprovalSearch.js @@ -114,7 +114,7 @@ export const BasisGroupApprovalSearch = props => {
-
+

검색조건

diff --git a/src/components/basis/group/BasisGroupUsersGrid.js b/src/components/basis/group/BasisGroupUsersGrid.js index 705b9e97..ac765d0e 100644 --- a/src/components/basis/group/BasisGroupUsersGrid.js +++ b/src/components/basis/group/BasisGroupUsersGrid.js @@ -31,6 +31,8 @@ export const BasisGroupUsersGrid = props => { count={props.count} columns={props.columns} pagination={props.pagination} + paginationPerPage={props.paginationPerPage} + paginationRowsPerPageOptions={props.paginationRowsPerPageOptions} />
diff --git a/src/components/basis/group/BasisGroupUsersSearch.js b/src/components/basis/group/BasisGroupUsersSearch.js index d13d75d6..31a725f7 100644 --- a/src/components/basis/group/BasisGroupUsersSearch.js +++ b/src/components/basis/group/BasisGroupUsersSearch.js @@ -31,7 +31,7 @@ export const BasisGroupUsersSearch = props => {
-
+

검색조건

diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index 5deb859a..46045bc4 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/src/containers/basis/dron/BasisDronContainer.js @@ -224,7 +224,8 @@ export const BasisDronContainer = props => { /> */}
- + {/* */} + {user ? ( <> { {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN' ? { count: groupListCount } : { count: joinListCount })} - pagination={false} + pagination={true} + paginationPerPage={5} + paginationRowsPerPageOptions={[5, 10, 15, 20]} /> ) : ( <> )} - + {/* */} + {!selectData ? ( -
+
그룹 목록에서 상세보기를 클릭하세요.
) : ( @@ -256,7 +260,9 @@ export const BasisDronContainer = props => { columns={dronColumns} count={count} handlerGroupCreate={handlerGroupCreate} - pagination={false} + pagination={true} + paginationPerPage={10} + paginationRowsPerPageOptions={[10, 20, 30, 40]} /> )} diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 2cc6a6a8..0f6db84b 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -48,7 +48,6 @@ export const BasisGroupApprovalContainer = props => { return row?.groupId; } }, - { name: '', // selector: 'cntrlStDate', @@ -188,15 +187,15 @@ export const BasisGroupApprovalContainer = props => { } }, - { - name: '그룹 코드', - selector: row => row.groupId, - minWidth: '102px', - sortable: true, - cell: row => { - return row?.groupId; - } - }, + // { + // name: '그룹 코드', + // selector: row => row.groupId, + // minWidth: '102px', + // sortable: true, + // cell: row => { + // return row?.groupId; + // } + // }, { name: '신청자 명', selector: row => row.memberName, @@ -284,48 +283,6 @@ export const BasisGroupApprovalContainer = props => { 승인취소 ); - - // const my = groupList?.find((prev, idx) => { - // if (prev.groupId === row?.groupId) { - // return prev; - // } - // }); - // let disa = false; - - // if (user.authId === 'SUPER') { - // console.log('super'); - // // { - // // } - // } else if (user.authId === 'ADMIN' || user.authId === 'USER') { - // if (my?.groupAuthCd === 'NORMAL') { - // console('ㅇㄹㄴㅇㄹ'); - // disa = true; - // } - // // } else if(user.authId === 'USER') { - // // if(my.groupAuthCd === 'NORMAL') { - // // disabled = true; - // // } - // } - - // return row?.aprvlYn === 'N' ? ( - // handlerAprvConfirm(row?.cstmrGroupSno)} - // disabled={disa} - // > - // 승인처리 - // - // ) : ( - // handlerCancelConfirm(row?.cstmrGroupSno)} - // disabled={disa} - // > - // 승인취소 - // - // ); } } ]; @@ -385,7 +342,7 @@ export const BasisGroupApprovalContainer = props => {
- + {/* @@ -400,16 +357,18 @@ export const BasisGroupApprovalContainer = props => { {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN' ? { count: groupListCount } : { count: joinListCount })} - pagination={false} + pagination={true} + paginationPerPage={5} + paginationRowsPerPageOptions={[5, 10, 15, 20]} /> ) : ( <> )} - + {!selectData ? ( -
+
그룹 목록에서 상세보기를 클릭하세요.
) : ( @@ -426,7 +385,9 @@ export const BasisGroupApprovalContainer = props => { title={titleName} columns={columns} count={aprvCount} - pagination={false} + pagination={true} + paginationPerPage={10} + paginationRowsPerPageOptions={[10, 20, 30, 40]} /> )} diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 969df250..d70f25ca 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -52,7 +52,7 @@ export const BasisGroupUsersContainer = props => { { name: '그룹명', selector: row => row.groupNm, - minWidth: '102px', + // minWidth: '102px', sortable: true, cell: row => { return row?.groupNm; @@ -61,7 +61,7 @@ export const BasisGroupUsersContainer = props => { { name: '그룹 코드', selector: row => row.groupId, - minWidth: '102px', + // minWidth: '102px', sortable: true, cell: row => { return row?.groupId; @@ -162,178 +162,108 @@ export const BasisGroupUsersContainer = props => { minWidth: '250px', sortable: false, cell: row => { - const my = joinList?.find((prev, idx) => { - if (prev.groupId === row?.groupId) { - return prev; - } - }); - let m_disabled = false; - let l_disabled = false; - let n_disabled = false; - - if (user.authId === 'SUPER') { - { - } - } else if (user.authId === 'ADMIN') { - if (my.groupAuthCd === 'MASTER') { - if (row.groupAuthCd === 'LEADER') { - l_disabled = true; - } else if (row.groupAuthCd === 'NORMAL') { - m_disabled = true; - n_disabled = true; + let master = false; + let leader = false; + let normal = false; + + if (user.authId === 'ADMIN') { + //모든 그룹 조회 가능 + const my = groupList?.find(prev => { + if (prev.groupId === row?.groupId) { + return prev; + } + }); + if (my?.groupAuthCd === 'MASTER') { + if (row?.groupAuthCd === 'MASTER') { + // + } else if (row?.groupAuthCd === 'LEADER') { + leader = true; + } else if (row?.groupAuthCd === 'NORMAL') { + master = true; + normal = true; } - } else if (my.groupAuthCd === 'LEADER') { - if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') { - m_disabled = true; - l_disabled = true; - n_disabled = true; - } else if (row.groupAuthCd === 'NORMAL') { - m_disabled = true; - n_disabled = true; + } else if (my?.groupAuthCd === 'LEADER') { + if (row?.groupAuthCd === 'MASTER') { + master = true; + leader = true; + normal = true; + } else if (row?.groupAuthCd === 'LEADER') { + master = true; + leader = true; + } else if (row?.groupAuthCd === 'NORMAL') { + master = true; + normal = true; } - } else { - //내 권한이 마스터도 리더도 아니니까 우리그룹이 아님 - m_disabled = true; - l_disabled = true; - n_disabled = true; + } else if (my?.groupAuthCd === 'NORMAL') { + //아.. 내 그룹 아니면 권한 다 NORMAL로 임시부여했지.. + master = true; + leader = true; + normal = true; } - // } else if (user.authId === 'ROLE_USER') { } else if (user.authId === 'USER') { - if (my.groupAuthCd === 'MASTER') { - if (row.groupAuthCd === 'LEADER') { - l_disabled = true; - } else if (row.groupAuthCd === 'NORMAL') { - m_disabled = true; - n_disabled = true; + //본인 그룹 조회 가능 + const my = joinList?.find(prev => { + if (prev.groupId === row?.groupId) { + return prev; } - } else if (my.groupAuthCd === 'LEADER') { - if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') { - m_disabled = true; - l_disabled = true; - n_disabled = true; - } else if (row.groupAuthCd === 'NORMAL') { - m_disabled = true; - n_disabled = true; + }); + if (my?.groupAuthCd === 'MASTER') { + if (row?.groupAuthCd === 'LEADER') { + leader = true; + } else if (row?.groupAuthCd === 'NORMAL') { + master = true; + normal = true; + } + } else if (my?.groupAuthCd === 'LEADER') { + if (row?.groupAuthCd === 'MASTER') { + master = true; + leader = true; + normal = true; + } else if (row?.groupAuthCd === 'LEADER') { + master = true; + leader = true; + normal = true; + } else if (row?.groupAuthCd === 'NORMAL') { + master = true; + normal = true; } } } - const master = ( + return ( <> handlerMaster(row?.cstmrGroupSno, my?.cstmrGroupSno) } - disabled={m_disabled} + disabled={master} > MASTER - - ); - - const leader = ( - <> handlerLeader(row?.cstmrGroupSno)} - disabled={l_disabled} + disabled={leader} > LEADER - - ); - - const normal = ( - <> handlerNormal(row?.cstmrGroupSno)} - disabled={n_disabled} + disabled={normal} > NORMAL ); - - return ( - <> - {master} - {leader} - {normal} - - ); - - // const my = joinList?.find((prev, idx) => { - // if (prev.groupId === row?.groupId) { - // return prev; - // } - // }); - - // if (row?.groupAuthCd === 'MASTER') { - // return
수정불가
; - // } else if (row?.groupAuthCd === 'LEADER') { - // if (my?.groupAuthCd === 'MASTER') { - // return ( - // handlerUserConfirm(row?.cstmrGroupSno)} - // > - // NORMAL - // - // ); - // } else { - // return
수정불가
; - // } - // } else if (row?.groupAuthCd === 'NORMAL') { - // if (my?.groupAuthCd === 'MASTER' || my?.groupAuthCd === 'LEADER') { - // return ( - // handlerAdminConfirm(row?.cstmrGroupSno)} - // > - // LEADER - // - // ); - // } - // } } } - // { - // name: '위임 하기', - // // minWidth: '102px', - // sortable: false, - // cell: row => { - // const my = joinList?.find((prev, idx) => { - // if (prev.groupId === row?.groupId) { - // return prev; - // } - // }); - - // if (row?.groupAuthCd === 'LEADER') { - // if (my?.groupAuthCd === 'MASTER') { - // return ( - // - // handlerCreaterConfirm(row?.cstmrGroupSno, my?.cstmrGroupSno) - // } - // > - // MASTER - // - // ); - // } - // } - // } - // } ]; useEffect(() => { @@ -378,9 +308,9 @@ export const BasisGroupUsersContainer = props => { const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => { if ( - groupAuthCd === 'MASTER' || user.authId === 'SUPER' || user.authId === 'ADMIN' || + groupAuthCd === 'MASTER' || (aprvlYn === 'Y' && groupAuthCd === 'LEADER') ) { dispatch(Actions.SELECT({ groupId: groupId, groupNm, groupNm })); @@ -419,6 +349,9 @@ export const BasisGroupUsersContainer = props => { desc: '해당 사용자를 운영자 권한으로 변경 하시겠습니까?' }); + if (user.authId === 'SUPER' || user.authId === 'ADMIN') { + } + setSaveData({ cstmrGroupSno: cstmrGroupSno, joinYn: 'Y', @@ -487,7 +420,8 @@ export const BasisGroupUsersContainer = props => {
- + {/* */} + {user ? ( <> { {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN' ? { count: groupListCount } : { count: joinListCount })} - pagination={false} + pagination={true} + paginationPerPage={5} + paginationRowsPerPageOptions={[5, 10, 15, 20]} /> ) : ( <> )} - + {/* */} + {selectData ? ( <> { onKeyPress={onKeyPress} setParams={setParams} /> - + /> */} ) : ( -
+
그룹 목록에서 상세보기를 클릭하세요.
)} - {/* + {/* */} + {selectData ? ( { columns={userColumns} count={userCount} pagination={false} + paginationPerPage={10} + paginationRowsPerPageOptions={[10, 20, 30, 40]} /> ) : (
)} - */} +