From 5d6ea07024b475d94b997ad5972f433cf0b5aae4 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 12 12월 2021 18:13:38 +0900
Subject: [PATCH] - 상단 검색 기능 추가
---
src/main/webapp/scripts/config.js | 3 +
src/main/webapp/scripts/app/issue/issueManager.controller.js | 5 ++
src/main/webapp/scripts/app/common/common.controller.js | 19 ++++++++-
src/main/webapp/scripts/app/issue/issueList.controller.js | 48 +++++++++++++++---------
src/main/webapp/i18n/ko/global.json | 1
src/main/webapp/views/common/header.html | 5 +-
6 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 42499bf..a83b91f 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -154,6 +154,7 @@
"issue": {
"issueType": "�씠�뒋 �쑀�삎",
"managementIssue": "�씠�뒋 愿�由�",
+ "searchIssue": "�씠�뒋 寃��깋",
"createIssue": "�씠�뒋 留뚮뱾湲�",
"issueStatus": "�씠�뒋 �긽�깭",
"issueNumber": "�씠�뒋 踰덊샇",
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 1859208..4c12bea 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -23,13 +23,17 @@
moveMenu : moveMenu,
findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
changeIssueListMenu : changeIssueListMenu,
- setLastIssueType : setLastIssueType
+ setLastIssueType : setLastIssueType,
+ searchAll : searchAll // �긽�떒 寃��깋
};
$scope.vm = {
workProject : -1,
message: "",
- workProjectId : -1
+ workProjectId : -1,
+ searchAll : {
+ keyWord : ""
+ }
};
@@ -56,6 +60,17 @@
//}
});
+ // 硫붿씤 �긽�떒 寃��깋
+ function searchAll() {
+ $rootScope.isMainSearch = true;
+
+ if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
+ $state.go("issues.list");
+ }
+
+ $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
+ }
+
function setLastIssueType() {
if (User != null) {
User.updateLastIssueType($resourceProvider.getContent(
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index a680cc3..ed3d50f 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -115,6 +115,13 @@
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
+ // �긽�떒 寃��깋�떆
+ $scope.$on("searchIssueList", function (event, args) {
+ $scope.vm.search.keyWord = args.keyWord;
+ $scope.fn.getPageList(0);
+ $rootScope.isMainSearch = false;
+ });
+
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
// 寃��깋 議곌굔�쓣 湲곗뼲�빐�꽌 �씠�뒋 �긽�꽭 �럹�씠吏�濡� �씠�룞
function makeVmSearchObject() {
@@ -581,26 +588,31 @@
currentPage = selectedPage;
}
- // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
- if ($rootScope.issueTypeMenu != null) {
- // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
- $scope.vm.search.issueTypeIds = [];
- $scope.vm.search.issueTypeIds.push({
- fieldKey : $rootScope.issueTypeMenu.id,
- fieldValue : $rootScope.issueTypeMenu.name
- });
- }
-
- // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
- //$scope.fn.makeVmSearchObject();
- // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
- if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
- var find = findProjectSearch($rootScope.workProject.id);
- if (!find) {
- $scope.vm.projects = [];
- $scope.vm.projects.push($rootScope.workProject);
+ // 寃��깋 湲곕낯媛� �꽭�똿
+ $scope.vm.search.issueTypeIds = [];
+ $scope.vm.projects = [];
+ if (!$rootScope.isMainSearch) {
+ // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.issueTypeMenu != null) {
+ // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+
+ $scope.vm.search.issueTypeIds.push({
+ fieldKey: $rootScope.issueTypeMenu.id,
+ fieldValue: $rootScope.issueTypeMenu.name
+ });
+ }
+
+ // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
+ //$scope.fn.makeVmSearchObject();
+
+ // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
+ var find = findProjectSearch($rootScope.workProject.id);
+ if (!find) {
+ $scope.vm.projects.push($rootScope.workProject);
+ }
}
}
diff --git a/src/main/webapp/scripts/app/issue/issueManager.controller.js b/src/main/webapp/scripts/app/issue/issueManager.controller.js
index 35f1d5f..d0afd32 100644
--- a/src/main/webapp/scripts/app/issue/issueManager.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueManager.controller.js
@@ -39,6 +39,11 @@
}
});
+ // �긽�떒 寃��깋�떆
+ $scope.$on("searchIssueList", function (event, args) {
+ $scope.vm.pageTitle = $filter("translate")("issue.searchIssue");
+ });
+
function start() {
if ($rootScope.issueTypeMenu != null) {
$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 29595a6..3bf1da7 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -67,6 +67,9 @@
// 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺�
$rootScope.hasSuperUser = false;
+ // 硫붿씤 寃��깋 �뿬遺�
+ $rootScope.isMainSearch = false;
+
// ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃
$rootScope.dashboard = 0;
diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html
index adab7ca..34e2058 100644
--- a/src/main/webapp/views/common/header.html
+++ b/src/main/webapp/views/common/header.html
@@ -29,12 +29,13 @@
<div class="input-group">
<input class="form-control"
type="text"
- tabindex="-1"
+ tabindex="-2"
maxlength="300"
kr-input
owl-auto-focus
ng-model="vm.searchAll.keyWord"
- placeholder="{{'issue.pleaseEnterIssueKeyWord' | translate}}">
+ placeholder="{{'issue.pleaseEnterIssueKeyWord' | translate}}"
+ ng-enter="fn.searchAll(0)">
<div class="input-group-prepend ml-10">
<button class="btn btn-navy" ng-click="fn.searchAll(0)"> <span translate="common.search">寃��깋</span></button>
</div>
--
Gitblit v1.8.0