From 30c4906a7f2db197074c268c0989200e74b4b367 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 토, 19 2월 2022 18:06:32 +0900
Subject: [PATCH] - 사용자정의필드 컬럼 정렬 진행중
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 6 ++----
src/main/webapp/custom_components/js-table/js-table.html | 2 +-
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 15 ---------------
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/js-table.html b/src/main/webapp/custom_components/js-table/js-table.html
index b583754..a6e0d08 100644
--- a/src/main/webapp/custom_components/js-table/js-table.html
+++ b/src/main/webapp/custom_components/js-table/js-table.html
@@ -4,7 +4,7 @@
<tr ng-if="hideHeader != true">
<th bindonce ng-repeat="tableConfig in tableConfigs"
bo-class="[tableConfig.hAlign, tableConfig.hWidth, tableConfig.dVisible]"
- ng-click="!tableConfig.dName.contains('useValue') ? $root.$tableProvider.setOrderByColumn(tableConfig.dName) : $root.$tableProvider.setOrderByColumn(tableConfig.dName)"
+ ng-click="$root.$tableProvider.setOrderByColumn(tableConfig.dName)"
bo-style="{ 'cursor' : tableConfig.dName != '' ? 'pointer' : '' }"
rowspan="{{tableConfig.rowSpan}}"
colspan="{{tableConfig.colSpan}}"
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..362a0cf 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -714,24 +714,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) {
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 03f3cc1..2e7dc86 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -446,22 +446,20 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
- let cnt = -1;
-
// 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
for (var count in $scope.vm.customFields) {
var customField = $scope.vm.customFields[count];
if (customField.id === Number(issueTableConfig.key.substring(13))) {
- cnt ++;
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setDName("useValue"+cnt) /* todo 泥댄겕*/
+ .setDName("useValue"+count) /* todo 泥댄겕*/
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
.setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ break;
}
}
}
--
Gitblit v1.8.0