From acd20600f11dbdbd7b044fbc85f9563b9e6a8a75 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: Wed, 5 Oct 2022 14:07:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=98=EC=9D=98=EA=B7=B8=EB=A3=B9=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20Grid=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/group/BasisGroupGrid.js | 18 ++++---- .../basis/group/BasisGroupMyGrid.js | 46 +++++++++++++++++++ .../group/BasisGroupApprovalContainer.js | 10 ++-- .../basis/group/BasisGroupContainer.js | 4 +- .../basis/group/BasisGroupUsersContainer.js | 18 ++------ .../system/auth/SystemAuthContainer.js | 1 - .../system/code/SystemCodeContainer.js | 1 - .../system/menu/SystemMenuContainer.js | 1 - .../system/user/SystemUserContainer.js | 1 - 9 files changed, 67 insertions(+), 33 deletions(-) create mode 100644 src/components/basis/group/BasisGroupMyGrid.js diff --git a/src/components/basis/group/BasisGroupGrid.js b/src/components/basis/group/BasisGroupGrid.js index 7b4e112..b65debb 100644 --- a/src/components/basis/group/BasisGroupGrid.js +++ b/src/components/basis/group/BasisGroupGrid.js @@ -1,5 +1,5 @@ import { GridDatabase } from '../../crud/grid/GridDatatable'; -import { Card } from 'reactstrap'; +import { Card, Row, Col, Button } from 'reactstrap'; export const BasisGroupGrid = props => { return ( @@ -13,14 +13,14 @@ export const BasisGroupGrid = props => { 검색결과 총 {props.count}건 {/*
- - 그룹생성 - -
*/} + + 그룹생성 + + */}
diff --git a/src/components/basis/group/BasisGroupMyGrid.js b/src/components/basis/group/BasisGroupMyGrid.js new file mode 100644 index 0000000..c058cdc --- /dev/null +++ b/src/components/basis/group/BasisGroupMyGrid.js @@ -0,0 +1,46 @@ +import { GridDatabase } from '../../crud/grid/GridDatatable'; +import { Card, Row, Col, Button } from 'reactstrap'; + +export const BasisGroupMyGrid = props => { + return ( +
+ + + <> +
+
+

{props.title} 목록

+ 검색결과 총 {props.count}건 +
+
+ + 그룹생성 + +
+
+
+ + {/*
+
Loading...
+
*/} +
+ +
+ +
+ + + +
+ ); +}; diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index be4fe80..def4eca 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -6,9 +6,8 @@ import { BasisGroupApprovalSearch } from '../../../components/basis/group/BasisG import { CustomMainLayout } from '../../../components/layout/CustomMainLayout'; import { ConfirmModal } from '../../../components/modal/ConfirmModal'; import * as Actions from '../../../modules/basis/group/actions/basisGroupAction'; -import * as GroupActions from '../../../modules/basis/group/actions/basisGroupAction'; -import { BasisGroupDronGrid } from '../../../components/basis/dron/BasisGroupDronGrid'; import { InfoModal } from '../../../components/modal/InfoModal'; +import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid'; export const BasisGroupApprovalContainer = props => { const { aprvList, aprvCount } = useSelector(state => state.groupState); @@ -135,8 +134,8 @@ export const BasisGroupApprovalContainer = props => { aprvYn: 'A' }); dispatch( - GroupActions.JOIN_LIST.request({ - // Actions.JOIN_LIST.request({ + // GroupActions.JOIN_LIST.request({ + Actions.JOIN_LIST.request({ cstmrSno: user?.cstmrSno, groupId: selectData?.groupId }) @@ -357,7 +356,8 @@ export const BasisGroupApprovalContainer = props => {
- { params={params} setParams={setParams} /> */} - { sortable: true, cell: row => { return row?.groupNm; - // return selectData; } }, { @@ -178,11 +177,7 @@ export const BasisGroupUsersContainer = props => { n_disabled = true; } } else if (my.groupAuthCd === 'LEADER') { - if (row.groupAuthCd === 'MASTER') { - m_disabled = true; - l_disabled = true; - n_disabled = true; - } else if (row.groupAuthCd === 'LEADER') { + if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') { m_disabled = true; l_disabled = true; n_disabled = true; @@ -196,7 +191,8 @@ export const BasisGroupUsersContainer = props => { l_disabled = true; n_disabled = true; } - } else if (user.authId === 'ROLE_USER') { + // } else if (user.authId === 'ROLE_USER') { + } else if (user.authId === 'USER') { if (my.groupAuthCd === 'MASTER') { if (row.groupAuthCd === 'LEADER') { l_disabled = true; @@ -205,11 +201,7 @@ export const BasisGroupUsersContainer = props => { n_disabled = true; } } else if (my.groupAuthCd === 'LEADER') { - if (row.groupAuthCd === 'MASTER') { - m_disabled = true; - l_disabled = true; - n_disabled = true; - } else if (row.groupAuthCd === 'LEADER') { + if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') { m_disabled = true; l_disabled = true; n_disabled = true; @@ -495,7 +487,7 @@ export const BasisGroupUsersContainer = props => { title={'그룹'} columns={columns} count={joinListCount} - pagination={true} + // pagination={true} /> diff --git a/src/containers/system/auth/SystemAuthContainer.js b/src/containers/system/auth/SystemAuthContainer.js index 157afe3..c50115b 100644 --- a/src/containers/system/auth/SystemAuthContainer.js +++ b/src/containers/system/auth/SystemAuthContainer.js @@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom'; import { CustomMainLayout } from '../../../components/layout/CustomMainLayout'; import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch'; -import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid'; import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid'; import { Badge, Button } from 'reactstrap'; import { ConfirmModal } from '../../../components/modal/ConfirmModal'; diff --git a/src/containers/system/code/SystemCodeContainer.js b/src/containers/system/code/SystemCodeContainer.js index 2be7eed..07427f1 100644 --- a/src/containers/system/code/SystemCodeContainer.js +++ b/src/containers/system/code/SystemCodeContainer.js @@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom'; import { CustomMainLayout } from '../../../components/layout/CustomMainLayout'; import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch'; -import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid'; import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid'; import { Row, Badge, Button } from 'reactstrap'; import { ConfirmModal } from '../../../components/modal/ConfirmModal'; diff --git a/src/containers/system/menu/SystemMenuContainer.js b/src/containers/system/menu/SystemMenuContainer.js index 6251c57..ca77201 100644 --- a/src/containers/system/menu/SystemMenuContainer.js +++ b/src/containers/system/menu/SystemMenuContainer.js @@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom'; import { CustomMainLayout } from '../../../components/layout/CustomMainLayout'; import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch'; -import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid'; import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid'; import { Row, Badge, Button } from 'reactstrap'; import { ConfirmModal } from '../../../components/modal/ConfirmModal'; diff --git a/src/containers/system/user/SystemUserContainer.js b/src/containers/system/user/SystemUserContainer.js index 9174ff8..18c0c7d 100644 --- a/src/containers/system/user/SystemUserContainer.js +++ b/src/containers/system/user/SystemUserContainer.js @@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom'; import { CustomMainLayout } from '../../../components/layout/CustomMainLayout'; import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch'; -import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid'; import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid'; import { Badge, Button } from 'reactstrap'; import { ConfirmModal } from '../../../components/modal/ConfirmModal';