diff --git a/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java b/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java new file mode 100644 index 00000000..3f8c0714 --- /dev/null +++ b/core/src/main/java/app/module/core/config/application/enums/UiCodeType.java @@ -0,0 +1,12 @@ +package app.module.core.config.application.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum UiCodeType { + REGION_MAIN("code.region.main"), + REGION_SUB("code.region.sub"); + private final String desc; +} diff --git a/front/src/main/resources/static/ui/ajaxUtil.js b/front/src/main/resources/static/ui/ajaxUtil.js index 62fdd311..17805c1c 100644 --- a/front/src/main/resources/static/ui/ajaxUtil.js +++ b/front/src/main/resources/static/ui/ajaxUtil.js @@ -29,17 +29,29 @@ var ajaxUtil = { if (code == '400') { message = ajaxUtil._msg400; } - ajaxUtil._alert(message, '오류 안내'); + // ajaxUtil._alert(message, '오류 안내'); + ajaxUtil._alert(message, null); }, _alert : function (alertMessage, alertTitle, afterEvent) { - etUI.dialog.alert({ - title: alertTitle, - message: alertMessage, - type: "alert", - callback: function() { - console.log("alert callback"); - }, - }); + if(alertTitle){ + etUI.dialog.alert({ + title: alertTitle, + message: alertMessage, + type: "alert", + callback: function() { + console.log("alert callback"); + }, + }); + } else { + etUI.dialog.alert({ + message: alertMessage, + type: "alert", + callback: function() { + console.log("alert callback"); + }, + }); + } + }, _alertId : function (alertId, afterEvent) { ajaxUtil._alertMethod({ @@ -159,6 +171,7 @@ var ajaxUtil = { const formElement = target.closest('form'); if (formElement.length > 0) { $(formElement).find('.component-input').removeClass('input-invalid'); + $(formElement).find('.select-group').removeClass('input-invalid'); $(formElement).find('.input-info').each(function () { $(this).remove(); }); @@ -191,7 +204,7 @@ var ajaxUtil = { } }); - if ($('.invalid-feedback').length === 0) { + if ($('.input-info').length === 0) { let fieldErrors = rstData.responseJSON != null ? rstData.responseJSON : null; if (fieldErrors != null && fieldErrors.length > 0) { ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크');