From be40fb0c81bd701ce2be94a909dab372cb0e0727 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 17 Apr 2023 18:02:10 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=AA=A8=EB=8B=AC=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=EC=B0=BD=20=EB=86=92=EC=9D=B4=20=EC=88=98=EC=A0=95?= =?UTF-8?q?,=20tui=EA=B7=B8=EB=A6=AC=EB=93=9C=20=EC=98=A4=EB=A5=98=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 --- .../biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp | 6 +- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 58 +++++++++++-------- 2 files changed, 39 insertions(+), 25 deletions(-) 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 846edb63..0778d92b 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 @@ -1322,8 +1322,10 @@ Date Author Description } } - - + $("#popupTabs .nav-link").on("click", function(){ + let popupHeight = $("#wrap").height(); + $(window.frameElement).attr("height",popupHeight); + }); $(document).ready(function(){ initPopupGrid(); 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 24bbef43..aa66aea0 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 @@ -314,6 +314,9 @@ Date Author Description } } ,setDblClickEvent: function (idx) { + + ARR_GRID[idx].off('dblclick'); + ARR_GRID[idx].on('dblclick', function (props) { popupDiv = 'total'; const rowDatas = ARR_GRID[idx].store.data.rawData.map(d => { @@ -676,34 +679,43 @@ Date Author Description } } }; + + let resetFlag = true; const gridResponseReset = (res, idx) => { - // FIXME:: scroll type 사용시 - ARR_GRID[idx].resetData([]); - ARR_GRID[idx].refreshLayout(); - // FIXME:: scroll type 사용시 - ARR_TOTCNT[idx] = res.data.pagination.totalCount; - $('#totCnt span').text(ARR_TOTCNT[idx]); - const gridInfo = ARR_NAV[idx]?.gridInfo; - if(gridInfo && gridInfo?.pageMove) { - - let datas; - if(popupDiv === 'answerPreview'){ - datas = res.data?.contents.map(d => { - return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.regltProcessSttusCode), resnCode: d.erppSeCode, interfaceSeqN: d.interfaceSeqN, vhcleNo: d.vhcleNo} - }) - }else { - datas = res.data?.contents.map(d => { - return {regltId: d.regltId, regltSeCode: d.regltSeCode, regltProcessSttusCode: d.regltProcessSttusCode} + + if(resetFlag){ + // FIXME:: scroll type 사용시 + ARR_GRID[idx].resetData([]); + ARR_GRID[idx].refreshLayout(); + // FIXME:: scroll type 사용시 + ARR_TOTCNT[idx] = res.data.pagination.totalCount; + $('#totCnt span').text(ARR_TOTCNT[idx]); + const gridInfo = ARR_NAV[idx]?.gridInfo; + if(gridInfo && gridInfo?.pageMove) { + + let datas; + if(popupDiv === 'answerPreview'){ + datas = res.data?.contents.map(d => { + return {tmplatId: '${ctznTmplatId}', answerSeCode: fnBiz.getAnswerSeCode(d.regltProcessSttusCode), resnCode: d.erppSeCode, interfaceSeqN: d.interfaceSeqN, vhcleNo: d.vhcleNo}; + }); + }else { + datas = res.data?.contents.map(d => { + return {regltId: d.regltId, regltSeCode: d.regltSeCode, regltProcessSttusCode: d.regltProcessSttusCode}; + }); + } + + ARR_NAV[idx].resetGrid(res, datas, (pagiNavigation)=>{ + ARR_NAV[idx] = pagiNavigation; + fnBiz.pagePopup(popupDiv, ARR_NAV[idx].gridInfo.curRowData); }); } - ARR_NAV[idx].resetGrid(res, datas, (pagiNavigation)=>{ - ARR_NAV[idx] = pagiNavigation; - fnBiz.pagePopup(popupDiv, ARR_NAV[idx].gridInfo.curRowData); - }) + fnBiz.setDblClickEvent(idx); + + resetFlag = false; } - fnBiz.setDblClickEvent(idx); - } + + }; const initGrid = () => { ARR_GRID[0] = TuiGrid.of(gridOptions, gridDatasource, (res) => gridResponseReset(res, 0)); const options = $.extend(gridOptions, gridOptions.columns[1].renderer = null, true);