From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index cdbf380..2fdf2dd 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/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, '<');
makeTag += '<div class="tags text-left">';
makeTag += '<i class="fa fa-star move-star" ng-show="$root.currentDetailIssueId == data.id"> </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, '<') + '</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.ispName !== 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,30 @@
}
break;
+ case "COMPANYFIELD_IP" :
+ if ($rootScope.isDefined(scope.data.ipStart) && $rootScope.isDefined(scope.data.ipEnd)) {
+ let ipStartArr = [];
+ let ipEndArr = [];
+
+ if (scope.data.ipStart.indexOf(",") !== -1) {
+ scope.data.ipStart = scope.data.ipStart.split(",");
+ ipStartArr = angular.copy(scope.data.ipStart);
+ }
+ if (scope.data.ipEnd.indexOf(",") !== -1) {
+ scope.data.ipEnd = scope.data.ipEnd.split(",");
+ ipEndArr = angular.copy(scope.data.ipEnd);
+ }
+
+ if ($rootScope.isDefined(ipStartArr) && ipStartArr.toString() === scope.data.ipStart.toString()
+ && $rootScope.isDefined(ipEndArr) && ipEndArr.toString() === scope.data.ipEnd.toString()) {
+ scope.data.ipStart = scope.data.ipStart[0];
+ scope.data.ipEnd = scope.data.ipEnd[0];
+ }
+ 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, '<') + "</span>";
@@ -704,14 +738,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;
--
Gitblit v1.8.0