diff --git a/WebContent/jsp/common/scheduler/schedulerMan.jsp b/WebContent/jsp/common/scheduler/schedulerMan.jsp index e212fd8..92d45c3 100644 --- a/WebContent/jsp/common/scheduler/schedulerMan.jsp +++ b/WebContent/jsp/common/scheduler/schedulerMan.jsp @@ -28,9 +28,11 @@ function init(){ success:function(json){ new makeOptions("CODE","NAME").setObj($("select[name=searchJobUseYn]")).setNoValueInclude(true).setNoValue("", "<%= localeMessage.getString("combo.all")%>").setData(json.useYnTypeRows).setFormat(codeName3OptionFormat).rendering(); - new makeOptions("CODE","NAME").setObj($("select[name=searchJobInst]")).setNoValueInclude(true).setNoValue("", + new makeOptions("CODE","NAME").setObj($("select[name=searchJobInst]")).setNoValueInclude(true).setNoValue("", "<%= localeMessage.getString("combo.all")%>").setData(json.instanceList).rendering(); - + + $("select[name=searchJobUseYn]").val("Y"); + putSelectFromParam(); initGrid(); diff --git a/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp b/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp index 197796f..5578624 100644 --- a/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp +++ b/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp @@ -376,7 +376,7 @@ const value = bodyCodeEditor.getValue(); let prettyValue = value; if(syntax === 'JSN'){ - prettyValue = vkbeautify.json(value); + prettyValue = preserveExponential(value); //vkbeautify.json(value); }else if(syntax === 'XML'){ prettyValue = vkbeautify.xml(value).trim(); } @@ -407,6 +407,19 @@ } }); } + function preserveExponential(jsonString) { + // 1. 지수 형태의 숫자(예: 1e+21, 5.43e-7)를 찾아 문자열 ""로 감쌉니다. + // JSON의 key 뒤에 오는 value 위치의 지수 표기법을 매칭합니다. + let protectedJson = jsonString.replace(/:\s*([+-]?\d+\.?\d*e[+-]?\d+)/gi, ': "$1"'); + + // 2. 보호된 상태로 vkbeautify를 실행하여 예쁘게 정렬합니다. + let prettyJson = vkbeautify.json(protectedJson); + + // 3. (선택사항) 만약 최종 결과물에서 반드시 큰따옴표("")를 다시 제거해야 한다면 아래 주석을 해제하세요. + prettyJson = prettyJson.replace(/:\s*"([+-]?\d+\.?\d*e[+-]?\d+)"/gi, ': $1'); + + return prettyJson; + } function doChangeSyntax(syntax){ if(syntax === 'JSN'){ $('#btn_pretty_body').css('display', 'block'); diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java index 2c65a83..0c62aff 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java @@ -166,6 +166,7 @@ public class UmsService { if ("MESSENGER".equals(messageRequest.getMessageType()) ) { stdHeadVO.setChnl_tycd("FEP"); // 채널유형코드 + stdHeadVO.setHmab_dvcd("2"); // 내외구분코드 1:내부 2:외부(타발) // 스윙챗 알림 공용 SwingCommonVO swiComVO = new SwingCommonVO();