From a6ccd78ad12adbba3b7e660715d55121712aa137 Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Thu, 21 Nov 2024 13:17:28 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/management/Stuff.jsx           | 64 +++++++++++--------
 .../management/StuffSearchCondition.jsx       |  8 ++-
 src/store/stuffAtom.js                        |  2 +
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx
index e6b281c4..1fc1bc47 100644
--- a/src/components/management/Stuff.jsx
+++ b/src/components/management/Stuff.jsx
@@ -172,8 +172,7 @@ export default function Stuff() {
         schDateType: stuffSearchParams.schDateType,
         schFromDt: dayjs(new Date()).add(-1, 'year').format('YYYY-MM-DD'),
         schToDt: dayjs(new Date()).format('YYYY-MM-DD'),
-        startRow: (pageNo - 1) * pageSize + 1,
-        // endRow: pageNo * pageSize,
+        startRow: (stuffSearch.pageNo - 1) * stuffSearchParams.pageSize + 1,
         endRow: stuffSearchParams?.endRow,
         schSelSaleStoreId: stuffSearchParams?.schSelSaleStoreId ? stuffSearchParams.schSelSaleStoreId : '',
         schOtherSelSaleStoreId: stuffSearchParams?.schOtherSelSaleStoreId ? stuffSearchParams.schOtherSelSaleStoreId : '',
@@ -219,6 +218,7 @@ export default function Stuff() {
       stuffSearchParams.endRow = 1 * pageSize
       stuffSearchParams.schSortType = defaultSortType
       setPageNo(1)
+      stuffSearchParams.pageNo = 1
 
       async function fetchData() {
         const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
@@ -241,6 +241,7 @@ export default function Stuff() {
       stuffSearchParams.endRow = 1 * pageSize
       stuffSearchParams.schSortType = defaultSortType
       setPageNo(1)
+
       async function fetchData() {
         const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
         await get({ url: apiUrl }).then((res) => {
@@ -262,31 +263,31 @@ export default function Stuff() {
   const onChangePerPage = (e) => {
     let startRow = (1 - 1) * e.target.value + 1
     stuffSearchParams.startRow = startRow
-    stuffSearchParams.endRow = 1 * e.target.value
+    stuffSearchParams.endRow = stuffSearchParams.pageNo * e.target.value
     stuffSearchParams.schSelSaleStoreId = stuffSearchParams?.schOtherSelSaleStoreId
       ? stuffSearchParams.schOtherSelSaleStoreId
       : stuffSearchParams.schSelSaleStoreId
     setPageSize(e.target.value)
     setStuffSearch({
-      // ...stuffSearchParams,
       ...stuffSearch,
       code: 'S',
       startRow: startRow,
-      endRow: 1 * e.target.value,
+      endRow: stuffSearchParams.pageNo * e.target.value,
+      pageSize: e.target.value,
     })
 
     setPageNo(1)
 
-    const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
-    get({ url: apiUrl }).then((res) => {
-      if (!isEmptyArray(res)) {
-        setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
-        setTotalCount(res[0].totCnt)
-      } else {
-        setGridProps({ ...gridProps, gridData: [], count: 0 })
-        setTotalCount(0)
-      }
-    })
+    // const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
+    // get({ url: apiUrl }).then((res) => {
+    //   if (!isEmptyArray(res)) {
+    //     setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
+    //     setTotalCount(res[0].totCnt)
+    //   } else {
+    //     setGridProps({ ...gridProps, gridData: [], count: 0 })
+    //     setTotalCount(0)
+    //   }
+    // })
   }
 
   //최근 등록일 수정일 정렬 이벤트
@@ -309,16 +310,16 @@ export default function Stuff() {
     })
 
     setPageNo(1)
-    const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
-    get({ url: apiUrl }).then((res) => {
-      if (!isEmptyArray(res)) {
-        setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
-        setTotalCount(res[0].totCnt)
-      } else {
-        setGridProps({ ...gridProps, gridData: [], count: 0 })
-        setTotalCount(0)
-      }
-    })
+    // const apiUrl = `/api/object/list?saleStoreId=${session?.storeId}&${queryStringFormatter(stuffSearchParams)}`
+    // get({ url: apiUrl }).then((res) => {
+    //   if (!isEmptyArray(res)) {
+    //     setGridProps({ ...gridProps, gridData: res, count: res[0].totCnt })
+    //     setTotalCount(res[0].totCnt)
+    //   } else {
+    //     setGridProps({ ...gridProps, gridData: [], count: 0 })
+    //     setTotalCount(0)
+    //   }
+    // })
   }
 
   useEffect(() => {
@@ -340,6 +341,7 @@ export default function Stuff() {
       code: 'S',
       startRow: (page - 1) * pageSize + 1,
       endRow: page * pageSize,
+      pageNo: page,
     })
 
     setPageNo(page)
@@ -368,7 +370,8 @@ export default function Stuff() {
               </select>
             </div>
             <div className="select-box" style={{ width: '80px' }}>
-              <select className="select-light black" onChange={onChangePerPage} defaultValue={stuffSearch.endRow}>
+              <select className="select-light black" onChange={onChangePerPage} defaultValue={stuffSearch.pageSize}>
+                {/* <select className="select-light black" onChange={onChangePerPage} defaultValue={stuffSearch.endRow}> */}
                 <option value="100">100</option>
                 <option value="200">200</option>
                 <option value="300">300</option>
@@ -380,7 +383,14 @@ export default function Stuff() {
           <div className="q-grid">
             <StuffQGrid {...gridProps} getCellDoubleClicked={getCellDoubleClicked} gridRef={gridRef} />
             <div className="pagination-wrap">
-              <QPagination pageNo={pageNo} pageSize={pageSize} pagePerBlock={10} totalCount={totalCount} handleChangePage={handleChangePage} />
+              {/* <QPagination pageNo={pageNo} pageSize={pageSize} pagePerBlock={10} totalCount={totalCount} handleChangePage={handleChangePage} /> */}
+              <QPagination
+                pageNo={stuffSearch.pageNo}
+                pageSize={stuffSearch.pageSize}
+                pagePerBlock={10}
+                totalCount={totalCount}
+                handleChangePage={handleChangePage}
+              />
             </div>
           </div>
         </div>
diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index ee038366..a1085beb 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -95,6 +95,8 @@ export default function StuffSearchCondition() {
         startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1,
         endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100,
         schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R',
+        pageNo: stuffSearch?.pageNo,
+        pageSize: stuffSearch?.pageSize,
       })
     } else if (stuffSearch.code === 'FINISH') {
       setStuffSearch({
@@ -128,9 +130,11 @@ export default function StuffSearchCondition() {
         schFromDt: startDate ? dayjs(startDate).format('YYYY-MM-DD') : '',
         schToDt: endDate ? dayjs(endDate).format('YYYY-MM-DD') : '',
         code: 'E',
-        startRow: 1,
-        endRow: 100,
+        startRow: stuffSearch?.startRow ? stuffSearch.startRow : 1,
+        endRow: stuffSearch?.endRow ? stuffSearch.endRow : 100,
         schSortType: stuffSearch?.schSortType ? stuffSearch.schSortType : 'R',
+        pageNo: stuffSearch?.pageNo,
+        pageSize: stuffSearch?.pageSize,
       })
     }
   }
diff --git a/src/store/stuffAtom.js b/src/store/stuffAtom.js
index b18fca77..1608beac 100644
--- a/src/store/stuffAtom.js
+++ b/src/store/stuffAtom.js
@@ -19,6 +19,8 @@ export const stuffSearchState = atom({
     startRow: 1,
     endRow: 100,
     schSortType: 'R', //정렬조건 (R:최근등록일 U:최근수정일)
+    pageNo: 1,
+    pageSize: 100,
   },
   dangerouslyAllowMutability: true,
 })