From c254ef2ee7121bbea936705e408b5ff671cf4a91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 09:31:34 +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 | 24 ++++++++++++++++++------
1 files changed, 18 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 56362b5..0cf5e1f 100644
--- a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -30,11 +30,16 @@
form : {
id : parameter.id,
name : "",
- customFieldType : "", // �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎
+ customFieldType : "INPUT", // �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎
defaultValue : "", // 湲곕낯 媛�
options : [], // �샃�뀡
optionText : "", // �샃�뀡 媛�
- useCustomFieldValue : false // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
+ useCustomFieldValue : false, // �씠�뒋�뿉�꽌 �궗�슜�릺怨� �엳�뒗吏� �뿬遺� �솗�씤
+ numberType : "",
+ ipAdress : "",
+ email : "",
+ site : "",
+ tel : ""
},
origin : {
options : [] // �샃�뀡 媛� 蹂�寃� �뿬遺� �솗�씤�쓣 �쐞�빐 �꽌踰꾩뿉�꽌 �궡�젮�삱 �븣 �썝蹂� 媛믪쓣 �뵲濡� 愿�由ы븳�떎.
@@ -43,6 +48,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶 �쑀�삎�씠 蹂�寃쎈맆 �븣 湲곕낯 媛� 珥덇린�솕
function changeCustomFieldType() {
+ //$scope.vm.form.name = "";
$scope.vm.form.defaultValue = "";
}
@@ -93,6 +99,7 @@
if ($scope.vm.form.customFieldType === "INPUT") {
return;
}
+ // $scope.vm.form.customFieldType == "NUMBER" 議댁옱�븳�떎
var duplication = false;
// �빐�떆 �깭洹몃뒗 �엯�젰 湲덉� - 怨듬갚 移섑솚
@@ -136,7 +143,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;
@@ -150,10 +157,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) {
--
Gitblit v1.8.0