From 351e832cb2c0201ea3124a67944760bcb48a82f4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 16:57:32 +0900
Subject: [PATCH] 사용자정의필드 프론트 수정
---
src/main/webapp/views/customField/customFieldAdd.html | 3 ++-
src/main/webapp/views/customField/customFieldModify.html | 10 ++++++++--
src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties | 2 +-
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 18 ++++++++++++++++++
src/main/webapp/scripts/app/customField/customFieldAdd.controller.js | 4 ++--
5 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
index be165a9..f13e192 100644
--- a/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
@@ -87,7 +87,7 @@
CUSTOM_FIELD_NAME_MAX_LENGTH_OUT = \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uBA85\uC740 \uCD5C\uB300 50\uAE00\uC790\uAE4C\uC9C0 \uC785\uB825\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
CUSTOM_FIELD_USED_NAME = \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uBA85\uC774 \uC774\uBBF8 \uC0AC\uC6A9\uB418\uACE0 \uC788\uC2B5\uB2C8\uB2E4.
CUSTOM_FIELD_REMOVE_NOT_SELECT = \uC0AD\uC81C\uD560 \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC\uAC00 \uC120\uD0DD\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
-CUSTOM_FIELD_OPTIONS_NOT_USE_INPUT_FIELD = \uBB38\uC790\uC5F4 \uD544\uB4DC\uB294 \uC635\uC158 \uAC12\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+CUSTOM_FIELD_OPTIONS_NOT_USE_INPUT_FIELD = \uC120\uD0DD\uD55C \uD544\uB4DC\uB294 \uC635\uC158 \uAC12\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
CUSTOM_FIELD_OPTIONS_NOT_EXIST_DEFAULT_VALUE = \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uAE30\uBCF8 \uAC12\uC774 \uC635\uC158\uC5D0 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
CUSTOM_FIELD_OPTIONS_USED_EXIST_DEFAULT_VALUE = \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uAE30\uBCF8 \uAC12\uC5D0 \uC911\uBCF5\uB41C \uAC12\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4.
CUSTOM_FIELD_OPTIONS_NOT_USE_MULTI_DEFAULT_VALUE = \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uC635\uC158 \uAC12\uC5D0 \uB300\uD55C \uAE30\uBCF8 \uAC12\uC73C\uB85C 2\uAC1C \uC774\uC0C1 \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 3e2403e..5c46669 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -370,6 +370,24 @@
case "INPUT" :
makeTag += "<span translate='common.stringField'>臾몄옄�뿴 �븘�뱶</span>";
break;
+ case "NUMBER" :
+ makeTag += "<span translate='common.numberField'>�닽�옄 �븘�뱶</span>";
+ break;
+ case "DATETIME" :
+ makeTag += "<span translate='common.datetimeField'>�닽�옄 �븘�뱶</span>";
+ break;
+ case "IP_ADDRESS" :
+ makeTag += "<span translate='common.ipAddressField'>�닽�옄 �븘�뱶</span>";
+ break;
+ case "EMAIL" :
+ makeTag += "<span translate='common.emailField'>�닽�옄 �븘�뱶</span>";
+ break;
+ case "SITE" :
+ makeTag += "<span translate='common.siteField'>�닽�옄 �븘�뱶</span>";
+ break;
+ case "TEL" :
+ makeTag += "<span translate='common.telField'>�닽�옄 �븘�뱶</span>";
+ break;
case "MULTI_SELECT" :
makeTag += "<span translate='common.multipleSelectionField'>�떎以� �꽑�깮 �븘�뱶</span>";
break;
diff --git a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
index 0107228..ac901db 100644
--- a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
@@ -94,7 +94,7 @@
}
// �떎以�, �떒�씪 �꽑�깮�씪 寃쎌슦�뿉
- if ($scope.vm.form.customFieldType !== "INPUT") {
+ if ($scope.vm.form.customFieldType === "MULTI_SELECT" || $scope.vm.form.customFieldType === "SINGLE_SELECT") {
// �샃�뀡�씠 1媛� �씠�븯�씪 寃쎌슦�뿉�뒗 ���젆�듃 �깭洹몃�� 留뚮뱾 �닔 �뾾�떎.
if ($scope.vm.form.options.length < 1) {
return true;
@@ -111,7 +111,7 @@
var content = angular.copy($scope.vm.form);
content.name = $rootScope.preventXss(content.name);
- if ($scope.vm.form.customFieldType !== 'INPUT') {
+ if ($scope.vm.form.customFieldType === 'MULTI_SELECT'|| $scope.vm.form.customFieldType === "SINGLE_SELECT") {
var convertDefaultValues = "";
angular.forEach(content.defaultValue.split("#"), function (value) {
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index c64c0ee..2c76559 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -38,6 +38,7 @@
ng-change="fn.changeFieldType()">
<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>
@@ -47,7 +48,7 @@
</select>
</div>
- <div class="form-group" ng-show="vm.form.customFieldType != 'INPUT'">
+ <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
translate="customField.createSingleFieldList">�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉 留뚮뱾湲�</span> <code
class="highlighter-rouge">*</code></label>
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 8c9ac73..546c3c8 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -38,12 +38,18 @@
<select id="customFieldModifyForm2" class="form-control" ng-model="vm.form.customFieldType"
ng-change="fn.changeCustomFieldType()">
<option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</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>
- <div class="form-group" ng-show="vm.form.customFieldType != 'INPUT'">
+ <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
translate="customField.createSingleFieldList">�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉 留뚮뱾湲�</span> <code
class="highlighter-rouge">*</code></label>
@@ -69,7 +75,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-show="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>
--
Gitblit v1.8.0