From 2bf76c84270c33087aa74b9b074eaf87d85b30cf Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 28 2월 2022 13:17:20 +0900
Subject: [PATCH] - 이슈리스트 사용자정의필드 컬럼 정렬 안되는 문제 해결

---
 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 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 454e91e..5316acd 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, '&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>";
@@ -704,14 +717,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