From 57fd755996962af22fbf8f322ee03d1380044f1f Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 17:01:43 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/customField/customFieldModify.html | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 546c3c8..e2b3acd 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -35,17 +35,18 @@
<div class="form-group">
<label for="customFieldModifyForm2"><span translate="customField.fieldType">�븘�뱶 �쑀�삎</span><code
class="highlighter-rouge">*</code></label>
+ <label> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>
<select id="customFieldModifyForm2" class="form-control" ng-model="vm.form.customFieldType"
ng-change="fn.changeCustomFieldType()">
<option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</option>
+ <option value="SINGLE_SELECT" translate="common.singleSelectionField">�떒�씪 �꽑�깮 �븘�뱶</option>
+ <option value="MULTI_SELECT" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</option>
<option value="NUMBER" translate="common.numberField">�닽�옄 �븘�뱶</option>
<option value="DATETIME" translate="common.datetimeField">�궇吏� �븘�뱶</option>
<option value="IP_ADDRESS" translate="common.ipAddressField">IP 二쇱냼 �븘�뱶</option>
<option value="EMAIL" translate="common.emailField">�씠硫붿씪 �븘�뱶</option>
<option value="SITE" translate="common.siteField">�솃�럹�씠吏� 二쇱냼 �븘�뱶</option>
<option value="TEL" translate="common.telField">�쟾�솕踰덊샇 �븘�뱶</option>
- <option value="SINGLE_SELECT" translate="common.singleSelectionField">�떒�씪 �꽑�깮 �븘�뱶</option>
- <option value="MULTI_SELECT" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</option>
</select>
</div>
@@ -56,6 +57,7 @@
<label ng-show="vm.form.customFieldType == 'MULTI_SELECT'"><span
translate="customField.createMultiFieldList">�떎以� �꽑�깮 �븘�뱶 紐⑸줉 留뚮뱾湲�</span> <code
class="highlighter-rouge">*</code></label>
+
<div class="input-group">
<input id="optionAdd"
type="text"
@@ -76,6 +78,7 @@
</div>
<div ng-repeat="option in vm.form.options" ng-show="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
+<!-- <div ng-repeat="option in vm.form.options" ng-show="vm.form.customFieldType != 'INPUT'">-->
<span class="select3-selection__choice">
<span>{{option}}</span>
<span class="select3-selection__choice__remove" ng-click="fn.removeOption($index)">횞</span>
@@ -84,7 +87,8 @@
<div class="form-group">
<label for="customFieldModifyForm3"><span translate="customField.defaultValue">湲곕낯媛�</span> </label>
- <input id="customFieldModifyForm3"
+ <input ng-if="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
+ id="customFieldModifyForm3"
type="text"
name="defaultValue"
class="form-control"
@@ -93,6 +97,89 @@
kr-input
ng-maxlength="100"
autocomplete="off">
+
+ <input ng-if="vm.form.customFieldType == 'NUMBER'"
+ name="numberType"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^[0-9]*$/"
+ placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ ng-model="vm.form.defaultValue">
+ <div ng-show="customFieldModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
+
+ <input ng-if="vm.form.customFieldType == 'DATETIME'"
+ name="dateTime"
+ class="form-control input-readonly"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
+ ng-model="vm.form.defaultValue"
+ modal-form-auto-scroll
+ range-type="singleDate"
+ date-range-picker>
+ <div class="row">
+ <div class="col-xs-12">
+ <div id="createdWidget" class="bootstrap-datepicker"></div>
+ </div>
+ </div>
+
+ <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
+ name="ipAddress"
+ 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.defaultValue">
+ <div ng-show="customFieldModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+
+ <input ng-if="vm.form.customFieldType == 'EMAIL'"
+ name="email"
+ type="email"
+ class="form-control"
+ maxlength="30"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+ placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ ng-model="vm.form.defaultValue">
+ <div ng-show="customFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+
+ <input ng-if="vm.form.customFieldType == 'SITE'"
+ name="site"
+ type="text"
+ class="form-control"
+ maxlength="100"
+ kr-input
+ 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">
+ <div ng-show="customFieldModifyForm.site.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+ </div>
+
+ <input ng-if="vm.form.customFieldType == 'TEL'"
+ name="tel"
+ type="text"
+ maxlength="30"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ ng-model="vm.form.defaultValue">
+ <div ng-show="customFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+
<small ng-show="customFieldModifyForm.defaultValue.$error.maxlength"
class="help-block form-text text-danger" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
--
Gitblit v1.8.0