From 612b5a21417f3c8dcaed84c1c0691dc883088f61 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 18:04:14 +0900
Subject: [PATCH] 이슈 컬럼 정렬 진행

---
 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js |   27 +++++++++++++++++++++++----
 1 files changed, 23 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 f4160fe..4e39a14 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -439,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>';
@@ -449,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>';
@@ -482,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>";
@@ -712,17 +714,34 @@
 
                                         case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
                                             var values = [];
+                                            let valueMap = new Map();
+                                            //scope.data.useValue = "";
 
                                             for (var count in scope.data.issueCustomFieldValueVos) {
                                                 var issueCustomFieldValueVo = scope.data.issueCustomFieldValueVos[count];
+
+                                                valueMap.set("useValue"+count, issueCustomFieldValueVo.useValue);
+
+                                                $window[scope.data.useValue+count] = valueMap.get("useValue"+count);
+                                                //window["scope.data.useValue"+count] = scope.data.useValue+count;
+                                                //console.log(scope.data.useValue+count);
+
+                                                /*window[scope.data.useValue+count] = valueMap.get("useValue"+count);
+                                                console.log("window" + window[scope.data.useValue+count]);
+                                                console.log("map" + valueMap.get("useValue"+count));*/
+
+                                                scope.data.useValue = valueMap.get("useValue"+count);
+                                                makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data.useValue+count + '<span>';
+
                                                 //  �뀒�씠釉� �꽕�젙�뿉�꽌 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.useValue = useValue;
+                                                makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data.useValue + '<span>';
                                             });
 
                                             break;

--
Gitblit v1.8.0