From ea58f79355dd5715c7889623f59f5e8fca81e811 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 23 12월 2021 15:51:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/customField/customFieldModify.controller.js | 16 ++++++++++++----
1 files changed, 12 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 c2cbb27..5d440ee 100644
--- a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -36,10 +36,11 @@
optionText : "", // �샃�뀡 媛�
useCustomFieldValue : false, // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
numberType : "",
- ipAdress : "",
+ ipAddress : "",
email : "",
site : "",
- tel : ""
+ tel : "",
+ requiredData: ""
},
origin : {
options : [] // �샃�뀡 媛� 蹂�寃� �뿬遺� �솗�씤�쓣 �쐞�빐 �꽌踰꾩뿉�꽌 �궡�젮�삱 �븣 �썝蹂� 媛믪쓣 �뵲濡� 愿�由ы븳�떎.
@@ -48,7 +49,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎�씠 蹂�寃쎈맆 �븣 湲곕낯 媛� 珥덇린�솕
function changeCustomFieldType() {
- $scope.vm.form.name = "";
+ //$scope.vm.form.name = "";
$scope.vm.form.defaultValue = "";
}
@@ -163,7 +164,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 = "";
@@ -218,6 +220,12 @@
$scope.vm.form.defaultValue = result.data.data.defaultValue;
$scope.vm.form.useCustomFieldValue = result.data.data.useCustomFieldValue;
+ 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