From fe08d04dafb13fcdaf705f5a80daf8a17eaf028e Mon Sep 17 00:00:00 2001
From: JANGHYUNn <kimjh2369@gmail.com>
Date: Thu, 23 Nov 2023 16:22:42 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C(=EB=93=9C?=
 =?UTF-8?q?=EB=A1=A0=20=EB=B3=84=20=EB=B9=84=ED=96=89=EC=9A=B4=ED=95=AD=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D)=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/crud/grid/GridDatatable.js     |  5 +-
 .../dashboard/DroneFlightSchedule.js          | 88 +++++++++++--------
 2 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/components/crud/grid/GridDatatable.js b/src/components/crud/grid/GridDatatable.js
index 3185aab9..5dd45483 100644
--- a/src/components/crud/grid/GridDatatable.js
+++ b/src/components/crud/grid/GridDatatable.js
@@ -10,6 +10,7 @@ import {
 import { selectableRowsComponent } from './selectableRowsComponent';
 
 export const GridDatabase = props => {
+  console.log(props.rowsPerPageText);
   return props[`${props.handlerPageChange ? 'total' : 'count'}`] <= 0 ? (
     <div className='d-flex justify-content-center align-items-center h-100'>
       <p>표시할 데이터가 없습니다.</p>
@@ -39,7 +40,9 @@ export const GridDatabase = props => {
           }
           onChangePage={props.pagination ? props.handlerPageChange : null}
           paginationComponentOptions={{
-            noRowsPerPage: props.handlerPageChange ? true : false
+            noRowsPerPage: props.handlerPageChange ? true : false,
+            rowsPerPageText:
+              props.rowsPerPageText === 'noText' ? '' : 'Rows per page:'
           }}
           selectableRows={props.selectableRows}
           selectableRowsComponent={props.selectableRowsComponent}
diff --git a/src/components/dashboard/DroneFlightSchedule.js b/src/components/dashboard/DroneFlightSchedule.js
index d73e80a3..9e28cacb 100644
--- a/src/components/dashboard/DroneFlightSchedule.js
+++ b/src/components/dashboard/DroneFlightSchedule.js
@@ -120,47 +120,57 @@ export default function DroneFlightSchedule({
   const { dronOperationList } = useSelector(state => state.mainDashState);
 
   return (
-    <Card>
-      <CardHeader className=''>
-        <div className='w-100 d-flex justify-content-between'>
-          <CardTitle tag='h4'>드론 별 비행운항 목록</CardTitle>
-          <div className='d-flex align-items-center'>
-            {user?.cptAuthCode === 'KAC' ||
-              (user?.authId === 'SUPER' && (
-                <Input
-                  id='groupSelect'
-                  type='select'
-                  size='sm'
-                  style={{ minWidth: '120px' }}
-                  s
-                  onChange={e => {
-                    const { value } = e.target;
-                    handlerDronOperationChange(value);
-                  }}
-                >
-                  <option value='all'>그룹선택</option>
-                  {competentAgency?.map(i => (
-                    <option value={i.value}>{i.text}</option>
+    <div className='invoice-list-wrapper'>
+      <Card>
+        <div className='invoice-list-dataTable'>
+          <CardHeader className=''>
+            <div className='w-100 d-flex justify-content-between'>
+              <CardTitle tag='h4'>드론 별 비행운항 목록</CardTitle>
+              <div className='d-flex align-items-center'>
+                {user?.cptAuthCode === 'KAC' ||
+                  (user?.authId === 'SUPER' && (
+                    <Input
+                      id='groupSelect'
+                      type='select'
+                      size='sm'
+                      style={{ minWidth: '120px' }}
+                      s
+                      onChange={e => {
+                        const { value } = e.target;
+                        handlerDronOperationChange(value);
+                      }}
+                    >
+                      <option value='all'>그룹선택</option>
+                      {competentAgency?.map(i => (
+                        <option value={i.value}>{i.text}</option>
+                      ))}
+                    </Input>
                   ))}
-                </Input>
-              ))}
 
-            <button
-              onClick={() => handlerMovePage('/basis/flight/schedule/index')}
-              style={{ marginLeft: '8px' }}
-            >
-              <Plus />
-            </button>
-          </div>
+                <button
+                  onClick={() =>
+                    handlerMovePage('/basis/flight/schedule/index')
+                  }
+                  style={{ marginLeft: '8px' }}
+                >
+                  <Plus />
+                </button>
+              </div>
+            </div>
+          </CardHeader>
+          <CardBody>
+            <GridDatabase
+              data={dronOperationList || []}
+              paginationPerPage={8}
+              paginationRowsPerPageOptions={[]}
+              rowsPerPageText={'noText'}
+              total={dronOperationList?.length || 0}
+              columns={columns}
+              pagination
+            />
+          </CardBody>
         </div>
-      </CardHeader>
-      <CardBody>
-        <GridDatabase
-          data={dronOperationList || []}
-          count={dronOperationList?.length || 0}
-          columns={columns}
-        />
-      </CardBody>
-    </Card>
+      </Card>
+    </div>
   );
 }