From b0ba725f2e5ade79cbdb84f0d436f2917926c02d Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 18 Apr 2023 16:58:24 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20=EA=B7=B8=EB=A6=AC=EB=93=9C=20?= =?UTF-8?q?=EB=B3=B4=EC=95=88=EB=AA=A8=EB=93=9C=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/fims/biz/rt/rtInitialDataForm.jsp | 40 ++++++--- .../resources/biz/common/js/defaultUI.js | 81 +++++++++++++++---- .../webapp/resources/biz/layout/js/ifrTabs.js | 3 - .../resources/framework/js/cmm/cmmUtil.js | 2 +- 4 files changed, 96 insertions(+), 30 deletions(-) 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 aa66aea0..99bb0c5c 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 @@ -465,7 +465,7 @@ Date Author Description options: { listItems: ComboCodeData.registSeCode } - }, + } }, { header: '접수번호', @@ -503,7 +503,7 @@ Date Author Description name: 'vhcleNo', minWidth: 80, sortable: false, - align: 'center', + align: 'center' // renderer: { // type: CustomButtonRenderer, // options: { @@ -539,14 +539,30 @@ Date Author Description options: { listItems: [...ComboCodeData.regltSeCode] } - }, + } }, { header: '위반내용', name: 'violtDtlsNm', minWidth: 120, sortable: false, + align: 'center' + }, + { + header: '주민번호(전체)', + name: 'payerNo', + minWidth: 110, + sortable: false, + align: 'center', + className: "privacy" + }, + { + header: '주민번호(마스킹)', + name: 'payerNoMask', + minWidth: 110, + sortable: false, align: 'center', + className: "privacy-mask" }, { header: '담당자', @@ -605,28 +621,28 @@ Date Author Description options: { listItems: ComboCodeData.imageSeCode } - }, + } }, { header: '사진', name: 'imageNmrs', minWidth: 40, sortable: false, - align: 'center', + align: 'center' }, { header: '특기사항', name: 'spcmntMatter', width: 80, sortable: false, - align: 'center', + align: 'center' }, { header: '서손사유', name: 'erppResnDetail', //erppSeCode width: 80, sortable: false, - align: 'center', + align: 'center' }, { header: '', @@ -636,22 +652,22 @@ Date Author Description { header: '서손ID', name: 'erppId', - hidden: true, + hidden: true }, { header: '소유자ID', name: 'payerId', - hidden: true, + hidden: true }, { header: '서손사유코드', name: 'erppSeCode', - hidden: true, + hidden: true }, { header: 'interfaceSeqN', name: 'interfaceSeqN', - hidden: true, + hidden: true } ]; const gridOptions = { @@ -663,7 +679,7 @@ Date Author Description } ,pageOptions: { type: 'scroll' - ,perPage: 100, + ,perPage: 100 } }; diff --git a/src/main/webapp/resources/biz/common/js/defaultUI.js b/src/main/webapp/resources/biz/common/js/defaultUI.js index 1830a349..06f48b51 100644 --- a/src/main/webapp/resources/biz/common/js/defaultUI.js +++ b/src/main/webapp/resources/biz/common/js/defaultUI.js @@ -18,33 +18,86 @@ document.onkeydown=function(e) { */ function fn_securityModeToggle(flag){ - if(flag){ + if(flag){ //개인정보 숨김 //인풋 - $(".privacy").attr("hidden","hidden"); - $(".privacy-mask").removeAttr("hidden"); + $("input.privacy").attr("hidden","hidden"); + $("input.privacy-mask").removeAttr("hidden"); - for(let i=0; i< $(".privacy").length; i++){ - let originId = $(".privacy")[i].id; - let originValue= $(".privacy")[i].value; + for(let i=0; i< $("input.privacy").length; i++){ + let originId = $("input.privacy")[i].id; + let originValue= $("input.privacy")[i].value; let maskingValue = originValue.replace(/[0-9a-zA-Z]/g, "*"); document.getElementById(originId+"$mask").value = maskingValue; } - //TODO:그리드 + //그리드 + //그리드가 1개일 때 + if(!(typeof GRID === 'undefined')) { + for(let key in GRID.store.column.allColumnMap){ + if(GRID.store.column.allColumnMap[key].className == "privacy"){ + GRID.hideColumn(key, ''); + } + if(GRID.store.column.allColumnMap[key].className == "privacy-mask"){ + GRID.showColumn(key, ''); + } + } + } + //그리드가 여러개일 때 + if(!(typeof ARR_GRID === 'undefined')){ + for(let i=0; i < ARR_GRID.length; i++){ + for(let key in ARR_GRID[i].store.column.allColumnMap){ + if(ARR_GRID[i].store.column.allColumnMap[key].className){ + if(ARR_GRID[i].store.column.allColumnMap[key].className == "privacy"){ + ARR_GRID[i].hideColumn(key, ''); + } + if(ARR_GRID[i].store.column.allColumnMap[key].className == "privacy-mask"){ + ARR_GRID[i].showColumn(key, ''); + } + } + } + } + } + + } else { //개인정보 표시 - } else { //인풋 - $(".privacy").removeAttr("hidden"); - $(".privacy-mask").attr("hidden","hidden"); + $("input.privacy").removeAttr("hidden"); + $("input.privacy-mask").attr("hidden","hidden"); - for(let i=0; i< $(".privacy").length; i++){ - let originId = $(".privacy")[i].id; - let originValue= $(".privacy")[i].value; + for(let i=0; i< $("input.privacy").length; i++){ + let originId = $("input.privacy")[i].id; + let originValue= $("input.privacy")[i].value; let maskingValue = originValue.replace(/[0-9a-zA-Z]/g, "*"); document.getElementById(originId+"$mask").value = maskingValue; } - //TODO:그리드 + //그리드 + //그리드가 1개일 때 + if(!(typeof GRID === 'undefined')){ + for(let key in GRID.store.column.allColumnMap){ + if(GRID.store.column.allColumnMap[key].className == "privacy"){ + GRID.showColumn(key, ''); + } + if(GRID.store.column.allColumnMap[key].className == "privacy-mask"){ + GRID.hideColumn(key, ''); + } + } + } + //그리드가 여러개일 때 + if(!(typeof ARR_GRID === 'undefined')){ + for(let i=0; i < ARR_GRID.length; i++){ + for(let key in ARR_GRID[i].store.column.allColumnMap){ + if(ARR_GRID[i].store.column.allColumnMap[key].className){ + if(ARR_GRID[i].store.column.allColumnMap[key].className == "privacy"){ + ARR_GRID[i].showColumn(key, ''); + } + if(ARR_GRID[i].store.column.allColumnMap[key].className == "privacy-mask"){ + ARR_GRID[i].hideColumn(key, ''); + } + } + } + } + } } //재귀 호출 diff --git a/src/main/webapp/resources/biz/layout/js/ifrTabs.js b/src/main/webapp/resources/biz/layout/js/ifrTabs.js index ee4baf10..4544bff1 100644 --- a/src/main/webapp/resources/biz/layout/js/ifrTabs.js +++ b/src/main/webapp/resources/biz/layout/js/ifrTabs.js @@ -82,9 +82,6 @@ function closeTab(menuId) { let activeIdx = $('div#ifrTabs ul li button.nav-link').index(activeTab); - console.log(selIdx); - console.log(activeIdx); - if(selIdx === activeIdx) { if (num_tabs - 1 > activeIdx) { $('div#ifrTabs ul li button.nav-link').eq(activeIdx + 1).trigger("click"); diff --git a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js index 96e6f65e..83f723be 100644 --- a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js +++ b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js @@ -600,7 +600,7 @@ function setFormData(formObj, jsonData, idx= 0){ document.getElementsByName(e.name)[idx].value = val; //보안모드 마스킹 항목 - if(e.id && e.classList.contains("privacy")){ + if(e.tagName === 'INPUT' && e.id && e.classList.contains("privacy")){ let maskVal = val.replace(/[0-9a-zA-Z]/g, "*"); document.getElementById(e.id+"$mask").value = maskVal; }