From da08346c769258b6102cb4fe5348dc164ea2f3f7 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 12 12월 2021 17:40:31 +0900
Subject: [PATCH] - 연관 이슈 추가 안되는 오류 수정 - 연관 이슈 추가 후 목록 안뜨는 문제 수정 - 이슈 목록 트리 구조 보기 기능 추가
---
src/main/webapp/custom_components/js-tree/treeColumnGenerator.directive.js | 85 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/custom_components/js-tree/treeColumnGenerator.directive.js b/src/main/webapp/custom_components/js-tree/treeColumnGenerator.directive.js
index c6854fe..9d9c9cc 100644
--- a/src/main/webapp/custom_components/js-tree/treeColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-tree/treeColumnGenerator.directive.js
@@ -11,51 +11,76 @@
return function (scope, element, attrs) {
scope.data = scope[attrs["treeColumnGenerator"]];
+ var myData = scope.data;
var makeTag = "";
- var treeStartToken = "�뵒";
scope.tableConfigs.forEach(function (tableConfig, index) {
+ var txt = "";
+ makeTag = '<span class="' + tableConfig.dVisible + '">';
- if (tableConfig.colSpan > 0) {
- return;
- }
-
- makeTag = '<li class="' + tableConfig.dAlign + ' ' + tableConfig.dVisible + '">';
-
- if (tableConfig.dType === "checkbox") {
- // 泥댄겕 諛뺤뒪�씪�븣
- if (scope.data.defaultYn) {
- makeTag += '<input type="checkbox" ng-checked="data.checked == true ? true : false" disabled ng-click="$root.$tableProvider.rowChecked(tableConfigs, data, fn.getResponseData())">';
+ var viewData = myData[tableConfig.dName];
+ if (tableConfig.dType === "CUSTOM_FIELD") {
+ var issueCustomFieldValueVos = myData.issueCustomFieldValueVos;
+ if (issueCustomFieldValueVos != null) {
+ for (let i = 0; i < issueCustomFieldValueVos.length; i++) {
+ if (issueCustomFieldValueVos[i].customFieldVo.id === tableConfig.dName) {
+ if (index > 0) { makeTag += ","; }
+ txt += issueCustomFieldValueVos[i].useValue;
+ break;
+ }
+ }
}
- else {
- makeTag += '<input type="checkbox" ng-checked="data.checked == true ? true : false" ng-click="$root.$tableProvider.rowChecked(tableConfigs, data, fn.getResponseData())">';
- }
+ makeTag += "<span class='cursor issue-tree-item' translate='" + txt + "'></span>";
- tableConfig.hChecked = false;
- }
- else if (tableConfig.dType === "radio") {
- // �씪�뵒�삤 踰꾪듉�씪�븣
- makeTag += '<input type="radio" ng-checked="data.checked == true ? true : false" ng-click="$root.$tableProvider.rowChecked(tableConfigs, data, fn.getResponseData())">';
- }
- else if (tableConfig.dType === "date") {
- makeTag += $filter('date')(scope.data[tableConfig.dName], $tableProvider.getDateFormat(tableConfig.dDateFormat, scope.data[tableConfig.dName]));
- }
- else {
- if (angular.isDefined(scope.data[tableConfig.dName]) && scope.data[tableConfig.dName] != null) {
- makeTag += '<span>' + scope.data[tableConfig.dName] + '</span>';
+ } else {
+ if (tableConfig.dName === "assigneeTeam") {
+ var departmentVos = myData.departmentVos;
+ if (departmentVos != null) {
+ if (index > 0) { makeTag += ","; }
+ for (let i = 0; i < departmentVos.length; i++) {
+ if (i > 0) {
+ txt += ",";
+ }
+ txt += departmentVos[i].departmentName;
+ }
+ }
+ makeTag += "<span class='cursor issue-tree-item' translate='" + txt + "'></span>";
+ } else if (tableConfig.dName === "register") {
+ if (index > 0) { makeTag += ","; }
+ makeTag += "<span class='cursor issue-tree-item' translate='" + myData.registerVo.name + "'></span>";
}
- else {
- makeTag += '<span></span>';
+ else if (tableConfig.dName === "period") {
+ if (index > 0) { makeTag += ","; }
+ if (!$rootScope.isDefined(myData.startDate) && !$rootScope.isDefined(myData.completeDate)) {
+ makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
+ }
+ else {
+ makeTag += '<span class="cursor" ng-click="event.changeDetailView(data.id)">' + myData.startDate + ' ~ ' + myData.completeDate + '</span>';
+ }
+
+ }
+ else if (tableConfig.dName === "countDownIssue") {
+ if (index > 0) { makeTag += ","; }
+ makeTag += makeTag += "<span class='cursor issue-tree-item' translate='(" + myData.downIssueCount + "/" + myData.downIssueAllCount + ")'></span>";
+ } else {
+ viewData = viewData != null ? viewData : "";
+
+ if (viewData !== "") {
+ if (index > 0) { makeTag += ","; }
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor issue-tree-item' translate='" + viewData + "'></span>";
+ } else {
+ // makeTag += "<span>" + tableConfig.dName + " NOT FOUND</span> "; // �뵒踰꾧퉭�떆 �궗�슜
+ makeTag += "<span></span> ";
+ }
}
}
- makeTag += '</li>';
+ makeTag += '</span>';
var linkFn = $compile(makeTag);
var content = linkFn(scope);
element.append(content);
-
});
}
}
--
Gitblit v1.8.0