From 6211b73ad7750a62652bacf5bcf05002c62fb907 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 06 1월 2022 15:57:16 +0900 Subject: [PATCH] - 이슈 상세페이지 연관,하위 이슈 페이징 처리 완료 --- src/main/webapp/scripts/app/issue/issueDetail.controller.js | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js index dab59ac..34c14fa 100644 --- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js +++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js @@ -55,6 +55,7 @@ $scope.fn.removeDownIssue = removeDownIssue; $scope.fn.changeDetailPageRowCount = changeDetailPageRowCount; // �럹�씠吏� 蹂�寃� $scope.fn.sendCommonMail = sendCommonMail; + $scope.fn.getSubPageContent = getSubPageContent; // �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以� $scope.vm.viewer = {}; // �쁽�옱 �씠�뒋 @@ -95,9 +96,7 @@ data : [] }; - $scope.vm.page = { - selectedPage : 0, - selectedPageRowCount : String(10), + $scope.vm.subPage = { selectedRelPage : 0, selectedRelPageRowCount : String(10), selectedDownPage : 0, @@ -167,10 +166,10 @@ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector})); - // �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊 - $scope.$on("getIssueList", function () { + // �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊 + /*$scope.$on("getIssueList", function () { $scope.fn.getIssueDetail(0,0); - }); + });*/ // �븯�쐞 �씠�뒋 �궘�젣 function removeDownIssue() { @@ -782,7 +781,7 @@ // $scope.vm.viewer.id = args["id"]; // $scope.fn.getIssueDetail(); // }); - + // �씠硫붿씪 蹂대궦�썑 �긽�꽭�솕硫� 媛깆떊 // $rootScope.$on("getIssueDetail", function (event, args) { // $scope.fn.getIssueDetail(); @@ -985,6 +984,14 @@ return result; } + function getSubPageContent(relPage, relPageSize, downPage, downPageSize) { + return { + relPage: relPage, + relPageSize: relPageSize, + downPage: downPage, + downPageSize: downPageSize + }; + } // �씠�뒋 �긽�꽭 �젙蹂� 議고쉶 function getIssueDetail(selectedRelPage, selectedDownPage) { @@ -1018,18 +1025,21 @@ $scope.fn.initReload(); // $scope.fn.getRelTableConfigs(); // $scope.fn.getDownTableConfigs(); - Issue.detail($resourceProvider.getContent( - {id : $scope.vm.viewer.id, deep : "02"}, - $resourceProvider.getSubPageContent(currentRelPage, $scope.vm.page.selectedRelPageRowCount - , currentDownPage, $scope.vm.page.selectedDownPageRowCount)) - ).then(function (result) { + + var pageContent = $scope.fn.getSubPageContent(currentRelPage, $scope.vm.subPage.selectedRelPageRowCount + , currentDownPage, $scope.vm.subPage.selectedDownPageRowCount); + + var content = $resourceProvider.getContent( + {id : $scope.vm.viewer.id, deep : "02", pageContent}, null); + + Issue.detail(content).then(function (result) { if (result.data.message.status === "success") { if (angular.isDefined(result.data.data)) { - $scope.vm.page.selectedRelPage = currentRelPage + 1; - $scope.vm.page.selectedDownPage = currentDownPage + 1; - $scope.vm.responseData = result.data; + $scope.vm.subPage.selectedRelPage = currentRelPage + 1; + $scope.vm.subPage.selectedDownPage = currentDownPage + 1; + $scope.vm.responseData = result.data.data; $scope.vm.viewer = angular.copy(result.data.data); // �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲� -- Gitblit v1.8.0