From df36bc2d8c851598b0fa54150c085772f4e357ff Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 15 May 2023 13:40:53 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=ED=8E=98=EC=9D=B4=EC=A7=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/biz/cmm/cmmCarCrackdownCntPopup.jsp | 7 ++- .../fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp | 7 ++- .../biz/cmm/cmmCtznComplaintHistPopup.jsp | 14 ++++- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 36 +++++++++++-- .../fims/biz/cmm/cmmIntegratedSearchForm.jsp | 7 ++- .../biz/ec/ecCctvCrackdownFileSelPopup.jsp | 7 ++- .../fims/biz/ec/ecCctvCrackdownMgtForm.jsp | 9 ++-- .../jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp | 7 ++- .../biz/ec/ecNatlNewspaperFileSelPopup.jsp | 7 ++- .../fims/biz/ec/ecNatlNewspaperMgtForm.jsp | 7 ++- .../fims/biz/rt/rtCrackdownMgtMainForm.jsp | 21 ++++++-- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 7 ++- .../jsp/fims/biz/rt/rtRegltMgtForm.jsp | 7 ++- .../biz/cmm/answer/cmmAnsTmplForm.jsp | 7 ++- .../biz/mng/admin/mngConectionLogMgtForm.jsp | 7 ++- .../biz/mng/auth/mngAuthAuthorMgtForm.jsp | 7 ++- .../biz/mng/auth/mngAuthByUserMgtForm.jsp | 7 ++- .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 7 ++- .../biz/mng/auth/mngAuthHierarchyMgtForm.jsp | 7 ++- .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 7 ++- .../biz/mng/auth/mngAuthRoleMgtForm.jsp | 7 ++- .../biz/mng/bbs/mngBoardBasicMgtForm.jsp | 7 ++- .../biz/mng/bbs/mngBoardCreateMgtForm.jsp | 7 ++- .../biz/mng/bbs/mngBoardCreateSchPopup.jsp | 7 ++- .../biz/mng/bbs/mngBoardTmplMgtForm.jsp | 7 ++- .../biz/mng/bbs/mngBoardUseMgtForm.jsp | 7 ++- .../biz/mng/code/mngCodeCfnMgtForm.jsp | 7 ++- .../biz/mng/code/mngCodeDtlMgtForm.jsp | 7 ++- .../biz/mng/code/mngCodeGrpMgtForm.jsp | 7 ++- .../biz/mng/code/mngZipCodeMgtForm.jsp | 7 ++- .../biz/mng/menu/mngMenuByRoleMgtForm.jsp | 7 ++- .../framework/biz/mng/menu/mngMenuMgtForm.jsp | 7 ++- .../biz/mng/menu/mngProgramMgtForm.jsp | 7 ++- .../biz/mng/menu/mngProgramSchPopup.jsp | 7 ++- .../framework/biz/mng/usr/mngUserMgtForm.jsp | 7 ++- .../jsp/template/fims/templateForm.jsp | 7 ++- .../js/fims/biz/common/popupPageNavigation.js | 51 +++++++++---------- 37 files changed, 283 insertions(+), 72 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp index 0e67b688..b5dd4968 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCarCrackdownCntPopup.jsp @@ -58,7 +58,12 @@ Date Author Description $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp index 97ebdb3c..d4538e78 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp @@ -88,7 +88,12 @@ Date Author Description $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp index 6c1bc483..1a30153a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCtznComplaintHistPopup.jsp @@ -81,7 +81,12 @@ Date Author Description $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); @@ -136,7 +141,12 @@ Date Author Description $2$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $2$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $2$Control._paginationInfo.totalCount = pagination.totalCount; + $2$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $2$Control._paginationInfo.totalCount = obj.count; + } $2$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp index 27cbd756..a079fa97 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp @@ -711,7 +711,13 @@ Date Author Description $1$Control.onDatasetChange = obj => { if(obj.data.pagination != null){ let pagination = obj.data.pagination; - $1$Control._paginationInfo.pageNum = pagination.pageNum; + + if(obj.data.pagination){ + $1$Control._paginationInfo.totalCount = pagination.totalCount; + $1$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $1$Control._paginationInfo.totalCount = obj.count; + } } $1$Control.totalCountSetting(obj); @@ -734,7 +740,12 @@ Date Author Description $2$Control.onDatasetChange = obj => { if(obj.data.pagination != null) { let pagination = obj.data.pagination; - $2$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $2$Control._paginationInfo.totalCount = pagination.totalCount; + $2$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $2$Control._paginationInfo.totalCount = obj.count; + } } $2$Control.totalCountSetting(obj); @@ -756,7 +767,12 @@ Date Author Description $3$Control.onDatasetChange = obj => { if(obj.data.pagination != null) { let pagination = obj.data.pagination; - $3$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $3$Control._paginationInfo.totalCount = pagination.totalCount; + $3$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $3$Control._paginationInfo.totalCount = obj.count; + } } $3$Control.totalCountSetting(obj); @@ -778,7 +794,12 @@ Date Author Description $4$Control.onDatasetChange = obj => { if(obj.data.pagination != null) { let pagination = obj.data.pagination; - $4$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $4$Control._paginationInfo.totalCount = pagination.totalCount; + $4$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $4$Control._paginationInfo.totalCount = obj.count; + } } $4$Control.totalCountSetting(obj); @@ -800,7 +821,12 @@ Date Author Description $5$Control.onDatasetChange = obj => { if(obj.data.pagination != null) { let pagination = obj.data.pagination; - $5$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $5$Control._paginationInfo.totalCount = pagination.totalCount; + $5$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $5$Control._paginationInfo.totalCount = obj.count; + } } $5$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp index af5e8835..a4004150 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp @@ -287,7 +287,12 @@ Date Author Description $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp index 9726cd62..27a816fc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp @@ -76,7 +76,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp index 604586a7..9560f447 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp @@ -72,10 +72,13 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - console.log("리턴"); - console.log(obj.data.pagination); - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp index d5f5aad1..6b170d7e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp @@ -87,7 +87,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp index 1c08eba9..ef51987e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp @@ -74,7 +74,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp index ba20e701..1fbed05a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp @@ -71,7 +71,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp index a5cdecaf..ddbacb08 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp @@ -221,7 +221,12 @@ Date Author Description $1$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $1$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $1$Control._paginationInfo.totalCount = pagination.totalCount; + $1$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $1$Control._paginationInfo.totalCount = obj.count; + } $1$Control.totalCountSetting(obj); @@ -246,7 +251,12 @@ Date Author Description $2$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $2$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $2$Control._paginationInfo.totalCount = pagination.totalCount; + $2$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $2$Control._paginationInfo.totalCount = obj.count; + } $2$Control.totalCountSetting(obj); @@ -271,7 +281,12 @@ Date Author Description $3$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $3$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $3$Control._paginationInfo.totalCount = pagination.totalCount; + $3$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $3$Control._paginationInfo.totalCount = obj.count; + } $3$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp index c794ca59..a3f09363 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp @@ -214,7 +214,12 @@ Date Author Description $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp index 43bfb4f1..72e0b791 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp @@ -74,7 +74,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp index be9536ff..2631f838 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/answer/cmmAnsTmplForm.jsp @@ -93,7 +93,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp index 034f7ff5..d686781e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/mngConectionLogMgtForm.jsp @@ -68,7 +68,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index 5fa013c2..1f837336 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -70,7 +70,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp index e8f15ee3..503cf9f0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp @@ -72,7 +72,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp index 30421478..e164ac3e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp @@ -69,7 +69,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp index 90034b24..9e4df3d5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp @@ -71,7 +71,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index adaee345..63dca69d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -76,7 +76,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp index f861ac97..8b618cff 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp @@ -70,7 +70,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp index cae1fe26..3f2e8a18 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardBasicMgtForm.jsp @@ -80,7 +80,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp index dd21975b..017ac3e9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp @@ -72,7 +72,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp index 458d113e..60cacf6b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp @@ -75,7 +75,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp index ba553745..83f69eb1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp @@ -74,7 +74,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp index 49141bf4..c1666e97 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp @@ -71,7 +71,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp index 8cb13501..5b68414f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeCfnMgtForm.jsp @@ -71,7 +71,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp index de60e98f..abb68741 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeDtlMgtForm.jsp @@ -85,7 +85,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp index 71169309..f232cd26 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngCodeGrpMgtForm.jsp @@ -79,7 +79,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp index bcdf33ff..e6ed7afe 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/mngZipCodeMgtForm.jsp @@ -78,7 +78,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp index 616602ca..4816ccce 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp @@ -62,7 +62,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp index d6710c95..91a98508 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngMenuMgtForm.jsp @@ -76,7 +76,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp index 86689937..e5acaa83 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramMgtForm.jsp @@ -72,7 +72,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp index 0873d418..c597c86d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/mngProgramSchPopup.jsp @@ -75,7 +75,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp index 96a488e2..93e5335a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtForm.jsp @@ -80,7 +80,12 @@ $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp index 21c78769..77d1e4b2 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/templateForm.jsp @@ -100,7 +100,12 @@ Date Author Description $$Control.onDatasetChange = obj => { let pagination = obj.data.pagination; - $$Control._paginationInfo.pageNum = pagination.pageNum; + if(obj.data.pagination){ + $$Control._paginationInfo.totalCount = pagination.totalCount; + $$Control._paginationInfo.pageNum = pagination.pageNum; + } else { + $$Control._paginationInfo.totalCount = obj.count; + } $$Control.totalCountSetting(obj); diff --git a/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js b/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js index 8aeff8af..e5026599 100644 --- a/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js +++ b/src/main/webapp/resources/js/fims/biz/common/popupPageNavigation.js @@ -14,9 +14,9 @@ class PageNavigation { // 현재 데이타 위치 ,gridDataPos: null // 현재 page - ,page: null + ,pageNum: null // 페이지당 갯수 - ,perPage: null + ,fetchSize: null // 전체 데이타 count ,totalCount: null // 페이지 이동 구분 @@ -31,32 +31,29 @@ class PageNavigation { */ constructor(GRID, gridDatas, gridDataPos) { let pageInfo = { - page: 1, - perPage: null, + pageNum: 1, + fetchSize: null, totalCount: null - } + }; // pageOptions type에 따라 paging 정보 위치가 달라 분기 처리 - if(GRID.store.data.pageOptions.type === 'scroll'){ - //const {page, perPage, totalCount} = GRID.store.data.pageOptions; - const {page, perPage, totalCount} = GRID.store.data.pageOptions; - pageInfo.page = page; - pageInfo.perPage = perPage; + if(GRID.paginationInfoRef.pagingYn === true){ + const {pageNum, fetchSize, totalCount} = GRID.paginationInfoRef; + pageInfo.pageNum = pageNum; + pageInfo.fetchSize = fetchSize; pageInfo.totalCount = totalCount; - }else{ - const {itemsPerPage, totalItems} = GRID.getPagination()._options; - pageInfo.page = GRID.getPagination()._currentPage; - pageInfo.perPage = itemsPerPage; - pageInfo.totalCount = totalItems; + pageInfo.fetchSize = GRID.paginationInfoRef.totalCount; + pageInfo.totalCount = GRID.paginationInfoRef.totalCount; } this.gridInfo = { + gridDatas ,gridDataPos ,curRowData: gridDatas[gridDataPos] - ,curRowPos: (pageInfo.page - 1) * pageInfo.perPage + gridDataPos + 1 - ,page: pageInfo.page - ,perPage: pageInfo.perPage + ,curRowPos: (pageInfo.pageNum - 1) * pageInfo.fetchSize + gridDataPos + 1 + ,pageNum: pageInfo.pageNum + ,fetchSize: pageInfo.fetchSize ,totalCount: pageInfo.totalCount ,pageMove: null ,next: null @@ -74,7 +71,7 @@ class PageNavigation { resetGrid(res, gridDatas, callback) { this.grid.resetData(res.data?.contents); if (this.gridInfo.next) this.pageNav = new PageNavigation(this.grid, gridDatas, 0); - else this.pageNav = new PageNavigation(this.grid, gridDatas, this.gridInfo.perPage - 1); + else this.pageNav = new PageNavigation(this.grid, gridDatas, this.gridInfo.fetchSize - 1); callback(this.pageNav) } @@ -105,15 +102,15 @@ class PageNavigation { * @param {function} callback 페이지 이동시 호출할 callback */ onClickNavBtn(evDiv, callback) { - const isTypeScroll = this.grid.store?.data.pageOptions.type === 'scroll'; + const isTypeScroll = this.grid.paginationInfoRef?.pagingType === 'scroll'; if (evDiv === 'next') { - if(this.gridInfo.gridDataPos + 1 === this.gridInfo.perPage){ + if(this.gridInfo.gridDataPos + 1 === this.gridInfo.fetchSize){ this.gridInfo.pageMove = true; this.gridInfo.next = true; - this.gridInfo.page++; - //isTypeScroll ? GRID.store.data.pageOptions.pageMove(this.gridInfo.page) : - if(!isTypeScroll) this.grid.getPagination()?.movePageTo(this.gridInfo.page); + this.gridInfo.pageNum++; + if(!isTypeScroll) + this.grid.getPagination()?.movePageTo(this.gridInfo.pageNum); }else{ this.gridInfo.curRowPos++; @@ -126,9 +123,9 @@ class PageNavigation { if(this.gridInfo.gridDataPos === 0){ this.gridInfo.pageMove = true; this.gridInfo.next = false; - this.gridInfo.page--; - //isTypeScroll ? GRID.store.data.pageOptions.pageMove?(this.gridInfo.page) : - if(!isTypeScroll) this.grid.getPagination()?.movePageTo(this.gridInfo.page); + this.gridInfo.pageNum--; + if(!isTypeScroll) + this.grid.getPagination()?.movePageTo(this.gridInfo.pageNum); }else { this.gridInfo.curRowPos--;