From bd78ee158df93958380a6cc2460316fd87ed9713 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 08 2월 2022 11:39:08 +0900
Subject: [PATCH] - 이슈 임포트 시 IP주소 정규식 표현 체크 - 업체 추가 시 url을 입력하지 않을 경우 중복 체크 하는 오류 수정
---
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