From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경

---
 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