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

박지현

2022-03-07 398a4927e195755bd6a46be99337efd8dacc3dc2

 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js

@@ -515,29 +515,26 @@

                                        // 업체
                                        case "USE_COMPANY" :
                                            if (scope.data.companyName !== null) {
                                                makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.companyName + "'></span>";
                                            }else {
                                                makeTag += "<span></span>";
                                            if (scope.data.companyName == null) {
                                                scope.data.companyName = "";
                                            }
                                            makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.companyName + "'></span>";
                                            break;

                                        // ISP
                                        case "USE_ISP" :
                                            if (scope.data.ispName !== null) {
                                                makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.ispName + "'></span>";
                                            }else {
                                                makeTag += "<span></span>";
                                            if (scope.data.ispName == null) {
                                                scope.data.ispName = "";
                                            }
                                            makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.ispName + "'></span>";
                                            break;

                                        // 호스팅
                                        case "USE_HOSTING" :
                                            if (scope.data.hostingName !== null) {
                                                makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
                                            }else {
                                                makeTag += "<span></span>";
                                            if (scope.data.hostingName == null) {
                                                scope.data.hostingName = "";
                                            }
                                            makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
                                            break;

                                        case "WORKFLOW_NAME":
@@ -694,6 +691,12 @@
                                            }
                                            break;

                                        case "COMPANYFIELD_IP" :
                                            if ($rootScope.isDefined(scope.data.ipStart) && $rootScope.isDefined(scope.data.ipEnd)) {
                                                makeTag += "<span>" + scope.data.ipStart + "<br>~<br>" + scope.data.ipEnd + "</span>";
                                            }
                                            break;

                                        case "ISPFIELD_MODIFY" :
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) {
                                                makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '&lt;') + "</span>";