Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/basis/flight/aprv/FlightPlanAprvGrid.js

@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Button, Card, Col, Row, CustomInput } from 'reactstrap';
 import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Link } from 'react-router-dom';
+import { selectableRowsComponent } from '../../../crud/grid/selectableRowsComponent';
 
 const FlightPlanAprvGrid = ({
   data,
@@ -10,8 +11,6 @@ const FlightPlanAprvGrid = ({
   handleClickAprv,
   joinList,
   selectGroup,
-  selPlanSnoList,
-  setSelPlanSnoList,
   handleChangeCheckbox
 }) => {
   const [aprvAuth, setAprvAuth] = useState('');
@@ -48,24 +47,13 @@ const FlightPlanAprvGrid = ({
     {
       id: 'planSno',
       name: '번호',
-      cell: (row, i) => (
+      cell: (row, i) => <div>{i + 1}</div>
-        <>
-          {/* <CustomInput
-            type='checkbox'
-            id={`check${i + 1}`}
-            name={`check${i + 1}`}
-            // checked={checkState}
-            onChange={e => handleChangeCheckbox(e, row)}
-          /> */}
-          <div>{i + 1}</div>
-        </>
-      )
     },
     {
       id: 'fltPurpose',
       name: '비행목적',
       minWidth: '150px',
-      cell: row => <div>{row.fltPurpose}</div>
+      cell: (row, i) => <div>{row.fltPurpose}</div>
     },
     {
       id: 'fltMethod',
@@ -142,6 +130,7 @@ const FlightPlanAprvGrid = ({
                   count={!!data ? data.length : 0}
                   // pagination={props.pagination}
                   selectableRows
+                  selectableRowsComponent={selectableRowsComponent}
                   onSelectedRowsChange={handleChangeSelected}
                 />
                 {/* 검색된 데이터가 없습니다. */}

src/components/crud/grid/GridDatatable.js

@@ -7,12 +7,14 @@ import {
   File,
   ChevronDown
 } from 'react-feather';
+import { selectableRowsComponent } from './selectableRowsComponent';
 
 export const GridDatabase = props => {
   return props[`${props.handlerPageChange ? 'total' : 'count'}`] <= 0 ? (
     <div className='no-dataTable'>표시할 데이터가 없습니다.</div>
   ) : (
     <>
+      <div className='junh_eee'>
         <DataTable
           noHeader
           pagination={props.pagination}
@@ -30,15 +32,17 @@ export const GridDatabase = props => {
           paginationServer={
             props.pagination && props.handlerPageChange ? true : false
           }
-        onSelectedRowsChange={
-          props.onSelectedRowsChange ? props.onSelectedRowsChange : null
-        }
-        selectableRows={props.selectableRows}
           onChangePage={props.pagination ? props.handlerPageChange : null}
           paginationComponentOptions={{
             noRowsPerPage: props.handlerPageChange ? true : false
           }}
+          selectableRows={props.selectableRows}
+          selectableRowsComponent={props.selectableRowsComponent}
+          onSelectedRowsChange={
+            props.onSelectedRowsChange ? props.onSelectedRowsChange : null
+          }
         />
+      </div>
     </>
   );
 };

src/components/crud/grid/selectableRowsComponent.js

@@ -0,0 +1,17 @@
+import { CustomInput, Input } from 'reactstrap';
+import React from 'react';
+
+export const selectableRowsComponent = React.forwardRef(
+  ({ onClick, ...rest }, ref) => {
+    return (
+      <>
+        <CustomInput
+          id={new Date().getTime() + Math.random()}
+          type='checkbox'
+          onClick={onClick}
+          {...rest}
+        />
+      </>
+    );
+  }
+);

src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@@ -173,29 +173,30 @@ const FlightPlanAprvContainer = () => {
     }));
   };
   const handleChangeSelected = ({ selectedRows }) => {
-    setSelPlanSnoList(selectedRows.map(item => item.planSno));
+    console.log(selectedRows);
+    setSelPlanSnoList(selectedRows?.map(item => item.planSno));
   };
-  const handleChangeCheckbox = (e, row) => {
+  // const handleChangeCheckbox = (e, row) => {
-    const { checked } = e.target;
+  //   const { checked } = e.target;
 
-    const dupli = selPlanSnoList?.find(prev => {
+  //   const dupli = selPlanSnoList?.find(prev => {
-      if (prev.planSno === row.planSno) {
+  //     if (prev.planSno === row.planSno) {
-        return true;
+  //       return true;
-      }
+  //     }
-    });
+  //   });
-    if (checked) {
+  //   if (checked) {
-      if (!dupli) {
+  //     if (!dupli) {
-        setSelPlanSnoList([...selPlanSnoList, row.planSno]);
+  //       setSelPlanSnoList([...selPlanSnoList, row.planSno]);
-      }
+  //     }
-    } else {
+  //   } else {
-      const list = selPlanSnoList.filter(prev => {
+  //     const list = selPlanSnoList.filter(prev => {
-        if (prev !== row.planSno) {
+  //       if (prev !== row.planSno) {
-          return prev;
+  //         return prev;
-        }
+  //       }
-      });
+  //     });
-      setSelPlanSnoList(list);
+  //     setSelPlanSnoList(list);
-    }
+  //   }
-  };
+  // };
   const handleClickAprv = type => e => {
     // notAprov, aprv
 
@@ -265,7 +266,7 @@ const FlightPlanAprvContainer = () => {
                   handleChangeSelected={handleChangeSelected}
                   selPlanSnoList={selPlanSnoList}
                   setSelPlanSnoList={setSelPlanSnoList}
-                  handleChangeCheckbox={handleChangeCheckbox}
+                  // handleChangeCheckbox={handleChangeCheckbox}
                 />
               </>
             ) : (

src/containers/basis/group/BasisGroupContainer.js

@@ -12,7 +12,7 @@ export const BasisGroupContainer = props => {
   const { myList, myListCount, mainList, mainListCount } = useSelector(
     state => state.groupState
   );
-    console.log(mainList);
+
   const { user } = useSelector(state => state.authState);
 
   const dispatch = useDispatch();

src/containers/basis/group/BasisGroupUsersContainer.js

@@ -191,12 +191,14 @@ export const BasisGroupUsersContainer = props => {
   }, []);
 
   const handlerSearch = () => {
+    if (params.cstmrSno && user?.cstmrSno) {
       dispatch(
         Actions.USER_LIST.request({
           searchParams: params,
           cstmrSno: user?.cstmrSno
         })
       );
+    }
   };
 
   const handlerAdminConfirm = cstmrGroupSno => {

src/modules/basis/group/reducers/basisGroupReducer.ts

@@ -33,7 +33,6 @@ export const groupReducer = createReducer<GroupState, Actions.GroupAction>(
   .handleAction(Actions.GROUP_MAIN_LIST.success, (state, action) =>
     produce(state, draft => {
       const { data, count } = action.payload;
-      console.log(data);
       // const agreeList = data.filter(res => {
       //   if (res.aprvlYn === 'Y') {
       //     return res;