From 43e894fc3c8d5c9b80883985a125705a59aaf00e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 17:01:35 +0900
Subject: [PATCH] - 사용자정의필드 '필수데이터' UI 변경 - 이슈 목록에서 컬럼명 마우스 오버시 툴팁 나오도록 수정(tableConfig에 툴팁 설정)
---
src/main/webapp/views/customField/customFieldAdd.html | 8 +++++++-
src/main/webapp/custom_components/js-table/table.provider.js | 5 +++++
src/main/webapp/scripts/app/issue/issueList.controller.js | 1 +
src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html | 2 +-
src/main/webapp/assets/styles/main.css | 7 +++++++
src/main/webapp/custom_components/js-table/js-table.html | 4 +++-
src/main/webapp/custom_components/js-tree/tree.provider.js | 5 +++++
7 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 778a1ea..ca005af 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -30152,6 +30152,13 @@
font-weight: 800;
}
+.custom-detail-label {
+ color: #777;
+ font-weight: 600;
+ position: relative;
+ top: -6px;
+}
+
input[type="number"]::-webkit-outer-spin-button,
input[type="number"]::-webkit-inner-spin-button {
-webkit-appearance: none;
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..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,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>
diff --git a/src/main/webapp/custom_components/js-table/table.provider.js b/src/main/webapp/custom_components/js-table/table.provider.js
index 6d1864f..b847527 100644
--- a/src/main/webapp/custom_components/js-table/table.provider.js
+++ b/src/main/webapp/custom_components/js-table/table.provider.js
@@ -23,6 +23,7 @@
colSpan : 0, // colspan �쓣 吏��썝�븳�떎.
subHead : false, // 留뚯빟 rowspan, colspan �쓣 �궗�슜�븯寃� �릺硫� true 濡� �뀑�똿.
columnHint : "", // 而щ읆 �젙蹂대�� 異붿텧�븯湲� �쐞�븳 �엺�듃 �젙蹂대�� 以��떎 - tableColumnGenerator �쓽 �궗�슜�옄 �젙�쓽 �븘�뱶 遺�遺꾩뿉�꽌 �궗�슜
+ columnTooltip : "", // hover �떆 �댋�똻 蹂댁뿬二쇨린
setHName : function (hName) {
this.hName = hName;
return this;
@@ -82,6 +83,10 @@
setColumnHint : function (dColumnHint) {
this.columnHint = dColumnHint;
return this;
+ },
+ setColumnTooltip : function (hTooltip) {
+ this.columnTooltip = hTooltip;
+ return this;
}
};
diff --git a/src/main/webapp/custom_components/js-tree/tree.provider.js b/src/main/webapp/custom_components/js-tree/tree.provider.js
index 0e3afee..914f3c7 100644
--- a/src/main/webapp/custom_components/js-tree/tree.provider.js
+++ b/src/main/webapp/custom_components/js-tree/tree.provider.js
@@ -16,6 +16,7 @@
dDateFormat : "", // �궇吏� �삎�떇
subHead : false, // 留뚯빟 rowspan, colspan �쓣 �궗�슜�븯寃� �릺硫� true 濡� �뀑�똿.
columnHint : "", // 而щ읆 �젙蹂대�� 異붿텧�븯湲� �쐞�븳 �엺�듃 �젙蹂대�� 以��떎 - tableColumnGenerator �쓽 �궗�슜�옄 �젙�쓽 �븘�뱶 遺�遺꾩뿉�꽌 �궗�슜
+ columnTooltip : "", // hover �떆 �댋�똻 蹂댁뿬二쇨린
setHName : function (hName) {
this.hName = hName;
return this;
@@ -47,6 +48,10 @@
setColumnHint : function (dColumnHint) {
this.columnHint = dColumnHint;
return this;
+ },
+ setColumnTooltip : function (hTooltip) {
+ this.columnTooltip = hTooltip;
+ return this;
}
};
diff --git a/src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html b/src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html
index d2981db..ddcf637 100644
--- a/src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html
+++ b/src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html
@@ -3,7 +3,7 @@
<div class="os-progress-bar">
<div class="bar-labels">
<div class="bar-label-left">
- <h5 translate="dashboard.progressByMember">硫ㅻ쾭蹂� 吏꾪뻾瑜�</h5>
+ <h5 translate="dashboard.progressByMember">遺��꽌蹂� 吏꾪뻾瑜�</h5>
</div>
<div class="bar-label-right">
<form class="form-inline justify-content-sm-end" method="post" action="/widget/downloadExcel" name="memberProgressWidgetForm">
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 46c4c54..ccdf665 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -411,6 +411,7 @@
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
+ .setColumnTooltip("誘몄셿猷� �븯�쐞�씠�뒋/�쟾泥� �븯�쐞�씠�뒋")
.setDRenderer("DOWN_ISSUE_COUNT"));
break;
}
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index ea027dd..2cda56a 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -34,7 +34,7 @@
<div class="form-group">
<label for="customFieldAddForm2"><span translate="customField.fieldType">�븘�뱶 �쑀�삎</span> <code
class="highlighter-rouge">*</code></label>
- <label for="customFieldAddForm2"> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>
+ <!-- <label for="customFieldAddForm2"> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>-->
<select id="customFieldAddForm2" class="form-control" ng-model="vm.form.customFieldType"
ng-change="fn.changeFieldType()">
<option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</option>
@@ -47,6 +47,12 @@
<option value="SITE" translate="common.siteField">�솃�럹�씠吏� 二쇱냼 �븘�뱶</option>
<option value="TEL" translate="common.telField">�쟾�솕踰덊샇 �븘�뱶</option>
</select>
+ <div class="mt-3">
+ <span class="custom-detail-label">�븘�닔 �뜲�씠�꽣</span>
+ <label class='switch'><input type='checkbox' ng-model="vm.form.requiredData">
+ <span class='slider round'></span>
+ </label>
+ </div>
</div>
<div class="form-group" ng-show="vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'">
--
Gitblit v1.8.0