From 43e894fc3c8d5c9b80883985a125705a59aaf00e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 17:01:35 +0900
Subject: [PATCH] - 사용자정의필드 '필수데이터' UI 변경 - 이슈 목록에서 컬럼명 마우스 오버시 툴팁 나오도록 수정(tableConfig에 툴팁 설정)

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 741a67b..ccdf665 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -52,7 +52,7 @@
                     issueTypeId : "",
                     partnerVos : "",
                     search : {
-                        keyWord : "", //  �쟾泥� 寃��깋
+                        keyWord : "", //  寃��깋
                         title : "", //  �젣紐�
                         description : "",   //  �궡�슜
                         combinationIssueNumber : "",   //  �씠�뒋 踰덊샇
@@ -65,6 +65,9 @@
                         priorityIds : [],   //  �슦�꽑�닚�쐞 寃��깋
                         issueStatusIds : [],    //  �씠�뒋 �긽�깭 寃��깋
                         issueTypeIds : []   //  �씠�뒋 �쑀�삎 寃��깋
+                    },
+                    searchAll : {
+                        keyWord : "", //  �쟾泥� 寃��깋
                     },
                     searchView : false, //  �긽�꽭 寃��깋 議곌굔 �몴�떆 �뿬遺�
                     detailView : false, //  �긽�꽭 紐⑤뱶 蹂�寃� 媛�
@@ -130,8 +133,8 @@
                 });
 
                 // �긽�떒 寃��깋�떆
-                $scope.$on("searchIssueList", function (event, args) {
-                    $scope.vm.search.keyWord = args.keyWord;
+                $rootScope.$on("searchIssueList", function (event, args) {
+                    $scope.vm.searchAll.keyWord = args.keyWord;
                     $scope.fn.getPageList(0);
                 });
 
@@ -408,6 +411,7 @@
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
+                                .setColumnTooltip("誘몄셿猷� �븯�쐞�씠�뒋/�쟾泥� �븯�쐞�씠�뒋")
                                 .setDRenderer("DOWN_ISSUE_COUNT"));
                             break;
                     }
@@ -591,10 +595,14 @@
                 }
 
                 //  �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
-                function getPageList(selectedPage, detail = false) {
+                function getPageList(selectedPage, detail = false, keyWord = "") {
                     $rootScope.spinner = true;  //  �봽濡쒓렇�옒�뒪 諛�
                     if (selectedPage < 0) {
                         selectedPage = 0;
+                    }
+
+                    if (keyWord !== "") {
+                        $scope.vm.search.keyWord = keyWord;
                     }
 
                     if ($scope.vm.hideCompleteIssue) {
@@ -618,7 +626,7 @@
                     // 寃��깋 湲곕낯媛� �꽭�똿
                     $scope.vm.search.issueTypeIds = [];
                     $scope.vm.projects = [];
-                    if (!$rootScope.isMainSearch) {
+                    if ($scope.vm.searchAll.keyWord == null || $scope.vm.searchAll.keyWord === "") {
                         // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
                         if ($rootScope.issueTypeMenu != null) {
                             //$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
@@ -639,6 +647,7 @@
                                 $scope.vm.projects.push($rootScope.workProject);
                             }
                         }
+                        //$scope.vm.searchAll.keyWord = "";
                     }
 
                     //  �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
@@ -677,7 +686,6 @@
                             } else {
                                 $scope.vm.responseData = result.data;
                             }
-
                         }
                         else {
                             SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
@@ -1254,10 +1262,14 @@
                     var params = $rootScope.previousGetParams;
                     if ($rootScope.isDefined(params)) {
                         // $rootScope.$broadcast("makeIssueSearch", {  projectKey : params.projectKey, issueNumber : params.issueNumber });
-                        getDetailList(params.projectKey, params.issueNumber);
-                        $rootScope.previousGetParams = null;
+                         if (params.keyWord != null) {
+                             $scope.vm.searchAll.keyWord = params.keyWord;
+                             getPageList(0,false, params.keyWord);
+                         }else {
+                            getDetailList(params.projectKey, params.issueNumber);
+                            return;
+                        }
                         // $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
-                        return;
                     }
 
                     var promises = {

--
Gitblit v1.8.0