OWL ITS + 탐지시스템(인터넷 진흥원)
- 사용자정의필드 기본값 입력시 모든 오류 메세지가 표시되는 문제 해결
5개 파일 변경됨
93 ■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/web/form/CustomFieldForm.java 15 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/customField/customFieldAdd.controller.js 12 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/customField/customFieldModify.controller.js 32 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/customField/customFieldAdd.html 12 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/customField/customFieldModify.html 22 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/web/form/CustomFieldForm.java
@@ -39,6 +39,21 @@
        }else {
            form.setRequiredData("N");
        }
        if (MapUtil.getString(params, "defaultNumValue") != null) {
            form.setDefaultValue(MapUtil.getString(params, "defaultNumValue"));
        } else if (MapUtil.getString(params, "defaultDateValue") != null) {
            form.setDefaultValue(MapUtil.getString(params, "defaultDateValue"));
        } else if (MapUtil.getString(params, "defaultIpValue") != null) {
            form.setDefaultValue(MapUtil.getString(params, "defaultIpValue"));
        } else if (MapUtil.getString(params, "defaultEmailValue") != null) {
            form.setDefaultValue(MapUtil.getString(params, "defaultEmailValue"));
        } else if (MapUtil.getString(params, "defaultTelValue") != null) {
            form.setDefaultValue(MapUtil.getString(params, "defaultTelValue"));
        } else if (MapUtil.getString(params, "defaultSiteValue") != null) {
            form.setDefaultValue(MapUtil.getString(params, "defaultSiteValue"));
        }
        return form;
    }
src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
@@ -24,6 +24,12 @@
                        name : "",  //  사용자 정의 필드 명
                        customFieldType : "INPUT",    //  사용자 정의 필드 유형
                        defaultValue : "",  //  기본 값
                        defaultNumValue : "",  //  기본 값
                        defaultDateValue : "",  //  기본 값
                        defaultIpValue : "",  //  기본 값
                        defaultEmailValue : "",  //  기본 값
                        defaultTelValue : "",  //  기본 값
                        defaultSiteValue : "",  //  기본 값
                        options : [],   //  옵션
                        optionText : "",  //  옵션 값
                        numberType : "",
@@ -48,6 +54,12 @@
                    $scope.vm.form.optionText = "";
                    $scope.vm.form.defaultValue = "";
                    $scope.vm.form.defaultNumValue = "";
                    $scope.vm.form.defaultDateValue = "";
                    $scope.vm.form.defaultIpValue = "";
                    $scope.vm.form.defaultEmailValue = "";
                    $scope.vm.form.defaultTelValue = "";
                    $scope.vm.form.defaultSiteValue = "";
                }
src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -32,6 +32,12 @@
                        name : "",
                        customFieldType : "INPUT",    //  사용자 정의 필드 유형
                        defaultValue : "",  //  기본 값
                        defaultNumValue : "",  //  기본 값 (숫자)
                        defaultDateValue : "",  //  기본 값 (날짜)
                        defaultIpValue : "",  //  기본 값 (IP)
                        defaultEmailValue : "",  //  기본 값 (이메일)
                        defaultTelValue : "",  //  기본 값 (연락처)
                        defaultSiteValue : "",  //  기본 값 (URL)
                        options : [],  //  옵션
                        optionText : "",   //  옵션 값
                        useCustomFieldValue : false, //  이슈에서 사용되고 있는지 여부 확인
@@ -51,6 +57,12 @@
                function changeCustomFieldType() {
                    //$scope.vm.form.name = "";
                    $scope.vm.form.defaultValue = "";
                    $scope.vm.form.defaultNumValue = "";
                    $scope.vm.form.defaultDateValue = "";
                    $scope.vm.form.defaultIpValue = "";
                    $scope.vm.form.defaultEmailValue = "";
                    $scope.vm.form.defaultTelValue = "";
                    $scope.vm.form.defaultSiteValue = "";
                }
                //  옵션 삭제
@@ -217,7 +229,25 @@
                            if (angular.isDefined(result.data.data)) {
                                $scope.vm.form.name = result.data.data.name;
                                $scope.vm.form.customFieldType = result.data.data.customFieldType;
                                $scope.vm.form.defaultValue = result.data.data.defaultValue;
                                let type = $scope.vm.form.customFieldType;
                                if (type === "INPUT" || type === "SINGLE_SELECT" || type === "MULTI_SELECT") {
                                    $scope.vm.form.defaultValue = result.data.data.defaultValue;
                                } else if (type === "NUMBER") {
                                    $scope.vm.form.defaultNumValue = result.data.data.defaultValue;
                                } else if (type === "DATETIME") {
                                    $scope.vm.form.defaultDateValue = result.data.data.defaultValue;
                                } else if (type === "IP_ADDRESS") {
                                    $scope.vm.form.defaultIpValue = result.data.data.defaultValue;
                                } else if (type === "EMAIL") {
                                    $scope.vm.form.defaultEmailValue = result.data.data.defaultValue;
                                } else if (type === "SITE") {
                                    $scope.vm.form.defaultSiteValue = result.data.data.defaultValue;
                                } else if (type === "TEL") {
                                    $scope.vm.form.defaultTelValue = result.data.data.defaultValue;
                                }
                                $scope.vm.form.useCustomFieldValue = result.data.data.useCustomFieldValue;
                                if(result.data.data.requiredData === "Y"){
src/main/webapp/views/customField/customFieldAdd.html
@@ -109,7 +109,7 @@
                       ng-pattern="/^[0-9]*$/"
                       placeholder="숫자만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                       ng-model="vm.form.defaultNumValue">
                <div ng-if="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidNumberFormat">숫자만 입력 가능합니다.
                </div>
@@ -118,7 +118,7 @@
                       name="dateTime"
                       class="form-control input-readonly"
                       placeholder="{{'issue.clickToSelectDate' | translate}}"
                       ng-model="vm.form.defaultValue"
                       ng-model="vm.form.defaultDateValue"
                       modal-form-auto-scroll
                       range-type="singleDate"
                       date-range-picker
@@ -137,7 +137,7 @@
                       ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
                       placeholder="IP 주소 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                       ng-model="vm.form.defaultIpValue">
                <div ng-if="customFieldAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidipAdressFormat">IP주소 형식이 맞지 않습니다.
                </div>
@@ -151,7 +151,7 @@
                       ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
                       placeholder="이메일 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                       ng-model="vm.form.defaultEmailValue">
                <div ng-if="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidEmailFormat">이메일 형식이 맞지 않습니다.
                </div>
@@ -165,7 +165,7 @@
                       ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
                       placeholder="홈페이지 주소 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                       ng-model="vm.form.defaultSiteValue">
                <div ng-if="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidSiteFormat">홈페이지 주소 형식이 맞지 않습니다.(http://로 시작하셔야합니다)
                </div>
@@ -179,7 +179,7 @@
                       ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
                       placeholder="연락처 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                       ng-model="vm.form.defaultTelValue">
                <div ng-if="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidTelFormat">전화번호 형식이 맞지 않습니다.
src/main/webapp/views/customField/customFieldModify.html
@@ -110,8 +110,8 @@
                       ng-pattern="/^[0-9]*$/"
                       placeholder="숫자만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-if="customFieldModifyForm.numberType.$error.pattern && vm.form.customFieldType == 'NUMBER'" class="help-block form-text text-danger"
                       ng-model="vm.form.defaultNumValue">
                <div ng-if="customFieldModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidNumberFormat">숫자만 입력 가능합니다.
                </div>
@@ -119,7 +119,7 @@
                       name="dateTime"
                       class="form-control input-readonly"
                       placeholder="{{'issue.clickToSelectDate' | translate}}"
                       ng-model="vm.form.defaultValue"
                       ng-model="vm.form.defaultDateValue"
                       modal-form-auto-scroll
                       range-type="singleDate"
                       date-range-picker
@@ -138,8 +138,8 @@
                       ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
                       placeholder="IP 주소 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-if="customFieldModifyForm.ipAddress.$error.pattern && vm.form.customFieldType == 'IP_ADDRESS'" class="help-block form-text text-danger"
                       ng-model="vm.form.defaultIpValue">
                <div ng-if="customFieldModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidipAdressFormat">IP주소 형식이 맞지 않습니다.
                </div>
@@ -152,8 +152,8 @@
                       ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
                       placeholder="이메일 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-if="customFieldModifyForm.email.$error.pattern && vm.form.customFieldType == 'EMAIL'" class="help-block form-text text-danger"
                       ng-model="vm.form.defaultEmailValue">
                <div ng-if="customFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidEmailFormat">이메일 형식이 맞지 않습니다.
                </div>
@@ -166,8 +166,8 @@
                       ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
                       placeholder="홈페이지 주소 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-if="customFieldModifyForm.site.$error.pattern && vm.form.customFieldType == 'SITE'" class="help-block form-text text-danger"
                       ng-model="vm.form.defaultSiteValue">
                <div ng-if="customFieldModifyForm.site.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidSiteFormat">홈페이지 주소 형식이 맞지 않습니다.(http://로 시작하셔야합니다)
                </div>
@@ -180,8 +180,8 @@
                       ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
                       placeholder="연락처 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-if="customFieldModifyForm.tel.$error.pattern && vm.form.customFieldType == 'TEL'" class="help-block form-text text-danger"
                       ng-model="vm.form.defaultTelValue">
                <div ng-if="customFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidTelFormat">전화번호 형식이 맞지 않습니다.
                </div>