From 30ddd2cf095d2857ba1134fb3deaf51392ef1030 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 21:31:45 +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 | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
index 04f2a7d..a0ff0e9 100644
--- a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -30,11 +30,17 @@
form : {
id : parameter.id,
name : "",
- customFieldType : "", // �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎
+ customFieldType : "INPUT", // �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎
defaultValue : "", // 湲곕낯 媛�
options : [], // �샃�뀡
optionText : "", // �샃�뀡 媛�
- useCustomFieldValue : false // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
+ useCustomFieldValue : false, // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
+ numberType : "",
+ ipAdress : "",
+ email : "",
+ site : "",
+ tel : "",
+ requiredData: ""
},
origin : {
options : [] // �샃�뀡 媛� 蹂�寃� �뿬遺� �솗�씤�쓣 �쐞�빐 �꽌踰꾩뿉�꽌 �궡�젮�삱 �븣 �썝蹂� 媛믪쓣 �뵲濡� 愿�由ы븳�떎.
@@ -43,6 +49,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎�씠 蹂�寃쎈맆 �븣 湲곕낯 媛� 珥덇린�솕
function changeCustomFieldType() {
+ //$scope.vm.form.name = "";
$scope.vm.form.defaultValue = "";
}
@@ -137,7 +144,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;
@@ -151,10 +158,15 @@
function formSubmit() {
$rootScope.spinner = true;
- var content = angular.copy($scope.vm.form);
- content.name = $rootScope.preventXss(content.name);
+ var content = angular.copy($scope.vm.form);
+ content.name = $rootScope.preventXss(content.name);
+ content.numberType =$scope.vm.form.numberType;
+ content.ipAdress = $scope.vm.form.ipAdress;
+ content.email = $scope.vm.form.email;
+ content.site = $scope.vm.form.site;
+ content.tel =$scope.vm.form.tel;
- 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) {
@@ -206,6 +218,7 @@
$scope.vm.form.customFieldType = result.data.data.customFieldType;
$scope.vm.form.defaultValue = result.data.data.defaultValue;
$scope.vm.form.useCustomFieldValue = result.data.data.useCustomFieldValue;
+ $scope.vm.form.requiredData = result.data.data.requiredData;
angular.forEach(result.data.data.customFieldValueVos, function (customFieldValueVo) {
$scope.vm.form.options.push(customFieldValueVo.value);
--
Gitblit v1.8.0