From 689e17c797bf3844f7b6b6f7c086df9bd8f72a0c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 19:45:34 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueAdd.html | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index b57bf4f..688a61b 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.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>
@@ -236,7 +236,7 @@
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<input type="text" class="form-control input-sm"
- name="inputValue"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
@@ -251,7 +251,7 @@
<div ng-switch-when="NUMBER">
<input type="text" class="form-control input-sm"
- name="numberType"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
@@ -264,20 +264,21 @@
<!-- ng-if="issueAddForm.numberType.$error.required"-->
<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
<!-- </small>-->
- <div ng-show="issueAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueAddForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
</div>
<div ng-switch-when="DATETIME">
<input class="form-control input-sm input-readonly"
- name="dateTime"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
placeholder="{{'issue.clickToSelectDate' | translate}}"
modal-form-auto-scroll
range-type="singleDate"
date-range-picker
kr-input
+ autocomplete="off"
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<!-- <small class="help-block form-text text-danger"-->
<!-- ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"-->
@@ -288,7 +289,7 @@
<div ng-switch-when="IP_ADDRESS">
<input type="text" class="form-control input-sm"
- name="ipAddress"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
autocomplete="off"
kr-input
@@ -300,14 +301,14 @@
<!-- ng-if="issueAddForm.ipAddress.$error.required"-->
<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
<!-- </small>-->
- <div ng-show="issueAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueAddForm['item_' + $index].$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"
+ name="item_{{$index}}"
maxlength="30"
ng-model="issueCustomField.useValues"
kr-input
@@ -319,14 +320,14 @@
<!-- ng-if="issueAddForm.ipAddress.$error.required"-->
<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
<!-- </small>-->
- <div ng-show="issueAddForm.email.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueAddForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
<div ng-switch-when="SITE">
<input type="text" class="form-control input-sm"
- name="site"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
@@ -339,14 +340,14 @@
<!-- ng-if="issueAddForm.site.$error.required"-->
<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
<!-- </small>-->
- <div ng-show="issueAddForm.site.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueAddForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http:// �삉�뒗 www 濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
</div>
<div ng-switch-when="TEL">
<input type="text" class="form-control input-sm"
- name="tel"
+ name="item_{{$index}}"
ng-model="issueCustomField.useValues"
maxlength="30"
autocomplete="off"
@@ -359,7 +360,7 @@
<!-- ng-if="issueAddForm.tel.$error.required"-->
<!-- translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.-->
<!-- </small>-->
- <div ng-show="issueAddForm.tel.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="issueAddForm['item_' + $index].$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -367,7 +368,7 @@
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
<select class="form-control input-sm issue-select-label"
- name="singleSelect"
+ name="item_{{$index}}"
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'"
ng-model="issueCustomField.useValues">
<option value="" value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
@@ -425,6 +426,7 @@
<js-autocomplete-single data-input-name="issueCompanyField"
selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
+ custom-input="true"
source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
--
Gitblit v1.8.0