From add0cdefd56c50c5427945c895574f71202e7ed6 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 수, 16 3월 2022 18:12:51 +0900
Subject: [PATCH] - api로 이슈 추가 시 사용자정의필드 타입으로 체크 => 정규식표현검사로 체크로 변경
---
src/main/webapp/views/companyField/companyFieldModify.html | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 33ed903..1602c25 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -50,48 +50,60 @@
</div>-->
</div>
<div class="row">
- <div class="col-lg-6 mw-49">
+ <div class="col-lg-5 mw-49">
<div class="form-group">
<label for="companyFieldModifyForm11" class="issue-label">
<span translate="companyField.ipRange">ip ���뿭��</span>
</label>
- <input id="companyFieldModifyForm11"
- name="ipStart"
- 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.ipStart"
- >
+ <div ng-repeat="s in vm.form.inputIpStarts" style="display: flex">
+ <input id="companyFieldModifyForm11"
+ name="ipStart"
+ type="text"
+ class="form-control mt-1"
+ kr-input
+ ng-model="vm.form.ipStarts[$index]"
+ 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"
+ style="width: 189px;"
+ >
+ <div class="issue-label select3-selection__ipRange__tilde">~</div>
+ </div>
<div ng-if="companyFieldModifyForm.ipStart.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
</div>
- <div class="mt-30">
- <label class="issue-label">~</label>
- </div>
- <div class="col-lg-6 mw-49">
+ <div class="col-lg-5 mw-49" style="margin-top: 4px;">
<div class="form-group">
- <label for="companyFieldModifyForm12" class="issue-label">
- </label>
- <input id="companyFieldModifyForm12"
- name="ipEnd"
- 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.ipEnd"
- >
+ <label for="companyFieldModifyForm12" class="issue-label"></label>
+ <div ng-repeat="e in vm.form.inputIpEnds" style="display: flex">
+ <input id="companyFieldModifyForm12"
+ name="ipEnd"
+ type="text"
+ class="form-control mt-1"
+ kr-input
+ ng-model="vm.form.ipEnds[$index]"
+ 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"
+ style="width: 189px;"
+ >
+ <div class="select3-selection__ipRange__remove"
+ ng-click="fn.removeIpRangeInput($index)">횞</div>
+ </div>
<div ng-if="companyFieldModifyForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
</div>
+ <div class="col-lg-2 mt-25" style="margin-left: -15px">
+ <div>
+ <button type="button" class="btn btn-secondary" ng-click="fn.addIpRange()">
+ <span translate="common.add">異붽�</span>
+ </button>
+ </div>
+ </div>
</div>
<div class="row">
<div class="col-lg-6">
--
Gitblit v1.8.0