From 20d2fc7868921587e7a0aafd0dc00690507bb6e9 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 02 3월 2022 17:11:32 +0900 Subject: [PATCH] - 이슈 엑셀 임포트 속도 개선 --- src/main/webapp/scripts/app/issue/issueImportExcel.controller.js | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js index 7d15419..5480e19 100644 --- a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js +++ b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js @@ -18,7 +18,8 @@ getIssueTypes : getIssueTypes, // �씠�뒋 ���엯 紐⑸줉 媛��졇�삤湲� makeSearchConditions : makeSearchConditions, // �꽑�깮�븳 議곌굔�쓣 json �쑝濡� 留뚮뱺�떎. onFileSelect : onFileSelect, // �뙆�씪 �뾽濡쒕뱶 - getIssueListCallBack : getIssueListCallBack // �씠�뒋 autocomplete page �뾽�뜲�씠�듃 + getIssueListCallBack : getIssueListCallBack, // �씠�뒋 autocomplete page �뾽�뜲�씠�듃 + startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔 }; $scope.vm = { @@ -66,6 +67,25 @@ if (result.data.message.status === "success") { $scope.vm.issueTypes = result.data.data; + + // �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙 + let currentIssueTypeId = $rootScope.getCurrentIssueTypeId(); + if (currentIssueTypeId != null) { + $scope.vm.form.issueTypeId = currentIssueTypeId.toString(); + } + + // option 鍮덇컪 諛⑹� + if ($rootScope.isDefined($scope.vm.issueTypes) && $scope.vm.issueTypes.length > 0) { + let chk = 0; + angular.forEach($scope.vm.issueTypes, function (issueType) { + if (issueType.id.toString() === $scope.vm.form.issueTypeId.toString()) { + chk ++; + } + }); + if (chk === 0) { + $scope.vm.form.issueTypeId = null; + } + } } else { SweetAlert.error($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message); // "�씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣" @@ -153,7 +173,7 @@ projectId : $scope.vm.form.projects[0].id, issueTypeId : $scope.vm.form.issueTypeId, parentIssueId : (function () { - let id = -1; + let id = null; if ($rootScope.isDefined($scope.vm.form.issues)) { if ($rootScope.isDefined($scope.vm.form.issues[0])) { id = $scope.vm.form.issues[0].id; @@ -190,7 +210,7 @@ projectId : $scope.vm.form.projects[0].id, issueTypeId : $scope.vm.form.issueTypeId, parentIssueId : (function () { - let id = -1; + let id = null; if ($rootScope.isDefined($scope.vm.form.issues)) { if ($rootScope.isDefined($scope.vm.form.issues[0])) { id = $scope.vm.form.issues[0].id; @@ -225,7 +245,17 @@ $uibModalInstance.dismiss('cancel'); } - // �씠�뒋 �쑀�삎 議고쉶 - $scope.fn.getIssueTypes(); + // 理쒖큹 �떎�뻾 + function startExecute() { + // �쁽�옱 �봽濡쒖젥�듃 �꽕�젙 + if ($rootScope.workProject != null && $rootScope.workProject.id > -1) { + $scope.vm.projectName = $rootScope.workProject.name; + $scope.vm.form.projects = []; + $scope.vm.form.projects.push($rootScope.workProject); + } + $scope.fn.getIssueTypes(); + } + + $scope.fn.startExecute(); }]); }); -- Gitblit v1.8.0