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 | 30 +++++++++++++++---------------
src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js | 7 ++++---
src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js | 10 ++++++++--
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js b/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
index 95786b3..0d55314 100644
--- a/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
+++ b/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
@@ -56,10 +56,11 @@
case "department":
makeTag += list.byName;
break;
+
}
-
-
- // makeTag += "<span ng-click='fn.remove(" + list.id + ")'>횞</span>";
+ if ($scope.type === "department" || $scope.type === "user") {
+ makeTag += "<span ng-click='fn.remove(" + list.id + ")'>횞</span>";
+ }
makeTag += "</p>";
});
diff --git a/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js b/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js
index 2c16648..a973f67 100644
--- a/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js
+++ b/src/main/webapp/scripts/components/utils/issueSearchFieldKeyViewElement.directive.js
@@ -51,8 +51,14 @@
break;
}
}
-
- // makeTag += "<span ng-click='fn.remove(" + key.fieldKey + ")'>횞</span>";
+ for (let i = 0; i < $scope.lists.length; i++) {
+ if(JSON.stringify($scope.lists[i]) === JSON.stringify(key)) {
+ makeTag = "";
+ makeTag += "<p>"+target.fieldValue+"</p>";
+ return;
+ }
+ }
+ makeTag += "<span ng-click='fn.remove(" + key.fieldKey + ")'>횞</span>";
makeTag += "</p>";
});
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 2f018a6..593cbbd 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -290,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">
@@ -319,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>
@@ -333,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>
@@ -347,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>
--
Gitblit v1.8.0