From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/webapp/views/companyField/companyFieldModify.html | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index b66d3e4..33ed903 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -21,19 +21,21 @@
class="form-control"
autofocus
kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
autocomplete="off"
ng-model="vm.form.name"
ng-maxlength="100"
maxlength="100"
required>
- <small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
- <label for="companyFieldAddForm10" class="issue-label">
+ <label for="companyFieldModifyForm10" class="issue-label">
<span translate="companyField.url">url</span>
</label>
- <input id="companyFieldAddForm10"
+ <div class="help-block form-text text-danger fs-09">
+ <small translate="companyField.multiUrlWithComma">�뿬�윭媛쒖쓽 url�쓣 �엯�젰 �븷 �닔 �엳�뒿�땲�떎. (援щ텇: ',') ex: www.test.com, www.test2.com</small>
+ </div>
+ <input id="companyFieldModifyForm10"
name="url"
type="text"
class="form-control"
@@ -42,10 +44,53 @@
ng-model="vm.form.url"
ng-maxlength="200"
maxlength="200"
- ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
>
- <div ng-show="companyFieldModifyForm.url.$error.pattern" class="help-block form-text text-danger"
+ <!--<div ng-show="companyFieldModifyForm.url.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>-->
+ </div>
+ <div class="row">
+ <div class="col-lg-6 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-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="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"
+ >
+ <div ng-if="companyFieldModifyForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
</div>
</div>
<div class="row">
@@ -103,14 +148,12 @@
kr-input
ng-model="vm.form.tels[$index]"
input-regex="[^0-9]"
- maxlength="11"
- minlength="9"
autocomplete="off">
<span class="select3-selection__email__remove" ng-click="fn.removeTelInput($index)">횞</span>
</div>
- <div ng-show="companyFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
+ <!--<div ng-show="companyFieldModifyForm.tel.$error.minlength" class="help-block form-text text-danger"
translate="common.least9CharactersTel">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-2 mt-25" style="margin-left: -15px">
@@ -218,7 +261,7 @@
ng-model="vm.form.childSector"
custom-input="false"
search="vm.form.childSector"
- source="fn.getCompanyChildSector(vm.form.parentSectors, vm.form.parentSectorId, vm.typeCategory.childSector, vm.form.childSector, vm.form.childSectors, vm.autoCompletePage.childSector.page, fn.getChildSectorListCallBack)"
+ source="fn.getCompanyChildSector(vm.form.parentSectorId, vm.form.parentSectors[0].id, vm.typeCategory.childSector, vm.form.childSector, vm.form.childSectors, vm.autoCompletePage.childSector.page, fn.getChildSectorListCallBack)"
page="vm.autoCompletePage.childSector.page"
total-page="vm.autoCompletePage.childSector.totalPage"
input-disabled="false"
--
Gitblit v1.8.0