From 836153c85c1134081e599fbdf5f17a3152d56341 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 16:31:16 +0900
Subject: [PATCH] 사용자정의 필드 수정
---
src/main/webapp/views/customField/customFieldAdd.html | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index dafd16c..ec866c6 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -98,21 +98,29 @@
<input ng-if="vm.form.customFieldType == 'NUMBER'"
name="numberType"
- type="number"
+ type="text"
class="form-control"
kr-input
ng-pattern="/^[0-9]*$/"
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.numberType">
+ ng-model="vm.form.defaultValue">
+ <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
<input ng-if="vm.form.customFieldType == 'DATETIME'"
- type="date"
+ 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">
+ 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)
+ </div>
<input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
name="ipAdress"
@@ -122,11 +130,11 @@
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.ipAdress">
+ ng-model="vm.form.defaultValue">
<div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
-<!-- /@^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/-->
+
<input ng-if="vm.form.customFieldType == 'EMAIL'"
name="email"
type="email"
@@ -136,7 +144,7 @@
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.email">
+ ng-model="vm.form.defaultValue">
<div ng-show="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
@@ -150,22 +158,21 @@
ng-pattern="/(http(s)?:\/\/)([a-z0-9\w]+\.*)+[a-z0-9]{2,4}/gi"
placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.site">
+ ng-model="vm.form.defaultValue">
<div ng-show="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
- translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
<input ng-if="vm.form.customFieldType == 'TEL'"
- id="phone"
name="tel"
- type="number"
+ type="text"
class="form-control"
kr-input
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.tel">
+ ng-model="vm.form.defaultValue">
<div ng-show="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
--
Gitblit v1.8.0