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

@@ -92,6 +92,17 @@
                                                }
                                            break;

                                        //  사용 파트너 이름(이슈 유형 리스트에서 사용)
                                        case "USE_PARTNERS" :
                                            if (scope.data.usePartnerVos != null) {
                                                var usePartners = [];
                                                for (var i=0; i<scope.data.usePartnerVos.length; i++) {
                                                    usePartners.push(scope.data.usePartnerVos[i].byName);
                                                }
                                                makeTag += "<span>" + usePartners + "</span>";
                                            }
                                            break;

                                        //  프로젝트 목록에서 사용자 정의 필드 설정 표시
                                        case "CUSTOM_FIELD_CONFIG" :
                                            //  관리자만 수정할 수 있다.
@@ -428,6 +439,7 @@
                                            break;
                                        // 이슈 제목
                                        case "ISSUE_TITLE" :
                                            scope.data.title = scope.data.title.replace(/</gi, '&lt;');
                                            makeTag += '<div class="tags text-left">';
                                            makeTag += '<i class="fa fa-star move-star" ng-show="$root.currentDetailIssueId == data.id">&nbsp;</i>';
                                            makeTag += '<span class="number-tag">' + scope.data.projectKey + ' - ' + scope.data.issueNumber + '</span>';
@@ -438,7 +450,7 @@
                                                makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"#EF8D9A" + "\"," + "\"border-color\"" + " : \"#EF8D9A" + "\", \"color\": \"#FFFFFF\" }'>" + "<span>API</span>" + "</span>";
                                            }
                                            makeTag += '</div>';
                                            makeTag += '<div class="titlename cursor text-left" ng-click="event.changeDetailView(data.id)">' + scope.data.title.replace(/</gi, '&lt;') + '</div>';
                                            makeTag += '<div class="titlename cursor text-left" ng-click="event.changeDetailView(data.id)" translate="' + scope.data.title + '">' + '</div>';
                                            makeTag += '<div class="extra-infodiv text-left">';
                                            makeTag += '<span class="extra-info">';
                                            makeTag += '<i class="os-icon os-icon-mail-12"></i>';
@@ -471,7 +483,8 @@
                                            makeTag += "<ul ng-click=\"event.changeDetailView(data.id)\"  class='ul-not-comma cursor'>";
                                                makeTag += "<div style='color: #000000'>";
                                                angular.forEach(scope.data.departmentVos, function (departments) {
                                                    makeTag += "<li>" + departments.departmentName + "</li>";
                                                    scope.data.departmentName = departments.departmentName;
                                                    makeTag += "<li translate='" + scope.data.departmentName + "'>" + "</li>";
                                                });
                                                makeTag += "</div>";
                                            makeTag += "</ul>";
@@ -502,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":
@@ -681,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>";
@@ -704,14 +720,16 @@

                                            for (var count in scope.data.issueCustomFieldValueVos) {
                                                var issueCustomFieldValueVo = scope.data.issueCustomFieldValueVos[count];

                                                //  테이블 설정에서 dName 부분에 사용자 정의 필드 id 를 넣고 해당 값을 추출한다.
                                                if (tableConfig.columnHint.id === issueCustomFieldValueVo.customFieldVo.id) {
                                                    values.push(issueCustomFieldValueVo.useValue);
                                                }
                                            }

                                            angular.forEach(values, function (value) {
                                                makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + value + '<span><br>';
                                            angular.forEach(values, function (useValue) {
                                                scope.data[tableConfig.dName] = useValue;
                                                makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data[tableConfig.dName] + '<span>';
                                            });

                                            break;