From add0cdefd56c50c5427945c895574f71202e7ed6 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 수, 16 3월 2022 18:12:51 +0900
Subject: [PATCH] - api로 이슈 추가 시 사용자정의필드 타입으로 체크 => 정규식표현검사로 체크로 변경
---
src/main/webapp/scripts/app/customField/customFieldModify.controller.js | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
index a0ff0e9..1231f23 100644
--- a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -32,11 +32,17 @@
name : "",
customFieldType : "INPUT", // �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎
defaultValue : "", // 湲곕낯 媛�
+ defaultNumValue : "", // 湲곕낯 媛� (�닽�옄)
+ defaultDateValue : "", // 湲곕낯 媛� (�궇吏�)
+ defaultIpValue : "", // 湲곕낯 媛� (IP)
+ defaultEmailValue : "", // 湲곕낯 媛� (�씠硫붿씪)
+ defaultTelValue : "", // 湲곕낯 媛� (�뿰�씫泥�)
+ defaultSiteValue : "", // 湲곕낯 媛� (URL)
options : [], // �샃�뀡
optionText : "", // �샃�뀡 媛�
useCustomFieldValue : false, // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
numberType : "",
- ipAdress : "",
+ ipAddress : "",
email : "",
site : "",
tel : "",
@@ -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 = "";
}
// �샃�뀡 �궘�젣
@@ -164,7 +176,8 @@
content.ipAdress = $scope.vm.form.ipAdress;
content.email = $scope.vm.form.email;
content.site = $scope.vm.form.site;
- content.tel =$scope.vm.form.tel;
+ content.tel = $scope.vm.form.tel;
+ content.requiredData = $scope.vm.form.requiredData;
if ($scope.vm.form.customFieldType === 'MULTI_SELECT'|| $scope.vm.form.customFieldType === "SINGLE_SELECT") {
var convertDefaultValues = "";
@@ -216,9 +229,32 @@
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;
- $scope.vm.form.requiredData = result.data.data.requiredData;
+
+ if(result.data.data.requiredData === "Y"){
+ $scope.vm.form.requiredData = true;
+ } else {
+ $scope.vm.form.requiredData = false;
+ }
angular.forEach(result.data.data.customFieldValueVos, function (customFieldValueVo) {
$scope.vm.form.options.push(customFieldValueVo.value);
--
Gitblit v1.8.0