From a8a8d35b27df67e169c8b1aab45edec1c1b25eae Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:48:04 +0900
Subject: [PATCH] - 이메일 실시간 발송 - 이슈 리스트에서 하위일감 개수 표시 - 이슈 리스트에서 하위 이슈는 안보이게
---
src/main/webapp/views/customField/customFieldAdd.html | 94 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index c64c0ee..53b129e 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -38,6 +38,7 @@
ng-change="fn.changeFieldType()">
<option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</option>
<option value="SINGLE_SELECT" translate="common.singleSelectionField">�떒�씪 �꽑�깮 �븘�뱶</option>
+ <option value="MULTI_SELECT" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</option>
<option value="NUMBER" translate="common.numberField">�닽�옄 �븘�뱶</option>
<option value="DATETIME" translate="common.datetimeField">�궇吏� �븘�뱶</option>
<option value="IP_ADDRESS" translate="common.ipAddressField">IP 二쇱냼 �븘�뱶</option>
@@ -47,14 +48,15 @@
</select>
</div>
- <div class="form-group" ng-show="vm.form.customFieldType != 'INPUT'">
+ <div class="form-group" ng-show="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
<label ng-show="vm.form.customFieldType == 'SINGLE_SELECT'"><span
translate="customField.createSingleFieldList">�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉 留뚮뱾湲�</span> <code
class="highlighter-rouge">*</code></label>
<label ng-show="vm.form.customFieldType == 'MULTI_SELECT'"><span
translate="customField.createMultiFieldList">�떎以� �꽑�깮 �븘�뱶 紐⑸줉 留뚮뱾湲�</span> <code
class="highlighter-rouge">*</code></label>
- <div class="input-group">
+
+ <div class="input-group" ng-show="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
<input id="optionAdd"
type="text"
name="options"
@@ -82,7 +84,8 @@
<div class="form-group">
<label for="customFieldAddForm3"><span translate="customField.defaultValue">湲곕낯媛�</span> </label>
- <input id="customFieldAddForm3"
+ <input ng-if="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
+ id="customFieldAddForm3"
type="text"
name="defaultValue"
class="form-control"
@@ -91,9 +94,94 @@
kr-input
ng-maxlength="100"
autocomplete="off">
+
+
+ <input ng-if="vm.form.customFieldType == 'NUMBER'"
+ name="numberType"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^[0-9]*$/"
+ placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ 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'"
+ name="dateTime"
+ class="form-control input-readonly"
+ ng-model="vm.form.defaultValue"
+ modal-form-auto-scroll
+ range-type="singleDate"
+ onfocus="this.blur()"
+ 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"
+ type="text"
+ class="form-control"
+ kr-input
+ 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-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+
+ <input ng-if="vm.form.customFieldType == 'EMAIL'"
+ name="email"
+ type="email"
+ class="form-control"
+ maxlength="30"
+ kr-input
+ 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-show="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+
+ <input ng-if="vm.form.customFieldType == 'SITE'"
+ name="site"
+ type="text"
+ class="form-control"
+ maxlength="30"
+ kr-input
+ ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/"
+ placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ ng-model="vm.form.defaultValue">
+ <div ng-show="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+ </div>
+
+
+ <input ng-if="vm.form.customFieldType == 'TEL'"
+ name="tel"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ ng-model="vm.form.defaultValue">
+ <div ng-show="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+
<small ng-show="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</small>
+
<div class="help-block form-text text-danger" ng-show="vm.form.customFieldType == 'SINGLE_SELECT'"
translate="customField.selectSingleFieldListHashTag">
�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�
--
Gitblit v1.8.0