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

@@ -39,7 +39,8 @@
                        ipAdress : "",
                        email : "",
                        site : "",
                        tel : ""
                        tel : "",
                        requiredData: ""
                    },
                    origin : {
                        options : []    //  옵션 값 변경 여부 확인을 위해 서버에서 내려올 때 원본 값을 따로 관리한다.
@@ -48,6 +49,7 @@

                //  사용자 정의 필드 유형이 변경될 때 기본 값 초기화
                function changeCustomFieldType() {
                    //$scope.vm.form.name = "";
                    $scope.vm.form.defaultValue = "";
                }

@@ -216,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);