From 2ffa64e0b88f73c531b61afd590b7be3d8bfa6bc Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 23 11월 2021 20:52:37 +0900
Subject: [PATCH] 이슈 상세 연관,하위 테이블 표시 설정 - [프론트]
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 2e2c309..90d340b 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -81,6 +81,13 @@
}
break;
+ // �봽濡쒖젥�듃 �씠由�(�봽濡쒖젥�듃 由ъ뒪�듃�뿉�꽌 �궗�슜)
+ case "PROJECT_BASIC_NAME" :
+ if (scope.data.projectVo != null) {
+ makeTag += "<span class='titlenameSelect'>" + myToken + scope.data.projectVo.name.replace(/</gi, '<') + "</span>";
+ }
+ break;
+
// �봽濡쒖젥�듃 紐⑸줉�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙 �몴�떆
case "CUSTOM_FIELD_CONFIG" :
// 愿�由ъ옄留� �닔�젙�븷 �닔 �엳�떎.
@@ -136,9 +143,9 @@
makeTag += "<ul class='ul-not-comma'>";
if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
- makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+ makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
}else{
- makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
+ makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
angular.forEach(scope.data.departmentVos, function (departments) {
makeTag += "<li>" + departments.departmentName + "</li>";
});
@@ -192,19 +199,29 @@
break;
- // �뿰愿��씪媛� �씠�룞
+ // �뿰愿� �씠�뒋 �씠�룞
case "ISSUE_RELATION_MOVE" :
makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
break;
- // �뿰愿��씪媛� 援щ텇
+ // �뿰愿� �씠�뒋 �씠�룞
+ case "ISSUE_DOWN_MOVE" :
+ makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.id)\">" + scope.data.title + "</span></a>";
+ break;
+
+ // �뿰愿��씠�뒋 援щ텇
case "ISSUE_RELATION_TYPE":
makeTag += "<span>" + scope.data.relationIssueTypeName + "</span>";
break;
- // �뿰愿��씪媛� �궘�젣
+ // �뿰愿��씠�뒋 �궘�젣
case "ISSUE_RELATION_DELETE":
makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
+ break;
+
+ // �븯�쐞 �씠�뒋 �궘�젣
+ case "ISSUE_DOWN_DELETE":
+ makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
break;
// �씠由꾩쓣 �겢由��븯硫� �닔�젙 �뙘�뾽 �몴�떆
@@ -237,12 +254,17 @@
break;
+
case "COMMON_PRIORITY" :
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityName + "'></span>";
break;
case "COMMON_SEVERITY" :
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
+ break;
+
+ case "ISSUE_DEPARTMENT" :
+ makeTag += "<span>" + scope.data.departmentVos.departmentName + "</span>";
break;
case "ISSUE_USER" :
@@ -352,6 +374,10 @@
}
break;
+ case "DEPARTMENT_EX":
+ makeTag += "<div style='margin-top: 5px;'>" + scope.data.departmentDescription + "</div>";
+ break;
+
case "DEPARTMENT_COUNT":
if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyDepartmentCount(data.id)'>" + scope.data.departmentCount + "</span>";
--
Gitblit v1.8.0