From 843b991407d0be62a9e476fa45f49fbcb48b4ab6 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 27 12월 2021 21:30:20 +0900
Subject: [PATCH] 이슈 리스트 상세 검색 x 표시 구분 및 사용자 정의필드 정규표현식 개별 변경으로 수정
---
src/main/webapp/views/issue/issueListNormal.html | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 5c2e06a..593cbbd 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -47,6 +47,12 @@
<issue-search-field-key-view-element lists="vm.issueStatuses"
keys="vm.search.issueStatusIds"></issue-search-field-key-view-element>
+ <!-- �씠�뒋 踰덊샇 -->
+ <p ng-if="$root.isDefined(vm.search.issueNumber)">
+ {{vm.search.issueNumber}}
+ <span ng-click="vm.search.issueNumber = ''">횞</span>
+ </p>
+
<!-- �씠�뒋 �궡�슜 -->
<p ng-if="$root.isDefined(vm.search.description)">
{{vm.search.description}}
@@ -86,6 +92,10 @@
{{vm.search.registerDateRange}}
<span ng-click="vm.search.registerDateRange = ''">횞</span>
</p>
+
+ <!-- �떞�떦遺��꽌 -->
+ <issue-search-array-view-element lists="vm.departments"
+ type="'department'"></issue-search-array-view-element>
<!-- �뀓�뒪�듃 �엯�젰 �븘�뱶 -->
<issue-search-custom-field-view-element
@@ -154,12 +164,12 @@
<div class="form-group">
<label> <span translate="issue.issueNumber">�씠�뒋 踰덊샇</span></label>
<input type="text"
- name="name"
+ name="issueNumber"
class="form-control input-sm"
autocomplete="off"
kr-input
maxlength="20"
- ng-model="vm.search.combinationIssueNumber">
+ ng-model="vm.search.issueNumber">
</div>
</div>
@@ -280,23 +290,23 @@
<div ng-switch-when="NUMBER">
<input type="text"
class="form-control input-sm"
- name="numberType"
+ name="item_{{$index}}"
ng-model="customField.useValues"
kr-input
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
ng-pattern="/^[0-9]*$/"
autocomplete="off">
- <div ng-show="issueSearchForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueSearchForm['item_'+ $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
</div>
- <!-- todo : �궇吏� 寃��깋 臾몄젣 -->
<div ng-switch-when="DATETIME">
- <input type="text" class="form-control input-sm"
- name="dateTime"
+ <input class="form-control input-sm input-readonly"
+ name="item_{{$index}}"
ng-model="customField.useValues"
- maxlength="100"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
+ modal-form-auto-scroll
range-type="singleDate"
date-range-picker>
<div class="row">
@@ -309,13 +319,13 @@
<div ng-switch-when="IP_ADDRESS">
<input type="text"
class="form-control input-sm"
- name="ipAdress"
+ name="item_{{$index}}"
ng-model="customField.useValues"
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">
- <div ng-show="issueSearchForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueSearchForm['item_'+ $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -323,13 +333,13 @@
<div ng-switch-when="EMAIL">
<input type="email"
class="form-control input-sm"
- name="email"
+ name="item_{{$index}}"
ng-model="customField.useValues"
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off">
- <div ng-show="issueSearchForm.email.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueSearchForm['item_'+ $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -337,26 +347,26 @@
<div ng-switch-when="SITE">
<input type="text"
class="form-control input-sm"
- name="site"
+ name="item_{{$index}}"
ng-model="customField.useValues"
kr-input
- ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off">
- <div ng-show="issueSearchForm.site.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueSearchForm['item_'+ $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
</div>
<div ng-switch-when="TEL">
<input type="text"
class="form-control input-sm"
- name="tel"
+ name="item_{{$index}}"
ng-model="customField.useValues"
kr-input
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off">
- <div ng-show="issueSearchForm.tel.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueSearchForm['item_'+ $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -420,8 +430,8 @@
<!-- �슦痢� -->
<div class="col-5" >
- <span class="issue-detail-label" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �븯�쐞 �씠�뒋 �닲湲곌린</span>
- <label class='switch' style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
+ <span class="issue-detail-label" ng-if="vm.listMode === 0" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �븯�쐞 �씠�뒋 �닲湲곌린</span>
+ <label class='switch' ng-if="vm.listMode === 0" style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
<span class='slider round'></span>
</label>
<span class="issue-detail-label" style="position: relative; left: 5.8rem; bottom: 5px"><span style="color: #0a7cf8">�뾾</span> �셿猷� �씠�뒋 �닲湲곌린</span>
--
Gitblit v1.8.0