From c20c327d17b184187dbf19e7252bde584ae964c9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 28 2월 2022 13:22:10 +0900
Subject: [PATCH] - 이슈리스트 파트너 정렬 수정
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 40 +++++++++++-----------------------------
1 files changed, 11 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..62cee08 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":
@@ -714,24 +711,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 +722,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