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

@@ -41,10 +41,10 @@

                //  필드 유형을 변경 했을 때 문자열 필드일 경우에는 옵션 값을 초기화해준다.
                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 = "";
                }
@@ -165,11 +165,7 @@

                    var content = angular.copy($scope.vm.form);
                    content.name = $rootScope.preventXss(content.name);
                    content.numberType = $rootScope.preventXss(content.numberType);
                    content.ipAdress = $rootScope.preventXss(content.ipAdress);
                    content.email = $rootScope.preventXss(content.email);
                    content.site = $rootScope.preventXss(content.site);
                    content.tel = $rootScope.preventXss(content.tel);


                    if ($scope.vm.form.customFieldType === 'MULTI_SELECT'|| $scope.vm.form.customFieldType === "SINGLE_SELECT") {
                        var convertDefaultValues = "";
@@ -180,7 +176,7 @@
                            }
                        });

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

                    CustomField.add($resourceProvider.getContent(