From e60f829f9d975a88673f0e6922f1c9c1228f89ea Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 18:30:33 +0900
Subject: [PATCH] 사용자정의 필드 날짜 수정, 프로젝트 생성시 대쉬보드 이동 오류 수정
---
src/main/webapp/views/customField/customFieldAdd.html | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index dafd16c..0610908 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -98,21 +98,30 @@
<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.numberType.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
<input ng-if="vm.form.customFieldType == 'DATETIME'"
- type="date"
- 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">
+ name="dateTime"
+ 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'"
name="ipAdress"
@@ -122,11 +131,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 +145,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>
@@ -147,25 +156,24 @@
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.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>
@@ -197,4 +205,4 @@
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
-</div>
+</div>
\ No newline at end of file
--
Gitblit v1.8.0