From fb08399e35f7b90c9c5ef9781af10569be85f9ca Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 2월 2022 16:08:44 +0900
Subject: [PATCH] - 사용자정의필드 기본값 입력시 모든 오류 메세지가 표시되는 문제 해결
---
src/main/webapp/views/customField/customFieldAdd.html | 12 +++---
src/main/java/kr/wisestone/owl/web/form/CustomFieldForm.java | 15 +++++++
src/main/webapp/views/customField/customFieldModify.html | 22 +++++-----
src/main/webapp/scripts/app/customField/customFieldAdd.controller.js | 12 ++++++
src/main/webapp/scripts/app/customField/customFieldModify.controller.js | 32 +++++++++++++++
5 files changed, 75 insertions(+), 18 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/CustomFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/CustomFieldForm.java
index e92aa07..ab43293 100644
--- a/src/main/java/kr/wisestone/owl/web/form/CustomFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/CustomFieldForm.java
@@ -39,6 +39,21 @@
}else {
form.setRequiredData("N");
}
+
+ if (MapUtil.getString(params, "defaultNumValue") != null) {
+ form.setDefaultValue(MapUtil.getString(params, "defaultNumValue"));
+ } else if (MapUtil.getString(params, "defaultDateValue") != null) {
+ form.setDefaultValue(MapUtil.getString(params, "defaultDateValue"));
+ } else if (MapUtil.getString(params, "defaultIpValue") != null) {
+ form.setDefaultValue(MapUtil.getString(params, "defaultIpValue"));
+ } else if (MapUtil.getString(params, "defaultEmailValue") != null) {
+ form.setDefaultValue(MapUtil.getString(params, "defaultEmailValue"));
+ } else if (MapUtil.getString(params, "defaultTelValue") != null) {
+ form.setDefaultValue(MapUtil.getString(params, "defaultTelValue"));
+ } else if (MapUtil.getString(params, "defaultSiteValue") != null) {
+ form.setDefaultValue(MapUtil.getString(params, "defaultSiteValue"));
+ }
+
return form;
}
diff --git a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
index 91b67a4..b1ce6f2 100644
--- a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
@@ -24,6 +24,12 @@
name : "", // �궗�슜�옄 �젙�쓽 �븘�뱶 紐�
customFieldType : "INPUT", // �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎
defaultValue : "", // 湲곕낯 媛�
+ defaultNumValue : "", // 湲곕낯 媛�
+ defaultDateValue : "", // 湲곕낯 媛�
+ defaultIpValue : "", // 湲곕낯 媛�
+ defaultEmailValue : "", // 湲곕낯 媛�
+ defaultTelValue : "", // 湲곕낯 媛�
+ defaultSiteValue : "", // 湲곕낯 媛�
options : [], // �샃�뀡
optionText : "", // �샃�뀡 媛�
numberType : "",
@@ -48,6 +54,12 @@
$scope.vm.form.optionText = "";
$scope.vm.form.defaultValue = "";
+ $scope.vm.form.defaultNumValue = "";
+ $scope.vm.form.defaultDateValue = "";
+ $scope.vm.form.defaultIpValue = "";
+ $scope.vm.form.defaultEmailValue = "";
+ $scope.vm.form.defaultTelValue = "";
+ $scope.vm.form.defaultSiteValue = "";
}
diff --git a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
index 5d440ee..1231f23 100644
--- a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -32,6 +32,12 @@
name : "",
customFieldType : "INPUT", // �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎
defaultValue : "", // 湲곕낯 媛�
+ defaultNumValue : "", // 湲곕낯 媛� (�닽�옄)
+ defaultDateValue : "", // 湲곕낯 媛� (�궇吏�)
+ defaultIpValue : "", // 湲곕낯 媛� (IP)
+ defaultEmailValue : "", // 湲곕낯 媛� (�씠硫붿씪)
+ defaultTelValue : "", // 湲곕낯 媛� (�뿰�씫泥�)
+ defaultSiteValue : "", // 湲곕낯 媛� (URL)
options : [], // �샃�뀡
optionText : "", // �샃�뀡 媛�
useCustomFieldValue : false, // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
@@ -51,6 +57,12 @@
function changeCustomFieldType() {
//$scope.vm.form.name = "";
$scope.vm.form.defaultValue = "";
+ $scope.vm.form.defaultNumValue = "";
+ $scope.vm.form.defaultDateValue = "";
+ $scope.vm.form.defaultIpValue = "";
+ $scope.vm.form.defaultEmailValue = "";
+ $scope.vm.form.defaultTelValue = "";
+ $scope.vm.form.defaultSiteValue = "";
}
// �샃�뀡 �궘�젣
@@ -217,7 +229,25 @@
if (angular.isDefined(result.data.data)) {
$scope.vm.form.name = result.data.data.name;
$scope.vm.form.customFieldType = result.data.data.customFieldType;
- $scope.vm.form.defaultValue = result.data.data.defaultValue;
+
+ let type = $scope.vm.form.customFieldType;
+
+ if (type === "INPUT" || type === "SINGLE_SELECT" || type === "MULTI_SELECT") {
+ $scope.vm.form.defaultValue = result.data.data.defaultValue;
+ } else if (type === "NUMBER") {
+ $scope.vm.form.defaultNumValue = result.data.data.defaultValue;
+ } else if (type === "DATETIME") {
+ $scope.vm.form.defaultDateValue = result.data.data.defaultValue;
+ } else if (type === "IP_ADDRESS") {
+ $scope.vm.form.defaultIpValue = result.data.data.defaultValue;
+ } else if (type === "EMAIL") {
+ $scope.vm.form.defaultEmailValue = result.data.data.defaultValue;
+ } else if (type === "SITE") {
+ $scope.vm.form.defaultSiteValue = result.data.data.defaultValue;
+ } else if (type === "TEL") {
+ $scope.vm.form.defaultTelValue = result.data.data.defaultValue;
+ }
+
$scope.vm.form.useCustomFieldValue = result.data.data.useCustomFieldValue;
if(result.data.data.requiredData === "Y"){
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index d1bf665..96f0e76 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -109,7 +109,7 @@
ng-pattern="/^[0-9]*$/"
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultNumValue">
<div ng-if="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
@@ -118,7 +118,7 @@
name="dateTime"
class="form-control input-readonly"
placeholder="{{'issue.clickToSelectDate' | translate}}"
- ng-model="vm.form.defaultValue"
+ ng-model="vm.form.defaultDateValue"
modal-form-auto-scroll
range-type="singleDate"
date-range-picker
@@ -137,7 +137,7 @@
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">
+ ng-model="vm.form.defaultIpValue">
<div ng-if="customFieldAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
@@ -151,7 +151,7 @@
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultEmailValue">
<div ng-if="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
@@ -165,7 +165,7 @@
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">
+ ng-model="vm.form.defaultSiteValue">
<div ng-if="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
@@ -179,7 +179,7 @@
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
+ ng-model="vm.form.defaultTelValue">
<div ng-if="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 9383ca1..b81b850 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -110,8 +110,8 @@
ng-pattern="/^[0-9]*$/"
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
- <div ng-if="customFieldModifyForm.numberType.$error.pattern && vm.form.customFieldType == 'NUMBER'" class="help-block form-text text-danger"
+ ng-model="vm.form.defaultNumValue">
+ <div ng-if="customFieldModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
</div>
@@ -119,7 +119,7 @@
name="dateTime"
class="form-control input-readonly"
placeholder="{{'issue.clickToSelectDate' | translate}}"
- ng-model="vm.form.defaultValue"
+ ng-model="vm.form.defaultDateValue"
modal-form-auto-scroll
range-type="singleDate"
date-range-picker
@@ -138,8 +138,8 @@
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-if="customFieldModifyForm.ipAddress.$error.pattern && vm.form.customFieldType == 'IP_ADDRESS'" class="help-block form-text text-danger"
+ ng-model="vm.form.defaultIpValue">
+ <div ng-if="customFieldModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
@@ -152,8 +152,8 @@
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-if="customFieldModifyForm.email.$error.pattern && vm.form.customFieldType == 'EMAIL'" class="help-block form-text text-danger"
+ ng-model="vm.form.defaultEmailValue">
+ <div ng-if="customFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
@@ -166,8 +166,8 @@
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-if="customFieldModifyForm.site.$error.pattern && vm.form.customFieldType == 'SITE'" class="help-block form-text text-danger"
+ ng-model="vm.form.defaultSiteValue">
+ <div ng-if="customFieldModifyForm.site.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
</div>
@@ -180,8 +180,8 @@
ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
- ng-model="vm.form.defaultValue">
- <div ng-if="customFieldModifyForm.tel.$error.pattern && vm.form.customFieldType == 'TEL'" class="help-block form-text text-danger"
+ ng-model="vm.form.defaultTelValue">
+ <div ng-if="customFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
--
Gitblit v1.8.0