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

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

@@ -11,8 +11,6 @@ const FlightPlanAprvGrid = ({
   handleClickAprv,
   joinList,
   selectGroup,
-  selPlanSnoList,
-  setSelPlanSnoList,
   handleChangeCheckbox
 }) => {
   const [aprvAuth, setAprvAuth] = useState('');
@@ -49,24 +47,13 @@ const FlightPlanAprvGrid = ({
     {
       id: 'planSno',
       name: '번호',
-      cell: (row, i) => (
-        <>
-          <CustomInput
-            type='checkbox'
-            id={`check${i + 1}`}
-            name={`check${i + 1}`}
-            // checked={checkState}
-            onChange={e => handleChangeCheckbox(e, row)}
-          />
-          <div>{i + 1}</div>
-        </>
-      )
+      cell: (row, i) => <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,10 +129,9 @@ const FlightPlanAprvGrid = ({
                   columns={columns}
                   count={!!data ? data.length : 0}
                   // pagination={props.pagination}
-                  selectableRows //체크박스 할거다
+                  selectableRows
                   selectableRowsComponent={selectableRowsComponent}
                   onSelectedRowsChange={handleChangeSelected}
-                  // onSelectedRowsChange={handleChangeCheckbox}
                 />
                 {/* 검색된 데이터가 없습니다. */}
               </div>

src/components/crud/grid/GridDatatable.js

@@ -14,33 +14,35 @@ export const GridDatabase = props => {
     <div className='no-dataTable'>표시할 데이터가 없습니다.</div>
   ) : (
     <>
-      <DataTable
-        noHeader
-        pagination={props.pagination}
-        paginationTotalRows={props.total}
-        // paginationServer
-        subHeader={false}
-        columns={props.columns}
-        responsive={true}
-        sortIcon={<ChevronDown />}
-        className='react-dataTable pal-dateTable'
-        // defaultSortField='invoiceId'
-        // paginationDefaultPage={currentPage}
-        // paginationComponent={CustomPagination}
-        data={props.data}
-        paginationServer={
-          props.pagination && props.handlerPageChange ? true : false
-        }
-        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 className='junh_eee'>
+        <DataTable
+          noHeader
+          pagination={props.pagination}
+          paginationTotalRows={props.total}
+          // paginationServer
+          subHeader={false}
+          columns={props.columns}
+          responsive={true}
+          sortIcon={<ChevronDown />}
+          className='react-dataTable pal-dateTable'
+          // defaultSortField='invoiceId'
+          // paginationDefaultPage={currentPage}
+          // paginationComponent={CustomPagination}
+          data={props.data}
+          paginationServer={
+            props.pagination && props.handlerPageChange ? true : false
+          }
+          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

@@ -3,15 +3,15 @@ import React from 'react';
 
 export const selectableRowsComponent = React.forwardRef(
   ({ onClick, ...rest }, ref) => {
-    console.log(rest);
     return (
-      <CustomInput
-        id='check'
-        type='checkbox'
-        // forwardref={ref}
-        onClick={onClick}
-        {...rest}
-      />
+      <>
+        <CustomInput
+          id={new Date().getTime() + Math.random()}
+          type='checkbox'
+          onClick={onClick}
+          {...rest}
+        />
+      </>
     );
   }
 );

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

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