Merge branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/eapim-admin.git into jenkins_with_weblogic

2026-01-26 14:06:53 +09:00
parent 3c1cd919d7 2fcad5de1f
commit ef50801594
7 changed files with 168 additions and 37 deletions
@@ -306,6 +306,45 @@ var lastsel2;

 		buttonControl(key);
 		titleControl(key);
+
+		// 검색 기능
+		$("#btn_search").click(function() {
+			filterGrid();
+		});
+
+		// 엔터키로 검색
+		$("#searchText").keypress(function(e) {
+			if (e.which == 13) {
+				filterGrid();
+				return false;
+			}
+		});
+
+		// 초기화 버튼
+		$("#btn_reset").click(function() {
+			$("#searchText").val("");
+			filterGrid();
+		});
+
+		function filterGrid() {
+			var searchText = $("#searchText").val().toLowerCase();
+			var grid = $("#grid");
+
+			// 모든 행을 순회하며 필터링
+			var ids = grid.jqGrid('getDataIDs');
+			for (var i = 0; i < ids.length; i++) {
+				var rowData = grid.jqGrid('getRowData', ids[i]);
+				var prptyName = (rowData.PRPTYNAME || "").toLowerCase();
+				var prptyVal = (rowData.PRPTY2VAL || "").toLowerCase();
+
+				// 검색어가 비어있거나, 프로퍼티 키 또는 값에 포함되어 있으면 표시
+				if (searchText === "" || prptyName.indexOf(searchText) >= 0 || prptyVal.indexOf(searchText) >= 0) {
+					$("#" + ids[i]).show();
+				} else {
+					$("#" + ids[i]).hide();
+				}
+			}
+		}
 	});
 </script>
 </head>
@@ -359,10 +398,36 @@ var lastsel2;
 						</td>
 					</tr>
 				</table>
+
+				<!-- 검색 박스 추가 -->
+				<div class="search-box">
+					<input type="text" id="searchText" placeholder="<%= localeMessage.getString("propertyDetail.propertyKey") %> 또는 <%= localeMessage.getString("propertyDetail.propertyValue") %> 검색" />
+					<button type="button" class="cssbtn smallBtn2" id="btn_search"><i class="material-icons">search</i> 검색</button>
+					<button type="button" class="cssbtn smallBtn2" id="btn_reset"><i class="material-icons">refresh</i> 초기화</button>
+				</div>
+
 				<!-- grid -->
 				<table id="grid"></table>
 				
 			</div><!-- end content_middle -->
-		</div><!-- end right_box -->	
+		</div><!-- end right_box -->
+
+		<style>
+		.search-box {
+			margin: 10px 0;
+			padding: 10px;
+			background-color: #f5f5f5;
+			border-radius: 4px;
+		}
+		.search-box input[type="text"] {
+			width: 300px;
+			padding: 5px 10px;
+			border: 1px solid #ddd;
+			border-radius: 3px;
+		}
+		.search-box button {
+			margin-left: 5px;
+		}
+		</style>
 	</body>
 </html>
@@ -513,7 +513,36 @@ function gridRendering(){
 		colModel:[
 				{ name : 'PRPTYGROUPNAME' , align:'left' , hidden: true },
 				{ name : 'PRPTYNAME'  	  , width: 70    , align:'left'  },
-				{ name : 'PRPTY2VAL'      , width: 70    , align:'left' , title:false, editable: true, formatter:mltplFormatter, unformatter:mltplUnFormatter},
+				{ 
+			        name : 'PRPTY2VAL', 
+			        width: 70, 
+			        align:'left', 
+			        title:false, 
+			        editable: true, 
+			        formatter:mltplFormatter, 
+			        unformatter:mltplUnFormatter,
+			        editoptions: {
+			            dataEvents: [
+			                {
+			                    type: 'keydown',
+			                    fn: function(e) {
+			                        if (e.which === 13) {
+			                            var val = $(this).val();
+			                            $(this).val($.trim(val));
+			                        }
+			                    }
+			                },
+			                {
+			                    type: 'blur', 
+			                    fn: function(e) {
+			                        var val = $(this).val();
+			                        $(this).val($.trim(val));
+			                    }
+			                }
+			            ]
+			        }
+			        // [여기까지 추가]
+			    },
 				{ name : 'PRPTYDESC'	  , width: 300    , align:'left'},
 				{ name : 'DMNKND'	  	  , hidden:true},
 				{ name : 'DOMAINTYPE'	  , hidden:true, formatter:nullFormatter}
@@ -942,6 +971,7 @@ $(document).ready(function() {

 	buttonControl(isDetail);
 	titleControl(isDetail);
+
 });

 // clientManPopup.jsp에서 호출될 함수 (전역 스코프에 정의)
@@ -303,6 +303,12 @@
 			return cellvalue;
        }

+        function trimFormatter(cellvalue, options, rowObject) {
+
+        	return cellvalue ? String(cellvalue).trim() : '';
+
+        }
+
        $(document).ready(function () {
            console.log(roleString);

@@ -373,7 +379,7 @@
                    {name: 'TRACKASISKEY1CTNT', hidden: true},
                    {name: 'TRACKASISKEY2CTNT', hidden: true},

-                    {name: 'EAISVCSERNO_TMP', align: 'left', width: '220'},
+                    {name: 'EAISVCSERNO_TMP', align: 'left', width: '220', formatter: trimFormatter},
                    {name: 'KEYMGTMSGCTNT', align: 'left', width: '240'},
                    {name: 'LOGPRCSSSERNO_TMP', align: 'center', width: '40'},
                    {name: 'TELGMRECVTRANCD', align: 'left', width: '135', hidden: true},
@@ -216,7 +216,7 @@
 					$(tag+"[name="+name+"]").val(data[name.toUpperCase()]);

 					//업체코드.업체명
-					if(name=="companyName"){
+					if(name=="eaiSvcSerno"){
 						if(data["COMPANYCODE"] !=null && data["COMPANYCODE"].trim() != ''){
 							$("input[name=companyName]").val("["+data["COMPANYCODE"]+"] "+data[name.toUpperCase()]);
 						}
@@ -233,6 +233,13 @@
 					}
 				});

+				// 거래고유번호 trim
+				var $svcSernoInput = $("input[name=eaiSvcSerno]");
+				
+				if($svcSernoInput.val()) {
+				    $svcSernoInput.val( $svcSernoInput.val().trim() );
+				}
+			
 				$("input[name=gstatSysAdptrBzwkGroupName],input[name=psvSysAdptrBzwkGroupName]").each(function(){
 					var name = $(this).attr("name");
 					if ("${rmsMenuAuth}" =="W"){ //2020.07.08 admin 만 버튼보이게 수정