From fb08399e35f7b90c9c5ef9781af10569be85f9ca Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 2월 2022 16:08:44 +0900
Subject: [PATCH] - 사용자정의필드 기본값 입력시 모든 오류 메세지가 표시되는 문제 해결
---
src/main/webapp/views/customField/customFieldAdd.html | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index 49c46df..96f0e76 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -23,12 +23,12 @@
ng-model="vm.form.name"
maxlength="15"
ng-maxlength="15"
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="/[^?a-zA-Z0-9/]/"
required>
<small ng-if="customFieldAddForm.name.$error.maxlength" translate="common.upTo15Characters">
理쒕� 15湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</small>
- <small translate="customField.limitNameToSpecialCharacters">�궗�슜�옄 �젙�쓽 �븘�뱶 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="customField.limitNameToSpecialCharacters">�궗�슜�옄 �젙�쓽 �븘�뱶 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
@@ -97,9 +97,7 @@
name="defaultValue"
class="form-control"
ng-model="vm.form.defaultValue"
- maxlength="100"
kr-input
- ng-maxlength="100"
autocomplete="off">
@@ -111,16 +109,20 @@
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>
<input ng-show="vm.form.customFieldType == 'DATETIME'"
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>
+ date-range-picker
+ autocomplete="off">
<div class="row">
<div class="col-xs-12">
<div id="createdWidget" class="bootstrap-datepicker "></div>
@@ -135,7 +137,10 @@
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>
<input ng-show="vm.form.customFieldType == 'EMAIL'"
name="email"
@@ -146,7 +151,10 @@
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>
<input ng-show="vm.form.customFieldType == 'SITE'"
name="site"
@@ -157,7 +165,10 @@
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>
<input ng-show="vm.form.customFieldType == 'TEL'"
name="tel"
@@ -168,11 +179,15 @@
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultTelValue">
- <small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
+ <div ng-if="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+
+ <!--<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
- </small>
+ </small>-->
<div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"
translate="customField.selectSingleFieldListHashTag">
@@ -182,23 +197,6 @@
translate="customField.selectMultiFieldListHashTag">
�떎以� �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�#���긽媛�
</div>
-
- <div ng-if="customFieldAddForm.numberType.$error.pattern && vm.form.customFieldType == 'NUMBER'" class="help-block form-text text-danger"
- translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
- </div>
- <div ng-if="customFieldAddForm.ipAddress.$error.pattern && vm.form.customFieldType == 'IP_ADDRESS'" class="help-block form-text text-danger"
- translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
- <div ng-if="customFieldAddForm.email.$error.pattern && vm.form.customFieldType == 'EMAIL'" class="help-block form-text text-danger"
- translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
- <div ng-if="customFieldAddForm.site.$error.pattern && vm.form.customFieldType == 'SITE'" class="help-block form-text text-danger"
- translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
- </div>
- <div ng-if="customFieldAddForm.tel.$error.pattern && vm.form.customFieldType == 'TEL'" class="help-block form-text text-danger"
- translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
-
</div>
</form>
--
Gitblit v1.8.0