From 656fc1b6128cb931bc1cd071498dab163763081a Mon Sep 17 00:00:00 2001
From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com>
Date: Mon, 24 Jun 2024 10:42:47 +0900
Subject: [PATCH] =?UTF-8?q?fit=20:=20=EC=A1=B0=ED=9A=8C=EA=B1=B4=EC=88=98?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=A0=9C=ED=92=88=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=84=A0=ED=83=9D=EC=9E=90=EB=A3=8C=20?=
 =?UTF-8?q?=EC=83=89=20=ED=91=9C=EC=B6=9C=20=ED=95=98=EB=8A=94=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/adds/nims/bssh-popup.jsp      | 27 +++++++++-------
 .../WEB-INF/jsp/adds/nims/product-popup.jsp   | 31 +++++++++++--------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp
index a9ae41d..164a823 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp
@@ -71,6 +71,11 @@
 		</div>
 	</div>
 </div>
+<div class="d-flex flex-row p-3 justify-content-between">
+    <label id="${infoPrefix}Paging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
+    <ul id="${infoPrefix}Paging--${pageName}" class="pagination pagination-primary" style="display: none;">
+    </ul>
+</div>
 
 <script>
 	/**************************************************************************
@@ -110,7 +115,7 @@
 		});
 		
 		// $P.control 설정
-		$P.control.defaultFetchSize = FETCH_XXL;									// 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30
+		$P.control.defaultFetchSize = FETCH_XXS;									// 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30
 		$P.control.untilPageNum = 0;											// 현재 페이지 번호
 		$P.control.beforeCurrent = null;
 		$P.control.tableRenderComplete = false;									// dataTables 에 자료 추가 완료 여부
@@ -123,15 +128,15 @@
 			$P.control.onDatasetChange = (obj) => {
 				$P.renderList(obj.${infoPrefix}Total);
 
-				$("#paging--${pageName}").setPaging({
-					  list: $P.control.dataset
-					, prefix: "paging--${pageName}"
-					, start: obj.bsshPopupStart
-					, totalSize: obj.bsshPopupTotal
-					, fetchSize: obj.bsshPopupFetch
-					, func: "pageObject['${pageName}'].control.load({index})"
-				});
-
+	            $("#${infoPrefix}Paging--${pageName}").setPagingInfo({
+	                list: $P.control.dataset
+	                , prefix: "${infoPrefix}Paging--${pageName}"
+	                , start: obj.${infoPrefix}Start
+	                , totalSize: obj.${infoPrefix}Total
+	                , fetchSize: obj.${infoPrefix}Fetch
+	                , func: "pageObject['${pageName}'].control.load({index})"
+	            });
+	            
 				$P.control.tableRenderComplete = true;								// dataTables 에 자료 추가 완료
 			};
 
@@ -182,7 +187,7 @@
 			$("#tbody--${pageName}").html(trs.join());
 
 		    if ($P.control.untilPageNum != 0) {
-		    	$P.control.query.fetchSize = FETCH_XXL;
+		    	$P.control.query.fetchSize = $P.control.defaultFetchSize;
 		    	$P.control.query.pageNum = $P.control.untilPageNum;
 		    	$P.control.untilPageNum = 0;
 			}
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
index 5c8db56..b028bba 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
@@ -78,6 +78,11 @@
 		</div>
 	</div>
 </div>
+<div class="d-flex flex-row p-3 justify-content-between">
+    <label id="${infoPrefix}Paging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
+    <ul id="${infoPrefix}Paging--${pageName}" class="pagination pagination-primary" style="display: none;">
+    </ul>
+</div>
 
 <script>
 	/**************************************************************************
@@ -111,7 +116,7 @@
 					return false;
 				}
 				// 제품 목록
-				let keyCnt = 0; // key 설정 : 상품코드로는 불가하여 임시로 생성
+				let keyCnt = 1; // key 설정 : 상품코드로는 불가하여 임시로 생성
 				return obj.data?.map(item => {
 					// mnfSeqInfos 배열의 데이터 갯수만큼 반복문 실행
 					return item.mnfSeqInfos.map(info => ({
@@ -139,7 +144,7 @@
 		});
 		
 		// $P.control 설정
-		$P.control.defaultFetchSize = FETCH_XXL;									// 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30
+		$P.control.defaultFetchSize = FETCH_XXS;									// 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30
 		$P.control.untilPageNum = 0;											// 현재 페이지 번호
 		$P.control.beforeCurrent = null;
 		$P.control.tableRenderComplete = false;									// dataTables 에 자료 추가 완료 여부
@@ -152,15 +157,15 @@
 			$P.control.onDatasetChange = (obj) => {
 				$P.renderList(obj.${infoPrefix}Total);
 
-				$("#paging--${pageName}").setPaging({
-					  list: $P.control.dataset
-					, prefix: "paging--${pageName}"
-					, start: obj.productMainStart
-					, totalSize: obj.productMainTotal
-					, fetchSize: obj.productMainFetch
-					, func: "pageObject['${pageName}'].control.load({index})"
-				});
-
+	            $("#${infoPrefix}Paging--${pageName}").setPagingInfo({
+	                list: $P.control.dataset
+	                , prefix: "${infoPrefix}Paging--${pageName}"
+	                , start: obj.${infoPrefix}Start
+	                , totalSize: obj.${infoPrefix}Total
+	                , fetchSize: obj.${infoPrefix}Fetch
+	                , func: "pageObject['${pageName}'].control.load({index})"
+	            });
+	            
 				$P.control.tableRenderComplete = true;								// dataTables 에 자료 추가 완료
 			};
 
@@ -168,7 +173,8 @@
 		$P.control.onCurrentChange = item => {
 			if (!item) return;
 
-			$("#tbody--${pageName}").setCurrentRow(item.data.keyCnt);
+			let key = item.data.keyCnt;
+			$("#tbody--${pageName}").setCurrentRow(key);
 			// Dataset 셋팅
 			$P.formFields.set($P.control, item);
 		}
@@ -246,7 +252,6 @@
 				, onOK: () => {
 					let openPage = new AddsFormFields("#${openPage}");
 
-					console.log($P.control.getCurrent());
 					openPage.set (null,$P.control.getCurrent());						// formFields
 					dialog.close("productMainDialog");
 				}