From 612b5a21417f3c8dcaed84c1c0691dc883088f61 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 18:04:14 +0900
Subject: [PATCH] 이슈 컬럼 정렬 진행
---
src/main/webapp/custom_components/js-table/js-table.html | 6 ++++--
1 files changed, 4 insertions(+), 2 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 cc70192..b583754 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="$root.$tableProvider.setOrderByColumn(tableConfig.dName)"
+ ng-click="!tableConfig.dName.contains('useValue') ? $root.$tableProvider.setOrderByColumn(tableConfig.dName) : $root.$tableProvider.setOrderByColumn(tableConfig.dName)"
bo-style="{ 'cursor' : tableConfig.dName != '' ? 'pointer' : '' }"
rowspan="{{tableConfig.rowSpan}}"
colspan="{{tableConfig.colSpan}}"
@@ -15,7 +15,9 @@
<input type="checkbox" tabindex="-1" ng-model="tableConfig.hChecked" ng-click="$root.$tableProvider.toggleChecked(tableConfig.hChecked, fn.getResponseData())">
</div>
<div bo-switch-default>
- <span translate="{{tableConfig.hName}}"></span>
+ <span ng-if="tableConfig.columnTooltip != ''" function-tool-tip data-placement="top" data-toggle="tooltip" data-original-title="{{tableConfig.columnTooltip}}"
+ translate="{{tableConfig.hName}}"></span>
+ <span ng-if="tableConfig.columnTooltip == ''" translate="{{tableConfig.hName}}"></span>
<span ng-if="($root.$tableProvider.orderByColumn == tableConfig.dName) && (tableConfig.dName != '')"><i class="fa fa-arrow-circle-down" ng-show="!$root.$tableProvider.reverse"></i>
<i class="fa fa-arrow-circle-up" ng-show="$root.$tableProvider.reverse"></i>
</span>
--
Gitblit v1.8.0