From b8ab6de032d3a6ee029331dbb58d764a5409189b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 28 2월 2022 15:51:13 +0900
Subject: [PATCH] - api로 하위이슈 추가 시 상위이슈의 파트너 정보 적용
---
src/main/webapp/views/customField/customFieldModify.html | 90 ++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 8beb7b1..b81b850 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -23,19 +23,19 @@
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-show="customFieldModifyForm.name.$error.maxlength" class="help-block form-text text-danger"
+ <small ng-if="customFieldModifyForm.name.$error.maxlength" class="help-block form-text text-danger"
translate="common.upTo15Characters">
理쒕� 15湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</small>
- <small translate="customField.limitNameToSpecialCharacters">�궗�슜�옄 �젙�쓽 �븘�뱶 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="customField.limitNameToSpecialCharacters">�궗�슜�옄 �젙�쓽 �븘�뱶 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
<label for="customFieldModifyForm2"><span translate="customField.fieldType">�븘�뱶 �쑀�삎</span><code
class="highlighter-rouge">*</code></label>
- <label> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>
+ <!-- <label> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>-->
<select id="customFieldModifyForm2" class="form-control" ng-model="vm.form.customFieldType"
ng-change="fn.changeCustomFieldType()">
<option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</option>
@@ -48,17 +48,23 @@
<option value="SITE" translate="common.siteField">�솃�럹�씠吏� 二쇱냼 �븘�뱶</option>
<option value="TEL" translate="common.telField">�쟾�솕踰덊샇 �븘�뱶</option>
</select>
+ <div class="mt-3">
+ <span class="custom-detail-label">�븘�닔 �뜲�씠�꽣</span>
+ <label class='switch'><input type='checkbox' ng-model="vm.form.requiredData">
+ <span class='slider round'></span>
+ </label>
+ </div>
</div>
- <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
+ <div class="form-group" ng-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
+ <label ng-if="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
+ <label ng-if="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-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
<input id="optionAdd"
type="text"
name="options"
@@ -77,8 +83,8 @@
</small>
</div>
- <div ng-repeat="option in vm.form.options" ng-show="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
-<!-- <div ng-repeat="option in vm.form.options" ng-show="vm.form.customFieldType != 'INPUT'">-->
+ <div ng-repeat="option in vm.form.options" ng-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
+<!-- <div ng-repeat="option in vm.form.options" ng-if="vm.form.customFieldType != 'INPUT'">-->
<span class="select3-selection__choice">
<span>{{option}}</span>
<span class="select3-selection__choice__remove" ng-click="fn.removeOption($index)">횞</span>
@@ -87,18 +93,16 @@
<div class="form-group">
<label for="customFieldModifyForm3"><span translate="customField.defaultValue">湲곕낯媛�</span> </label>
- <input ng-if="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
+ <input ng-show="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
id="customFieldModifyForm3"
type="text"
name="defaultValue"
class="form-control"
ng-model="vm.form.defaultValue"
- maxlength="100"
kr-input
- ng-maxlength="100"
autocomplete="off">
- <input ng-if="vm.form.customFieldType == 'NUMBER'"
+ <input ng-show="vm.form.customFieldType == 'NUMBER'"
name="numberType"
type="text"
class="form-control"
@@ -106,39 +110,40 @@
ng-pattern="/^[0-9]*$/"
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
- <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+ ng-model="vm.form.defaultNumValue">
+ <div ng-if="customFieldModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
- <input ng-if="vm.form.customFieldType == 'DATETIME'"
+ <input ng-show="vm.form.customFieldType == 'DATETIME'"
name="dateTime"
class="form-control input-readonly"
- ng-model="vm.form.defaultValue"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
+ ng-model="vm.form.defaultDateValue"
modal-form-auto-scroll
range-type="singleDate"
- onfocus="this.blur()"
- date-range-picker>
+ date-range-picker
+ autocomplete="off">
<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"
+ <input ng-show="vm.form.customFieldType == 'IP_ADDRESS'"
+ name="ipAddress"
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"
+ ng-model="vm.form.defaultIpValue">
+ <div ng-if="customFieldModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- <input ng-if="vm.form.customFieldType == 'EMAIL'"
+ <input ng-show="vm.form.customFieldType == 'EMAIL'"
name="email"
type="email"
class="form-control"
@@ -147,48 +152,51 @@
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"
+ ng-model="vm.form.defaultEmailValue">
+ <div ng-if="customFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- <input ng-if="vm.form.customFieldType == 'SITE'"
+ <input ng-show="vm.form.customFieldType == 'SITE'"
name="site"
type="text"
class="form-control"
- maxlength="30"
+ maxlength="100"
kr-input
- ng-pattern="/(http(s)?:\/\/)([a-z0-9\w]+\.*)+[a-z0-9]{2,4}/gi"
+ 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">
- <div ng-show="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
+ ng-model="vm.form.defaultSiteValue">
+ <div ng-if="customFieldModifyForm.site.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
-
- <input ng-if="vm.form.customFieldType == 'TEL'"
+ <input ng-show="vm.form.customFieldType == 'TEL'"
name="tel"
type="text"
+ maxlength="30"
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"
+ ng-model="vm.form.defaultTelValue">
+ <div ng-if="customFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- <small ng-show="customFieldModifyForm.defaultValue.$error.maxlength"
- class="help-block form-text text-danger" translate="common.upTo100Characters">
+<!-- <small ng-if="customFieldModifyForm.defaultValue.$error.maxlength"-->
+<!-- class="help-block form-text text-danger" translate="common.upTo100Characters">-->
+<!-- 理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.-->
+<!-- </small>-->
+ <!--<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
- </small>
- <div class="help-block form-text text-danger" ng-show="vm.form.customFieldType == 'SINGLE_SELECT'"
+ </small>-->
+ <div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"
translate="customField.selectSingleFieldListHashTag">
�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�
</div>
- <div class="help-block form-text text-danger" ng-show="vm.form.customFieldType == 'MULTI_SELECT'"
+ <div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'MULTI_SELECT'"
translate="customField.selectMultiFieldListHashTag">
�떎以� �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�#���긽媛�
</div>
--
Gitblit v1.8.0