From 12e19e0b8bc5e728169dad54c132e7ccd41973a4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 3월 2022 12:55:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/webapp/views/customField/customFieldAdd.html | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index 22bbd58..96f0e76 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -91,7 +91,7 @@
<div class="form-group">
<label for="customFieldAddForm3"><span translate="customField.defaultValue">湲곕낯媛�</span> </label>
- <input ng-if="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
+ <input ng-show="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
id="customFieldAddForm3"
type="text"
name="defaultValue"
@@ -101,7 +101,7 @@
autocomplete="off">
- <input ng-if="vm.form.customFieldType == 'NUMBER'"
+ <input ng-show="vm.form.customFieldType == 'NUMBER'"
name="numberType"
type="text"
class="form-control"
@@ -109,16 +109,16 @@
ng-pattern="/^[0-9]*$/"
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultNumValue">
<div ng-if="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
- <input ng-if="vm.form.customFieldType == 'DATETIME'"
+ <input ng-show="vm.form.customFieldType == 'DATETIME'"
name="dateTime"
class="form-control input-readonly"
placeholder="{{'issue.clickToSelectDate' | translate}}"
- ng-model="vm.form.defaultValue"
+ ng-model="vm.form.defaultDateValue"
modal-form-auto-scroll
range-type="singleDate"
date-range-picker
@@ -129,7 +129,7 @@
</div>
</div>
- <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
+ <input ng-show="vm.form.customFieldType == 'IP_ADDRESS'"
name="ipAddress"
type="text"
class="form-control"
@@ -137,12 +137,12 @@
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.defaultValue">
+ ng-model="vm.form.defaultIpValue">
<div ng-if="customFieldAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- <input ng-if="vm.form.customFieldType == 'EMAIL'"
+ <input ng-show="vm.form.customFieldType == 'EMAIL'"
name="email"
type="email"
class="form-control"
@@ -151,12 +151,12 @@
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultEmailValue">
<div ng-if="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- <input ng-if="vm.form.customFieldType == 'SITE'"
+ <input ng-show="vm.form.customFieldType == 'SITE'"
name="site"
type="text"
class="form-control"
@@ -165,12 +165,12 @@
ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultSiteValue">
<div ng-if="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
- <input ng-if="vm.form.customFieldType == 'TEL'"
+ <input ng-show="vm.form.customFieldType == 'TEL'"
name="tel"
type="text"
maxlength="30"
@@ -179,7 +179,7 @@
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultTelValue">
<div ng-if="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
--
Gitblit v1.8.0