Merge remote-tracking branch 'origin/dev' into daily

This commit is contained in:
김현주
2025-06-12 16:04:16 +09:00
2 changed files with 35 additions and 10 deletions

View File

@@ -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;
}

View File

@@ -29,17 +29,29 @@ var ajaxUtil = {
if (code == '400') { if (code == '400') {
message = ajaxUtil._msg400; message = ajaxUtil._msg400;
} }
ajaxUtil._alert(message, '오류 안내'); // ajaxUtil._alert(message, '오류 안내');
ajaxUtil._alert(message, null);
}, },
_alert : function (alertMessage, alertTitle, afterEvent) { _alert : function (alertMessage, alertTitle, afterEvent) {
etUI.dialog.alert({ if(alertTitle){
title: alertTitle, etUI.dialog.alert({
message: alertMessage, title: alertTitle,
type: "alert", message: alertMessage,
callback: function() { type: "alert",
console.log("alert callback"); callback: function() {
}, console.log("alert callback");
}); },
});
} else {
etUI.dialog.alert({
message: alertMessage,
type: "alert",
callback: function() {
console.log("alert callback");
},
});
}
}, },
_alertId : function (alertId, afterEvent) { _alertId : function (alertId, afterEvent) {
ajaxUtil._alertMethod({ ajaxUtil._alertMethod({
@@ -159,6 +171,7 @@ var ajaxUtil = {
const formElement = target.closest('form'); const formElement = target.closest('form');
if (formElement.length > 0) { if (formElement.length > 0) {
$(formElement).find('.component-input').removeClass('input-invalid'); $(formElement).find('.component-input').removeClass('input-invalid');
$(formElement).find('.select-group').removeClass('input-invalid');
$(formElement).find('.input-info').each(function () { $(formElement).find('.input-info').each(function () {
$(this).remove(); $(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; let fieldErrors = rstData.responseJSON != null ? rstData.responseJSON : null;
if (fieldErrors != null && fieldErrors.length > 0) { if (fieldErrors != null && fieldErrors.length > 0) {
ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크'); ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크');