From 3da71368d451c455872a6ca114c0540e65308aef Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 15:32:43 +0900
Subject: [PATCH] 공지사항,Faq,가이드,Qna 통합 수정 - 일반회원은 faq,가이드 활성화 된 게시글만 보이기 - 엑셀다운,삭제 기능 추가(기존에 없었음) - 삭제,수정 시 권한 체크

---
 src/main/webapp/custom_components/js-table/js-table.html |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 787197a..a6e0d08 100644
--- a/src/main/webapp/custom_components/js-table/js-table.html
+++ b/src/main/webapp/custom_components/js-table/js-table.html
@@ -15,9 +15,10 @@
                     <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="($root.$tableProvider.orderByColumn == tableConfig.dName) && (tableConfig.dName != '')">
-                        <i class="fa fa-arrow-circle-down" ng-show="!$root.$tableProvider.reverse"></i>
+                    <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>
                 </div>

--
Gitblit v1.8.0