From de6841b2f701995d04cd314585aca41ed3b977be Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 24 12월 2021 13:04:11 +0900
Subject: [PATCH] 탐지정보 안내 문구 표시 수정
---
src/main/webapp/views/issue/issueModify.html | 129 ++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 45 deletions(-)
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index a41fb5f..954fe10 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -222,7 +222,7 @@
<div class="col-lg-12">
<div class="row">
<div class="col-md-12">
- <div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1">
+ <div class="form-group mgb5" ng-if="vm.form.issueCustomFields.length < 1">
<label class="issue-label" translate="issue.notIssueTypeCustomFields">�씠�뒋 ���엯�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽
�븘�뱶媛� �뾾�뒿�땲�떎.</label>
</div>
@@ -230,38 +230,43 @@
<div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields">
<div class="form-group mgb5">
- <label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
+ <label class="issue-label">{{issueCustomField.customFieldVo.name}} <code ng-if="issueCustomField.customFieldVo.requiredData == 'Y'" class="highlighter-rouge">*</code> </label>
<div ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<input type="text" class="form-control input-sm"
- name="input"
+ name="inputValue"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.input.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.inputValue.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
</div>
<div ng-switch-when="NUMBER">
<input type="text" class="form-control input-sm"
- name="number"
+ name="numberType"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
+ ng-pattern="/^[0-9]*$/"
+ placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.number.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.numberType.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
+ <div ng-if="issueModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
</div>
<div ng-switch-when="DATETIME">
@@ -272,11 +277,11 @@
autocomplete="off"
kr-input
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.dateTime.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.dateTime.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
</div>
<div ng-switch-when="IP_ADDRESS">
@@ -286,12 +291,36 @@
maxlength="100"
autocomplete="off"
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 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.ipAddress.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.ipAddress.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
+ <div ng-if="issueModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <input type="email" class="form-control input-sm"
+ name="email"
+ maxlength="30"
+ ng-model="issueCustomField.useValues"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+ placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.ipAddress.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
+ <div ng-if="issueModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<div ng-switch-when="SITE">
@@ -301,27 +330,37 @@
maxlength="100"
autocomplete="off"
kr-input
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
+ placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.site.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.site.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
+ <div ng-if="issueModifyForm.site.$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"
ng-model="issueCustomField.useValues"
- maxlength="100"
+ maxlength="30"
autocomplete="off"
kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.tel.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.tel.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
+ <div ng-if="issueModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<!-- �떒�씪 ���젆�듃 -->
@@ -337,11 +376,11 @@
{{customFieldValueVo.value}}
</option>
</select>
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.singleSelect.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.singleSelect.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
</div>
<!-- 硫��떚 ���젆�듃 -->
@@ -355,11 +394,11 @@
<input class="form-control input-sm issue-select-label"
type="hidden" name="multiSelect" ng-model="issueCustomField.useValues[0]"
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
- <small class="help-block form-text text-danger"
- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueModifyForm.multiSelect.$error.required"
- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
- </small>
+<!-- <small class="help-block form-text text-danger"-->
+<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
+<!-- ng-if="issueModifyForm.multiSelect.$error.required"-->
+<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
+<!-- </small>-->
</div>
</div>
</div>
--
Gitblit v1.8.0