From e7fafe05e4d394a9f1ed4554793689f1bf864ff2 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 23 12월 2021 08:53:10 +0900
Subject: [PATCH] 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정

---
 src/main/webapp/views/customField/customFieldAdd.html |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index ea027dd..68ce107 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -34,7 +34,7 @@
             <div class="form-group">
                 <label for="customFieldAddForm2"><span translate="customField.fieldType">�븘�뱶 �쑀�삎</span> <code
                         class="highlighter-rouge">*</code></label>
-                &nbsp;&nbsp; <label for="customFieldAddForm2"> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>
+                <!--&nbsp;&nbsp; <label for="customFieldAddForm2"> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>-->
                 <select id="customFieldAddForm2" class="form-control" ng-model="vm.form.customFieldType"
                         ng-change="fn.changeFieldType()">
                     <option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</option>
@@ -47,6 +47,12 @@
                     <option value="SITE" translate="common.siteField">�솃�럹�씠吏� 二쇱냼 �븘�뱶</option>
                     <option value="TEL" translate="common.telField">�쟾�솕踰덊샇 �븘�뱶</option>
                 </select>
+                <div class="mt-3">
+                    <span class="custom-detail-label">�븘�닔 �뜲�씠�꽣</span>
+                    <label class='switch'><input type='checkbox' ng-model="vm.form.requiredData">
+                        <span class='slider round'></span>
+                    </label>
+                </div>
             </div>
 
             <div class="form-group" ng-show="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
@@ -125,7 +131,7 @@
                 </div>
 
                 <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
-                       name="ipAdress"
+                       name="ipAddress"
                        type="text"
                        class="form-control"
                        kr-input
@@ -133,7 +139,7 @@
                        placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                        autocomplete="off"
                        ng-model="vm.form.defaultValue">
-                <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+                <div ng-show="customFieldAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
                      translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
                 </div>
 
@@ -155,9 +161,9 @@
                        name="site"
                        type="text"
                        class="form-control"
-                       maxlength="30"
+                       maxlength="100"
                        kr-input
-                       ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/"
+                       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">
@@ -165,10 +171,10 @@
                      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}$/"

--
Gitblit v1.8.0