From f7f2ab653aee3871eb9a2f396ae49b7ec7b8d07e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 18:06:35 +0900
Subject: [PATCH] 오토 컴플릿 입력시 스페이스 입력 안되는 문제 해결
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 5802b90..ad07e5e 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -50,7 +50,7 @@
$scope.fn.setDownTableConfigs = setDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
$scope.fn.onActivate = onActivate;
- $scope.fn.issueBack = issueBack;
+ $scope.fn.goParentIssue = goParentIssue;
$scope.fn.removeRelationIssue = removeRelationIssue;
$scope.fn.removeDownIssue = removeDownIssue;
$scope.fn.changeDetailPageRowCount = changeDetailPageRowCount; // �럹�씠吏� 蹂�寃�
@@ -113,6 +113,7 @@
$scope.vm.issueName = ""; // �꽑�깮�맂 �뿰愿� �씪媛� �씠由�
$scope.vm.issueId = ""; //
+ $scope.vm.parentIssueId = "";
$scope.vm.issueTypeId = "";
$scope.vm.autoCompletePage = {
issue : {
@@ -146,13 +147,9 @@
}
// �긽�쐞 �씠�뒋 �겢由��떆 �긽�쐞 �씠�뒋濡� �씠�룞
- function issueBack() {
- var index = $scope.$parent.vm.issueIds.length -2;
- if (index > -1) {
- var preIssueId = $scope.$parent.vm.issueIds[index];
- $scope.$parent.vm.issueIds.splice(index + 1, 1);
- $scope.$parent.tableEvent.changeDetailView(preIssueId, true);
- }
+ function goParentIssue() {
+ var parentIssueId = $scope.vm.parentIssueId;
+ $scope.$parent.tableEvent.changeDetailView(parentIssueId, true);
}
// �럹�씠吏� 蹂�寃�
@@ -412,7 +409,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("USE_COMPANY"));
+ .setDRenderer("REL_USE_COMPANY"));
break;
case "REL_ISP" : // ISP
$scope.vm.relTableConfigs.push($tableProvider.config()
@@ -421,7 +418,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("USE_ISP"));
+ .setDRenderer("REL_USE_ISP"));
break;
case "REL_HOSTING" : // HOSTING
$scope.vm.relTableConfigs.push($tableProvider.config()
@@ -430,7 +427,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("USE_HOSTING"));
+ .setDRenderer("REL_USE_HOSTING"));
break;
}
@@ -540,7 +537,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("USE_COMPANY"));
+ .setDRenderer("DOWN_USE_COMPANY"));
break;
case "DOWN_ISP" : // ISP
$scope.vm.downTableConfigs.push($tableProvider.config()
@@ -549,7 +546,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("USE_ISP"));
+ .setDRenderer("DOWN_USE_ISP"));
break;
case "DOWN_HOSTING" : // HOSTING
$scope.vm.downTableConfigs.push($tableProvider.config()
@@ -558,7 +555,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("USE_HOSTING"));
+ .setDRenderer("DOWN_USE_HOSTING"));
break;
}
@@ -1112,6 +1109,10 @@
// �솢�룞 �씠�젰 留뚮뱾湲�
$scope.fn.makeActiveHistory();
+ if ($rootScope.isDefined($scope.vm.viewer.parentIssueVo)) {
+ $scope.vm.parentIssueId = $scope.vm.viewer.parentIssueVo.id;
+ }
+
$scope.vm.viewer.startDate = result.data.data.startDate == null ? "common.unspecified" : result.data.data.startDate; // 誘몄��젙
$scope.vm.viewer.completeDate = result.data.data.completeDate == null ? "common.unspecified" : result.data.data.completeDate; // 誘몄��젙
@@ -1449,16 +1450,43 @@
}
function getParametersAll() {
- var params = $scope.fn.getParameters(null, $scope.vm.viewer.issueCompanyVos);
- params = $scope.fn.getParameters(params, $scope.vm.viewer.issueIspVos);
- params = $scope.fn.getParameters(params, $scope.vm.viewer.issueHostingVos);
-
- if (params != null && params.length > 0) {
- for (let i = 0; i < params.length; i++) {
- params[i].id = i;
+ var params = [];
+ if ($scope.vm.viewer.issueCompanyVos != null && $scope.vm.viewer.issueCompanyVos.length > 0) {
+ var issueCompany = $scope.fn.getParameters(params, $scope.vm.viewer.issueCompanyVos);
+ if (issueCompany != null && issueCompany.length > 0) {
+ angular.forEach(issueCompany, function (data) {
+ params.push(data);
+ });
}
}
- return params;
+ if ($scope.vm.viewer.issueIspVos != null && $scope.vm.viewer.issueIspVos.length > 0) {
+ var issueIsp = $scope.fn.getParameters(params, $scope.vm.viewer.issueIspVos)
+ if (issueIsp != null && issueIsp.length > 0) {
+ angular.forEach(issueIsp, function (data) {
+ params.push(data);
+ });
+ }
+ }
+ if ($scope.vm.viewer.issueHostingVos != null && $scope.vm.viewer.issueHostingVos.length > 0) {
+ var issueHosting = $scope.fn.getParameters(params, $scope.vm.viewer.issueHostingVos);
+ if (issueHosting != null && issueHosting.length > 0) {
+ angular.forEach(issueHosting, function (data) {
+ params.push(data);
+ });
+ }
+ }
+
+ if (params != null && params.length > 0) {
+ var filterData = params.filter(function(item, idx){
+ return params.findIndex(function(item2, idx2){
+ return item.email === item2.email
+ }) == idx;
+ });
+ for (let i = 0; i < filterData.length; i++) {
+ filterData[i].id = i;
+ }
+ }
+ return filterData;
}
function getParameters(sourceArr, partnerVos) {
--
Gitblit v1.8.0