From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 4e39a14..2fdf2dd 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -515,29 +515,26 @@
// �뾽泥�
case "USE_COMPANY" :
- if (scope.data.companyName !== null) {
- makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.companyName + "'></span>";
- }else {
- makeTag += "<span></span>";
+ if (scope.data.companyName == null) {
+ scope.data.companyName = "";
}
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.companyName + "'></span>";
break;
// ISP
case "USE_ISP" :
- if (scope.data.ispName !== null) {
- makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.ispName + "'></span>";
- }else {
- makeTag += "<span></span>";
+ if (scope.data.ispName == null) {
+ scope.data.ispName = "";
}
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.ispName + "'></span>";
break;
// �샇�뒪�똿
case "USE_HOSTING" :
- if (scope.data.hostingName !== null) {
- makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
- }else {
- makeTag += "<span></span>";
+ if (scope.data.hostingName == null) {
+ scope.data.hostingName = "";
}
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
break;
case "WORKFLOW_NAME":
@@ -694,6 +691,30 @@
}
break;
+ case "COMPANYFIELD_IP" :
+ if ($rootScope.isDefined(scope.data.ipStart) && $rootScope.isDefined(scope.data.ipEnd)) {
+ let ipStartArr = [];
+ let ipEndArr = [];
+
+ if (scope.data.ipStart.indexOf(",") !== -1) {
+ scope.data.ipStart = scope.data.ipStart.split(",");
+ ipStartArr = angular.copy(scope.data.ipStart);
+ }
+ if (scope.data.ipEnd.indexOf(",") !== -1) {
+ scope.data.ipEnd = scope.data.ipEnd.split(",");
+ ipEndArr = angular.copy(scope.data.ipEnd);
+ }
+
+ if ($rootScope.isDefined(ipStartArr) && ipStartArr.toString() === scope.data.ipStart.toString()
+ && $rootScope.isDefined(ipEndArr) && ipEndArr.toString() === scope.data.ipEnd.toString()) {
+ scope.data.ipStart = scope.data.ipStart[0];
+ scope.data.ipEnd = scope.data.ipEnd[0];
+ }
+ makeTag += "<span>" + scope.data.ipStart + "<br>~</br>" + scope.data.ipEnd + "</span>";
+
+ }
+ break;
+
case "ISPFIELD_MODIFY" :
if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) {
makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>";
@@ -714,24 +735,9 @@
case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" :
var values = [];
- let valueMap = new Map();
- //scope.data.useValue = "";
for (var count in scope.data.issueCustomFieldValueVos) {
var issueCustomFieldValueVo = scope.data.issueCustomFieldValueVos[count];
-
- valueMap.set("useValue"+count, issueCustomFieldValueVo.useValue);
-
- $window[scope.data.useValue+count] = valueMap.get("useValue"+count);
- //window["scope.data.useValue"+count] = scope.data.useValue+count;
- //console.log(scope.data.useValue+count);
-
- /*window[scope.data.useValue+count] = valueMap.get("useValue"+count);
- console.log("window" + window[scope.data.useValue+count]);
- console.log("map" + valueMap.get("useValue"+count));*/
-
- scope.data.useValue = valueMap.get("useValue"+count);
- makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data.useValue+count + '<span>';
// �뀒�씠釉� �꽕�젙�뿉�꽌 dName 遺�遺꾩뿉 �궗�슜�옄 �젙�쓽 �븘�뱶 id 瑜� �꽔怨� �빐�떦 媛믪쓣 異붿텧�븳�떎.
if (tableConfig.columnHint.id === issueCustomFieldValueVo.customFieldVo.id) {
@@ -740,8 +746,8 @@
}
angular.forEach(values, function (useValue) {
- scope.data.useValue = useValue;
- makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data.useValue + '<span>';
+ scope.data[tableConfig.dName] = useValue;
+ makeTag += '<span ng-click="event.changeDetailView(data.id)" class="table-word-break-all cursor">' + scope.data[tableConfig.dName] + '<span>';
});
break;
--
Gitblit v1.8.0