From 51777e5458728d5b553d0fec05a7ef094bde9911 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 10 2월 2022 17:43:59 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 해결 (ng-if => ng-show)
---
src/main/webapp/views/customField/customFieldAdd.html | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index ea027dd..d1bf665 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -23,18 +23,18 @@
ng-model="vm.form.name"
maxlength="15"
ng-maxlength="15"
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="/[^?a-zA-Z0-9/]/"
required>
- <small ng-show="customFieldAddForm.name.$error.maxlength" translate="common.upTo15Characters">
+ <small ng-if="customFieldAddForm.name.$error.maxlength" translate="common.upTo15Characters">
理쒕� 15湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</small>
- <small translate="customField.limitNameToSpecialCharacters">�궗�슜�옄 �젙�쓽 �븘�뱶 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="customField.limitNameToSpecialCharacters">�궗�슜�옄 �젙�쓽 �븘�뱶 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
<label for="customFieldAddForm2"><span translate="customField.fieldType">�븘�뱶 �쑀�삎</span> <code
class="highlighter-rouge">*</code></label>
- <label for="customFieldAddForm2"> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>
+ <!-- <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,17 +47,23 @@
<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'">
- <label ng-show="vm.form.customFieldType == 'SINGLE_SELECT'"><span
+ <div class="form-group" ng-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
+ <label ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"><span
translate="customField.createSingleFieldList">�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉 留뚮뱾湲�</span> <code
class="highlighter-rouge">*</code></label>
- <label ng-show="vm.form.customFieldType == 'MULTI_SELECT'"><span
+ <label ng-if="vm.form.customFieldType == 'MULTI_SELECT'"><span
translate="customField.createMultiFieldList">�떎以� �꽑�깮 �븘�뱶 紐⑸줉 留뚮뱾湲�</span> <code
class="highlighter-rouge">*</code></label>
- <div class="input-group" ng-show="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
+ <div class="input-group" ng-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
<input id="optionAdd"
type="text"
name="options"
@@ -76,7 +82,7 @@
</small>
</div>
- <div ng-repeat="option in vm.form.options" ng-show="vm.form.customFieldType != 'INPUT'">
+ <div ng-repeat="option in vm.form.options" ng-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
<span class="select3-selection__choice">
<span>{{option}}</span>
<span class="select3-selection__choice__remove" ng-click="fn.removeOption($index)">횞</span>
@@ -85,19 +91,17 @@
<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"
class="form-control"
ng-model="vm.form.defaultValue"
- maxlength="100"
kr-input
- ng-maxlength="100"
autocomplete="off">
- <input ng-if="vm.form.customFieldType == 'NUMBER'"
+ <input ng-show="vm.form.customFieldType == 'NUMBER'"
name="numberType"
type="text"
class="form-control"
@@ -106,26 +110,27 @@
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
- <div ng-show="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ <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"
modal-form-auto-scroll
range-type="singleDate"
- date-range-picker>
+ date-range-picker
+ autocomplete="off">
<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="ipAdress"
+ <input ng-show="vm.form.customFieldType == 'IP_ADDRESS'"
+ name="ipAddress"
type="text"
class="form-control"
kr-input
@@ -133,11 +138,11 @@
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-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"
@@ -147,47 +152,48 @@
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
- <div ng-show="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
+ <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"
- 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">
- <div ng-show="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
+ <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"
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="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
+
+ <div ng-if="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- <small ng-show="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
+ <!--<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
- </small>
+ </small>-->
- <div class="help-block form-text text-danger" ng-show="vm.form.customFieldType == 'SINGLE_SELECT'"
+ <div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"
translate="customField.selectSingleFieldListHashTag">
�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�
</div>
- <div class="help-block form-text text-danger" ng-show="vm.form.customFieldType == 'MULTI_SELECT'"
+ <div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'MULTI_SELECT'"
translate="customField.selectMultiFieldListHashTag">
�떎以� �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�#���긽媛�
</div>
--
Gitblit v1.8.0