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

jhjang

2021-12-07 30ddd2cf095d2857ba1134fb3deaf51392ef1030

 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);