Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-11-29 d4baca463f7d9459d137c53139cf415c78642bf3

 src/main/webapp/scripts/app/customField/customFieldAdd.controller.js

@@ -16,7 +16,7 @@
                    formCheck : formCheck,  //  폼 체크
                    addOption : addOption,   //  옵션 값 추가하기
                    removeOption : removeOption,    //  옵션 삭제
                    changeFieldType : changeFieldType   //  필드 유형 변경
                    changeFieldType : changeFieldType,   //  필드 유형 변경
                };

                $scope.vm = {
@@ -25,7 +25,12 @@
                        customFieldType : "INPUT",    //  사용자 정의 필드 유형
                        defaultValue : "",  //  기본 값
                        options : [],   //  옵션
                        optionText : ""  //  옵션 값
                        optionText : "",  //  옵션 값
                        numberType : "",
                        ipAdress : "",
                        email : "",
                        site : "",
                        tel : ""
                    }
                };

@@ -36,13 +41,14 @@

                //  필드 유형을 변경 했을 때 문자열 필드일 경우에는 옵션 값을 초기화해준다.
                function changeFieldType() {
                    if ($scope.vm.form.customFieldType === "INPUT") {
                        $scope.vm.form.options = [];
                        $scope.vm.form.optionText = "";
                    }
                    // if ($scope.vm.form.customFieldType === "INPUT") {
                    $scope.vm.form.name = "";
                    $scope.vm.form.options = [];
                    $scope.vm.form.optionText = "";

                    $scope.vm.form.defaultValue = "";
                }


                //  Select 옵션 값 추가하기
                function addOption() {
@@ -87,6 +93,55 @@
                    }
                }

                // 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) {
@@ -111,6 +166,7 @@
                    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 = "";

@@ -120,7 +176,7 @@
                            }
                        });

                        content.defaultValue = convertDefaultValues;
                        //content.defaultValue = convertDefaultValues;
                    }

                    CustomField.add($resourceProvider.getContent(