From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 18:30:04 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정

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