Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa

박지현

2022-03-07 398a4927e195755bd6a46be99337efd8dacc3dc2

 src/main/webapp/scripts/app/companyField/companyFieldList.controller.js

@@ -105,8 +105,25 @@
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.url")
                        .setHWidth("bold")
                        .setHWidth("width-200-p bold")
                        .setDName("url")
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.ipRange")
                        .setHWidth("width-120-p bold")
                        .setDName("ipRange")
                        .setDType("renderer")
                        .setDAlign("text-center")
                        .setDRenderer("COMPANYFIELD_IP"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("common.isp")
                        .setHWidth("bold")
                        .setDName("ispName")
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("common.hosting")
                        .setHWidth("bold")
                        .setDName("hostingName")
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.companyType")
@@ -125,18 +142,13 @@
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.region")
                        .setHWidth("bold")
                        .setHWidth("width-80-p bold")
                        .setDName("regionName")
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.status")
                        .setHWidth("bold")
                        .setDName("statusName")
                        .setDAlign("text-center"));
                    $scope.vm.tableConfigs.push($tableProvider.config()
                        .setHName("companyField.memo")
                        .setHWidth("bold")
                        .setDName("memo")
                        .setDAlign("text-center"));
                }

@@ -166,8 +178,8 @@
                        if (result.data.message.status === "success") {
                            $scope.vm.page.selectedPage = currentPage + 1;
                            
                            // 전화번호 조회시 하이픈 추가 해서 조회
                            result.data.data.forEach(function (data) {
                                // 전화번호 조회시 하이픈 추가, 배열 형태 제거, 콤마 기준 줄바꿈
                                if (data.tel != null && data.tel !== "") {
                                    var tels = data.tel;
                                    if (data.tel.indexOf("[") !== -1){
@@ -177,21 +189,33 @@

                                    for (var i = 0; i < telArr.length; i++) {
                                        let hyphen = telArr[i].trim();
                                        telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
                                        if (hyphen.length < 9) {
                                            telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
                                        } else {
                                            telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
                                        }
                                        if (telArr[i] === "") {
                                            telArr.splice(i,1);
                                        }
                                    }
                                    data.tel = telArr.join();
                                    data.tel = data.tel.replace(/\,/g,"</br>");
                                }
                            });

                            // 이메일 조회시 배열 형태 제거
                            result.data.data.forEach(function (data) {
                                if (data.email != null && data.email !== "") {
                                // 이메일 조회시 배열 형태 제거 및 콤마 기준으로 줄바꿈
                                if ($rootScope.isDefined(data.email)) {
                                    if (data.email.indexOf("[") !== -1){
                                        data.email = data.email.substr(1, data.email.indexOf("]")-1);
                                    }
                                    if (data.email.indexOf(",") !== -1) {
                                        data.email = data.email.replace(/\,/g,"</br>");
                                    }
                                }
                                // url 조회시 콤마 기준으로 줄바꿈
                                if ($rootScope.isDefined(data.url)) {
                                    data.url = data.url.trim();
                                    if (data.url.indexOf(",") !== -1) {
                                        data.url = data.url.replace(/\,/g,"</br>");
                                    }
                                }
                            });