Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

jhjang

2021-12-07 30ddd2cf095d2857ba1134fb3deaf51392ef1030

 src/main/webapp/views/customField/customFieldAdd.html

@@ -34,6 +34,7 @@
            <div class="form-group">
                <label for="customFieldAddForm2"><span translate="customField.fieldType">필드 유형</span> <code
                        class="highlighter-rouge">*</code></label>
                &nbsp;&nbsp; <label> <input type="checkbox" ng-model="vm.form.requiredData"> 필수 데이터 </label>
                <select id="customFieldAddForm2" class="form-control" ng-model="vm.form.customFieldType"
                        ng-change="fn.changeFieldType()">
                    <option value="INPUT" translate="common.stringField">문자열 필드</option>
@@ -105,21 +106,22 @@
                       placeholder="숫자만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
                <div ng-show="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidNumberFormat">숫자만 입력 가능합니다.
                </div>

                <input ng-if="vm.form.customFieldType == 'DATETIME'"
                       name="dateTime"
                       type="text"
                       class="form-control"
                       kr-input
                       ng-pattern="/^(19|20)\d{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[0-1])$/"
                       placeholder="날짜 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
                <div ng-show="customFieldAddForm.dateTime.$error.pattern" class="help-block form-text text-danger"
                     translate="common.invalidDateFormat">날짜 형식이 맞지 않습니다.(xxxx-xx-xx)
                       class="form-control input-readonly"
                       placeholder="{{'issue.clickToSelectDate' | translate}}"
                       ng-model="vm.form.defaultValue"
                       modal-form-auto-scroll
                       range-type="singleDate"
                       date-range-picker>
                <div class="row">
                    <div class="col-xs-12">
                        <div id="createdWidget" class="bootstrap-datepicker "></div>
                    </div>
                </div>

                <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
@@ -155,7 +157,7 @@
                       class="form-control"
                       maxlength="30"
                       kr-input
                       ng-pattern="/(http(s)?:\/\/)([a-z0-9\w]+\.*)+[a-z0-9]{2,4}/gi"
                       ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/"
                       placeholder="홈페이지 주소 형식만 입력 가능합니다."
                       autocomplete="off"
                       ng-model="vm.form.defaultValue">
@@ -204,4 +206,4 @@
                ng-click="fn.formSubmit()"><span translate="common.save">저장</span>
        </button>
    </div>
</div>
</div>