From 042e1a198200e6f652a6be37e1cc0951c3aaf13a Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 17 Jul 2023 15:19:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=EB=A7=81=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 --- .../webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp | 12 ++++++++++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp | 12 ++++++++++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp | 12 ++++++++++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 12 ++++++++++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp | 13 ++++++++++--- .../webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp | 12 ++++++++++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp | 12 ++++++++++-- src/main/webapp/WEB-INF/jsp/index.jsp | 12 ++++++------ 8 files changed, 76 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index 2848b2b2..a86c73fe 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -137,7 +137,8 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.scrollable = true; + /************************************************************************** * DatasetControl **************************************************************************/ @@ -199,12 +200,17 @@ $(document).ready(function(){ } $P.scrollEnd = (obj) => { + if(!$P.scrollable){ + return; + } + var el = $(obj); if(el.scrollTop() == 0){ return; } - if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + $P.scrollable = false; $P.scrollCrdnList(); } } @@ -236,6 +242,8 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + + $P.scrollable = true; } $P.getParams = () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index 76d66214..402acbd1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -153,7 +153,8 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.scrollable = true; + /************************************************************************** * DatasetControl **************************************************************************/ @@ -216,12 +217,17 @@ $(document).ready(function(){ } $P.scrollEnd = (obj) => { + if(!$P.scrollable){ + return; + } + var el = $(obj); if(el.scrollTop() == 0){ return; } - if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + $P.scrollable = false; $P.scrollCrdnList(); } } @@ -253,6 +259,8 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + + $P.scrollable = true; } $P.getParams = () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index 236b621c..2a495cf6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -110,7 +110,8 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.scrollable = true; + /************************************************************************** * DatasetControl **************************************************************************/ @@ -215,12 +216,17 @@ $(document).ready(function(){ } $P.scrollEnd = (obj) => { + if(!$P.scrollable){ + return; + } + var el = $(obj); if(el.scrollTop() == 0){ return; } - if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + $P.scrollable = false; $P.scrollCrdnList(); } } @@ -250,6 +256,8 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + + $P.scrollable = true; } $P.getParams = () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index c81c746b..470c2928 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -223,7 +223,8 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.scrollable = true; + /************************************************************************** * DatasetControl **************************************************************************/ @@ -328,12 +329,17 @@ $(document).ready(function(){ } $P.scrollEnd = (obj) => { + if(!$P.scrollable){ + return; + } + var el = $(obj); if(el.scrollTop() == 0){ return; } - if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + $P.scrollable = false; $P.scrollCrdnList(); } } @@ -374,6 +380,8 @@ $(document).ready(function(){ $("#crdnTbody--${pageName}").html(trs.join()); fn_securityModeToggle($("#securityMode--top").is(":checked")); //보안모드 + + $P.scrollable = true; } $P.getParams = () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index 5dd771be..8113d3ac 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -335,7 +335,8 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.scrollable = true; + /************************************************************************** * DatasetControl **************************************************************************/ @@ -486,12 +487,17 @@ $(document).ready(function(){ } $P.scrollEnd = (obj) => { + if(!$P.scrollable){ + return; + } + var el = $(obj); if(el.scrollTop() == 0){ return; } - if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + $P.scrollable = false; $P.scrollInspectionDataList(); } } @@ -620,7 +626,8 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - + + $P.scrollable = true; } $P.getParams = () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp index 2ac3bafb..42972761 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp @@ -118,7 +118,8 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.scrollable = true; + /************************************************************************** * DatasetControl **************************************************************************/ @@ -172,12 +173,17 @@ $(document).ready(function(){ } $P.scrollEnd = (obj) => { + if(!$P.scrollable){ + return; + } + var el = $(obj); if(el.scrollTop() == 0){ return; } - if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + $P.scrollable = false; $P.scrollCrdnList(); } } @@ -211,6 +217,8 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + + $P.scrollable = true; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp index 8f28e7b5..279cc86b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp @@ -130,7 +130,8 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + $P.scrollable = true; + /************************************************************************** * DatasetControl **************************************************************************/ @@ -193,12 +194,17 @@ $(document).ready(function(){ } $P.scrollEnd = (obj) => { + if(!$P.scrollable){ + return; + } + var el = $(obj); if(el.scrollTop() == 0){ return; } - if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ + if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){ + $P.scrollable = false; $P.scrollCrdnList(); } } @@ -232,6 +238,8 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); + + $P.scrollable = true; } $P.getParams = () => { diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index 35e9ddb4..aecc465b 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -50,25 +50,25 @@ return 'FIREFOX'; } else if (agent.indexOf('EDG') >= 0) { return 'EDGE'; - } else if (agent.indexOf('SAFARI') >= 0) { - return 'SAFARI'; } else if (agent.indexOf('CHROME') >= 0) { return 'CHROME'; + } else if (agent.indexOf('SAFARI') >= 0) { + return 'SAFARI'; } else { return ''; } } const BROWSER_NAME = getBrowserName(); - var VERTICAL_SCROLL_HEIGHT = 15; + var VERTICAL_SCROLL_HEIGHT = 14; switch(BROWSER_NAME){ case "EDGE" : - VERTICAL_SCROLL_HEIGHT = 15; + VERTICAL_SCROLL_HEIGHT = 14; break; case "FIREFOX" : - VERTICAL_SCROLL_HEIGHT = 17; + VERTICAL_SCROLL_HEIGHT = 15; break; case "CHROME" : - VERTICAL_SCROLL_HEIGHT = 17; + VERTICAL_SCROLL_HEIGHT = 15; break; }