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/customFieldModify.html | 46 ++++++++++++++++++++++++++++------------------
src/main/webapp/scripts/app/customField/customFieldAdd.controller.js | 2 +-
src/main/webapp/scripts/app/customField/customFieldModify.controller.js | 2 +-
3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
index c309bd5..91b67a4 100644
--- a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
@@ -27,7 +27,7 @@
options : [], // �샃�뀡
optionText : "", // �샃�뀡 媛�
numberType : "",
- ipAdress : "",
+ ipAddress : "",
email : "",
site : "",
tel : "",
diff --git a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
index 61cb612..5d440ee 100644
--- a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -36,7 +36,7 @@
optionText : "", // �샃�뀡 媛�
useCustomFieldValue : false, // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
numberType : "",
- ipAdress : "",
+ ipAddress : "",
email : "",
site : "",
tel : "",
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index e2b3acd..9c2e4f6 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -25,7 +25,7 @@
ng-maxlength="15"
input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
required>
- <small ng-show="customFieldModifyForm.name.$error.maxlength" class="help-block form-text text-danger"
+ <small ng-if="customFieldModifyForm.name.$error.maxlength" class="help-block form-text text-danger"
translate="common.upTo15Characters">
理쒕� 15湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</small>
@@ -35,7 +35,7 @@
<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>
+ <!-- <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>
@@ -48,17 +48,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">
+ <div class="input-group" ng-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
<input id="optionAdd"
type="text"
name="options"
@@ -77,8 +83,8 @@
</small>
</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'">-->
+ <div ng-repeat="option in vm.form.options" ng-if="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
+<!-- <div ng-repeat="option in vm.form.options" ng-if="vm.form.customFieldType != 'INPUT'">-->
<span class="select3-selection__choice">
<span>{{option}}</span>
<span class="select3-selection__choice__remove" ng-click="fn.removeOption($index)">횞</span>
@@ -87,7 +93,7 @@
<div class="form-group">
<label for="customFieldModifyForm3"><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="customFieldModifyForm3"
type="text"
name="defaultValue"
@@ -107,7 +113,7 @@
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
- <div ng-show="customFieldModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="customFieldModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
@@ -134,7 +140,7 @@
placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
- <div ng-show="customFieldModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="customFieldModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
@@ -148,7 +154,7 @@
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
- <div ng-show="customFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="customFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
@@ -162,7 +168,7 @@
placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
- <div ng-show="customFieldModifyForm.site.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="customFieldModifyForm.site.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
@@ -176,19 +182,23 @@
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
- <div ng-show="customFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ <div ng-if="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">
+<!-- <small ng-if="customFieldModifyForm.defaultValue.$error.maxlength"-->
+<!-- class="help-block form-text text-danger" translate="common.upTo100Characters">-->
+<!-- 理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.-->
+<!-- </small>-->
+ <small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</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