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/customFieldAdd.controller.js | 58 ++++------------------------------------------------------
1 files changed, 4 insertions(+), 54 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
index 37838b8..65c1549 100644
--- a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
@@ -30,7 +30,8 @@
ipAdress : "",
email : "",
site : "",
- tel : ""
+ tel : "",
+ requiredData : ""
}
};
@@ -42,7 +43,7 @@
// �븘�뱶 �쑀�삎�쓣 蹂�寃� �뻽�쓣 �븣 臾몄옄�뿴 �븘�뱶�씪 寃쎌슦�뿉�뒗 �샃�뀡 媛믪쓣 珥덇린�솕�빐以��떎.
function changeFieldType() {
// if ($scope.vm.form.customFieldType === "INPUT") {
- $scope.vm.form.name = "";
+ // $scope.vm.form.name = "";
$scope.vm.form.options = [];
$scope.vm.form.optionText = "";
@@ -93,55 +94,6 @@
}
}
- // function chkPhoneType(type) {
- // var input = $scope.vm.form.tel
- //
- // //focus out�씤 寃쎌슦
- // //input type�쓣 text濡� 諛붽씀怨� '-'異붽�
- // if(type == 'blur'){
- // $scope.vm.form.tel;
- // var phone = chkItemPhone(input);
- // }
- //
- // //focus�씤 寃쎌슦
- // //input type�쓣 number濡� 諛붽씀怨� '-' �젣嫄�
- // if(type == 'focus'){
- // var phone = input.replace( /-/gi, '');
- // $scope.vm.form.tel('type', 'number');
- // }
- //
- // $scope.vm.form.tel(phone);
- // }
- //
- // function chkItemPhone(temp) {
- // var number = temp.replace(/[^0-9]/g, "");
- // var phone = "";
- //
- // if (number.length < 9) {
- // return number;
- // } else if (number.length < 10) {
- // phone += number.substr(0, 2);
- // phone += "-";
- // phone += number.substr(2, 3);
- // phone += "-";
- // phone += number.substr(5);
- // } else if (number.length < 11) {
- // phone += number.substr(0, 3);
- // phone += "-";
- // phone += number.substr(3, 3);
- // phone += "-";
- // phone += number.substr(6);
- // } else {
- // phone += number.substr(0, 3);
- // phone += "-";
- // phone += number.substr(3, 4);
- // phone += "-";
- // phone += number.substr(7);
- // }
- //
- // return phone;
- // }
-
// �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
@@ -155,7 +107,6 @@
return true;
}
}
-
return false;
}
@@ -166,7 +117,6 @@
var content = angular.copy($scope.vm.form);
content.name = $rootScope.preventXss(content.name);
-
if ($scope.vm.form.customFieldType === 'MULTI_SELECT'|| $scope.vm.form.customFieldType === "SINGLE_SELECT") {
var convertDefaultValues = "";
@@ -176,7 +126,7 @@
}
});
- //content.defaultValue = convertDefaultValues;
+ content.defaultValue = convertDefaultValues;
}
CustomField.add($resourceProvider.getContent(
--
Gitblit v1.8.0